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

Commit f2af5a2c authored by Andreas Huber's avatar Andreas Huber
Browse files

Make sure the software mpeg4 decoder supports multiple input frames per input buffer 

to enable faster throughput in ACodec.

Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
parent 9eff287f

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

+19 −8
Original line number Diff line number Diff line
@@ -360,10 +360,14 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 
            mFramesConfigured = true;

        }



        uint32_t timestamp = 0xFFFFFFFF;

        uint32_t useExtTimestamp = (inHeader->nOffset == 0);



        // decoder deals in ms, OMX in us.

        uint32_t timestamp =

            useExtTimestamp ? (inHeader->nTimeStamp + 500) / 1000 : 0xFFFFFFFF;



        int32_t bufferSize = inHeader->nFilledLen;



        uint32_t useExtTimestamp = 0;

        if (PVDecodeVideoFrame(

                    mHandle, &bitstream, &timestamp, &bufferSize,

                    &useExtTimestamp,
@@ -379,13 +383,20 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 
            return;

        }



        outHeader->nTimeStamp = inHeader->nTimeStamp;

        // decoder deals in ms, OMX in us.

        outHeader->nTimeStamp = timestamp * 1000;



        CHECK_LE(bufferSize, inHeader->nFilledLen);

        inHeader->nOffset += inHeader->nFilledLen - bufferSize;

        inHeader->nFilledLen = bufferSize;



        if (inHeader->nFilledLen == 0) {

            inInfo->mOwnedByUs = false;

            inQueue.erase(inQueue.begin());

            inInfo = NULL;

            notifyEmptyBufferDone(inHeader);

            inHeader = NULL;

        }



        ++mInputBufferCount;

media/libstagefright/omx/SoftOMXPlugin.cpp

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "SoftOMXPlugin.h"

#include "include/SoftOMXComponent.h"



#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AString.h>



#include <dlfcn.h>
@@ -128,6 +129,7 @@ OMX_ERRORTYPE SoftOMXPlugin::destroyComponentInstance( 


    void *libHandle = me->libHandle();



    CHECK_EQ(me->getStrongCount(), 1);

    me->decStrong(this);

    me = NULL;