diff options
| author | Andreas Huber <andih@google.com> | 2010-07-20 09:44:34 -0700 |
|---|---|---|
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2010-08-17 23:53:34 -0700 |
| commit | 4b34662bacbf542a68708a9ddc25b7f22649ab99 (patch) | |
| tree | fd7ff312ce590903faa6925c1e80d2d016784beb /include | |
| parent | eb2e09546986652259364daedba24b7f914c32c6 (diff) | |
| download | frameworks_base-4b34662bacbf542a68708a9ddc25b7f22649ab99.zip frameworks_base-4b34662bacbf542a68708a9ddc25b7f22649ab99.tar.gz frameworks_base-4b34662bacbf542a68708a9ddc25b7f22649ab99.tar.bz2 | |
Squashed commit of the following:
commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 20 09:21:17 2010 -0700
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841
commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date: Sun Jul 18 17:57:01 2010 -0700
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date: Thu Jul 8 20:56:13 2010 -0700
Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684
Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AudioPlayer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h index 9af5871..9a09586 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -86,6 +86,10 @@ private: bool mStarted; + bool mIsFirstBuffer; + status_t mFirstBufferResult; + MediaBuffer *mFirstBuffer; + sp<MediaPlayerBase::AudioSink> mAudioSink; static void AudioCallback(int event, void *user, void *info); |