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

Commit d91bc485 authored by Rakesh Kumar's avatar Rakesh Kumar Committed by Sungtak Lee
Browse files

codec2: Fix timestampDev issues for Mpeg2Dec 

If last_frame come with EOS then we need to cloneandSend it.

Test: VtsHidlC2V1_0TargetVideoDecTest -I software -P /sdcard/res/ -C c2.android.mpeg2.decoder
Bug: 123267886
Change-Id: Iec3d5d8befe7d9e323d8dce4ab194098d47e43d6
parent 3bfa6e77

media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp

+43 −2
Original line number Diff line number Diff line
@@ -315,7 +315,8 @@ C2SoftMpeg2Dec::C2SoftMpeg2Dec( 
        mOutBufferDrain(nullptr),

        mIvColorformat(IV_YUV_420P),

        mWidth(320),

        mHeight(240) {

        mHeight(240),

        mOutIndex(0u) {

    // If input dump is enabled, then open create an empty file

    GENERATE_FILE_NAMES();

    CREATE_DUMP_FILE(mInFile);
@@ -766,6 +767,33 @@ void C2SoftMpeg2Dec::finishWork(uint64_t index, const std::unique_ptr<C2Work> &w 
        buffer->setInfo(mIntf->getColorAspects_l());

    }



    class FillWork {

       public:

        FillWork(uint32_t flags, C2WorkOrdinalStruct ordinal,

                 const std::shared_ptr<C2Buffer>& buffer)

            : mFlags(flags), mOrdinal(ordinal), mBuffer(buffer) {}

        ~FillWork() = default;



        void operator()(const std::unique_ptr<C2Work>& work) {

            work->worklets.front()->output.flags = (C2FrameData::flags_t)mFlags;

            work->worklets.front()->output.buffers.clear();

            work->worklets.front()->output.ordinal = mOrdinal;

            work->workletsProcessed = 1u;

            work->result = C2_OK;

            if (mBuffer) {

                work->worklets.front()->output.buffers.push_back(mBuffer);

            }

            ALOGV("timestamp = %lld, index = %lld, w/%s buffer",

                  mOrdinal.timestamp.peekll(), mOrdinal.frameIndex.peekll(),

                  mBuffer ? "" : "o");

        }



       private:

        const uint32_t mFlags;

        const C2WorkOrdinalStruct mOrdinal;

        const std::shared_ptr<C2Buffer> mBuffer;

    };



    auto fillWork = [buffer](const std::unique_ptr<C2Work> &work) {

        work->worklets.front()->output.flags = (C2FrameData::flags_t)0;

        work->worklets.front()->output.buffers.clear();
@@ -774,7 +802,20 @@ void C2SoftMpeg2Dec::finishWork(uint64_t index, const std::unique_ptr<C2Work> &w 
        work->workletsProcessed = 1u;

    };

    if (work && c2_cntr64_t(index) == work->input.ordinal.frameIndex) {

        bool eos = ((work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0);

        // TODO: Check if cloneAndSend can be avoided by tracking number of frames remaining

        if (eos) {

            if (buffer) {

                mOutIndex = index;

                C2WorkOrdinalStruct outOrdinal = work->input.ordinal;

                cloneAndSend(

                    mOutIndex, work,

                    FillWork(C2FrameData::FLAG_INCOMPLETE, outOrdinal, buffer));

                buffer.reset();

            }

        } else {

            fillWork(work);

        }

    } else {

        finish(index, fillWork);

    }

media/codec2/components/mpeg2/C2SoftMpeg2Dec.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ANDROID_C2_SOFT_MPEG2_DEC_H_

#define ANDROID_C2_SOFT_MPEG2_DEC_H_



#include <atomic>

#include <SimpleC2Component.h>



#include <media/stagefright/foundation/ColorUtils.h>
@@ -161,6 +162,7 @@ struct C2SoftMpeg2Dec : public SimpleC2Component { 
    uint32_t mStride;

    bool mSignalledOutputEos;

    bool mSignalledError;

    std::atomic_uint64_t mOutIndex;



    // Color aspects. These are ISO values and are meant to detect changes in aspects to avoid

    // converting them to C2 values for each frame