From f2575571d88cd42508407e98957a19a875dcf926 Mon Sep 17 00:00:00 2001 From: aarti jadhav-gaikwad Date: Wed, 13 Aug 2014 15:04:39 +0530 Subject: [PATCH] stagefright: Do not add silence data for compress offload Bug: 16683770 Bug: 17035257 Change-Id: I7aef543c47214cc2854d143167b02f1603cf8bea --- media/libmediaplayerservice/MediaPlayerService.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index a706987f97..2c48306ffc 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. -- 2.11.0