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

Commit cf8578e3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Codec2 decoders: Invalidate allocated graphic buffer in stop()" am:... 

Merge "Codec2 decoders: Invalidate allocated graphic buffer in stop()" am: 437545bd am: 133d51b0

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



Change-Id: If02a8802984fff60142fbe63b0e76c6efad9b1e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9197f7c 133d51b0

media/codec2/components/avc/C2SoftAvcDec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -671,6 +671,9 @@ status_t C2SoftAvcDec::resetDecoder() { 
void C2SoftAvcDec::resetPlugin() {

    mSignalledOutputEos = false;

    mTimeStart = mTimeEnd = systemTime();

    if (mOutBlock) {

        mOutBlock.reset();

    }

}



status_t C2SoftAvcDec::deleteDecoder() {

media/codec2/components/hevc/C2SoftHevcDec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -664,6 +664,9 @@ status_t C2SoftHevcDec::resetDecoder() { 
void C2SoftHevcDec::resetPlugin() {

    mSignalledOutputEos = false;

    mTimeStart = mTimeEnd = systemTime();

    if (mOutBlock) {

        mOutBlock.reset();

    }

}



status_t C2SoftHevcDec::deleteDecoder() {

media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -732,6 +732,9 @@ status_t C2SoftMpeg2Dec::resetDecoder() { 
void C2SoftMpeg2Dec::resetPlugin() {

    mSignalledOutputEos = false;

    mTimeStart = mTimeEnd = systemTime();

    if (mOutBlock) {

        mOutBlock.reset();

    }

}



status_t C2SoftMpeg2Dec::deleteDecoder() {

media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp

+3 −1
Original line number Diff line number Diff line
@@ -256,7 +256,9 @@ c2_status_t C2SoftMpeg4Dec::onStop() { 
    mFramesConfigured = false;

    mSignalledOutputEos = false;

    mSignalledError = false;



    if (mOutBlock) {

        mOutBlock.reset();

    }

    return C2_OK;

}