Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ee3549 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "stagefright: Do not add silence data for compress offload" into lmp-dev

parents c975c23b f2575571
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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.