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

Commit 1b30bde3 authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian Committed by Lajos Molnar
Browse files

libstagefright/SoftOpus: Ignore CSD resubmissions 

NuPlayerDecoder re-submits the CSDs on seek. Opus decoder does not
need the CSDs on seek. So, we merely ignore the resubmissions of
CSD in SoftOpus so that it is not passed to the decoder thereby
screwing up its state.

Bug: 21565945
Change-Id: Ia74f4b1733e42171131484a6a7f3fd923fe26434
parent 77f101b3

media/libstagefright/codecs/opus/dec/SoftOpus.cpp

+8 −0
Original line number Diff line number Diff line
@@ -403,6 +403,14 @@ void SoftOpus::onQueueFilled(OMX_U32 portIndex) { 
        BufferInfo *inInfo = *inQueue.begin();

        OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;



        // Ignore CSD re-submissions.

        if (inHeader->nFlags & OMX_BUFFERFLAG_CODECCONFIG) {

            inQueue.erase(inQueue.begin());

            inInfo->mOwnedByUs = false;

            notifyEmptyBufferDone(inHeader);

            return;

        }



        BufferInfo *outInfo = *outQueue.begin();

        OMX_BUFFERHEADERTYPE *outHeader = outInfo->mHeader;