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

Commit 8056af66 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "Fix seek error in loop mode." into main am: 74656ddd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3011035



Change-Id: Ib34b66af44d90cef18a934beac8d6fe3497d0163
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c6b0010 74656ddd

media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp

+7 −5
Original line number Diff line number Diff line
@@ -469,11 +469,12 @@ void C2SoftMpeg4Dec::process( 
        mInitialized = false;

    }



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



    if (!mInitialized) {

        uint8_t *vol_data[1]{};

        int32_t vol_size = 0;



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

        if (codecConfig || volHeader) {

            vol_data[0] = bitstream;

            vol_size = inSize;
@@ -512,11 +513,12 @@ void C2SoftMpeg4Dec::process( 
                return;

            }

        }

    }



    if (codecConfig) {

        fillEmptyWork(work);

        return;

    }

    }



    size_t inPos = 0;

    while (inPos < inSize) {