diff options
| author | aarti jadhav-gaikwad <agaikwad@nvidia.com> | 2014-08-13 15:04:39 +0530 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2014-08-18 15:09:20 -0700 |
| commit | f2575571d88cd42508407e98957a19a875dcf926 (patch) | |
| tree | 4a3c3ed8478e3b20013b46abb4bbece59814e33a /media | |
| parent | 44a5a202101614302f607228d4357496b350bab4 (diff) | |
| download | frameworks_av-f2575571d88cd42508407e98957a19a875dcf926.zip frameworks_av-f2575571d88cd42508407e98957a19a875dcf926.tar.gz frameworks_av-f2575571d88cd42508407e98957a19a875dcf926.tar.bz2 | |
stagefright: Do not add silence data for compress offload
Bug: 16683770
Bug: 17035257
Change-Id: I7aef543c47214cc2854d143167b02f1603cf8bea
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. |