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

Commit dc5ba045 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "This reverts an earlier change 4aeec2da"

parents fd125f0c c6e3b27f

media/libmediaplayerservice/MediaPlayerService.cpp

+8 −1
Original line number Diff line number Diff line
@@ -1449,8 +1449,15 @@ void MediaPlayerService::AudioOutput::CallbackWrapper( 
    size_t actualSize = (*me->mCallback)(

            me, buffer->raw, buffer->size, me->mCallbackCookie);



    buffer->size = actualSize;

    if (actualSize == 0 && buffer->size > 0) {

        // We've reached EOS but the audio track is not stopped yet,

        // keep playing silence.



        memset(buffer->raw, 0, buffer->size);

        actualSize = buffer->size;

    }



    buffer->size = actualSize;

}



int MediaPlayerService::AudioOutput::getSessionId()

media/libstagefright/AudioPlayer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -306,9 +306,7 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { 
    }



    if (mReachedEOS) {

        memset(data, 0, size);



        return size;

        return 0;

    }



    bool postSeekComplete = false;