diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2014-08-18 22:34:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-18 21:00:53 +0000 |
| commit | a7ee3549823af3dc4b22284f1a2fe4fbf31cf30b (patch) | |
| tree | 18d05276314455c8aec4ef4e81ec43c9a88c6dd2 /media | |
| parent | c975c23bb9da36262b37a1d64367d726f8dd42e5 (diff) | |
| parent | f2575571d88cd42508407e98957a19a875dcf926 (diff) | |
| download | frameworks_av-a7ee3549823af3dc4b22284f1a2fe4fbf31cf30b.zip frameworks_av-a7ee3549823af3dc4b22284f1a2fe4fbf31cf30b.tar.gz frameworks_av-a7ee3549823af3dc4b22284f1a2fe4fbf31cf30b.tar.bz2 | |
Merge "stagefright: Do not add silence data for compress offload" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index a706987..2c48306 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1898,7 +1898,8 @@ void MediaPlayerService::AudioOutput::CallbackWrapper( me, buffer->raw, buffer->size, me->mCallbackCookie, CB_EVENT_FILL_BUFFER); - if (actualSize == 0 && buffer->size > 0 && me->mNextOutput == NULL) { + if ((me->mFlags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) == 0 && + actualSize == 0 && buffer->size > 0 && me->mNextOutput == NULL) { // We've reached EOS but the audio track is not stopped yet, // keep playing silence. |