diff options
| author | Andreas Huber <andih@google.com> | 2010-07-20 10:46:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-20 10:46:12 -0700 |
| commit | fbfe57ba4403ad759a0ebd895914ff506a01b699 (patch) | |
| tree | 82a05d93ed73540ef2c21f54a8f25725dfe7553d /include | |
| parent | ee3d00420b64909b219d95a613d8e735ec337839 (diff) | |
| parent | d79079227fa9a9b06894120b1661808b643dae5c (diff) | |
| download | frameworks_av-fbfe57ba4403ad759a0ebd895914ff506a01b699.zip frameworks_av-fbfe57ba4403ad759a0ebd895914ff506a01b699.tar.gz frameworks_av-fbfe57ba4403ad759a0ebd895914ff506a01b699.tar.bz2 | |
am ff45709f: am cc14a839: 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.
Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe'
* commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe':
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.
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); |