diff options
| author | Andreas Huber <andih@google.com> | 2010-10-07 12:21:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 12:21:33 -0700 |
| commit | 2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc (patch) | |
| tree | 9a9d97d42b7c495876a9f87d2a709926118c197c /media/libstagefright/include/AwesomePlayer.h | |
| parent | fff59460a567a96ffc8d946bf6f477b4570080a1 (diff) | |
| parent | a782d22f3eacd337c135feb12362934fc0adb6ca (diff) | |
| download | frameworks_av-2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc.zip frameworks_av-2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc.tar.gz frameworks_av-2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc.tar.bz2 | |
am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'
* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
Diffstat (limited to 'media/libstagefright/include/AwesomePlayer.h')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index db98253..e04a24d 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -223,7 +223,7 @@ private: status_t setDataSource_l(const sp<MediaExtractor> &extractor); void reset_l(); status_t seekTo_l(int64_t timeUs); - status_t pause_l(); + status_t pause_l(bool at_eos = false); void initRenderer_l(); void notifyVideoSize_l(); void seekAudioIfNecessary_l(); |