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

Commit 3a0c7283 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "benchmark: Exclude format delete from deInit time calculation" am:... 

Merge "benchmark: Exclude format delete from deInit time calculation" am: deb35d32 am: c5e43cd0 am: 7f9049fa

Change-Id: I4dce206dc29eb4b0974a1faa773a8fdb0acedbdc
parents 84f76753 7f9049fa

media/tests/benchmark/src/native/decoder/Decoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -225,12 +225,12 @@ int32_t Decoder::decode(uint8_t *inputBuffer, vector<AMediaCodecBufferInfo> &fra 
}



void Decoder::deInitCodec() {

    int64_t sTime = mStats->getCurTime();

    if (mFormat) {

        AMediaFormat_delete(mFormat);

        mFormat = nullptr;

    }

    if (!mCodec) return;

    int64_t sTime = mStats->getCurTime();

    AMediaCodec_stop(mCodec);

    AMediaCodec_delete(mCodec);

    int64_t eTime = mStats->getCurTime();

media/tests/benchmark/src/native/encoder/Encoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -154,12 +154,12 @@ void Encoder::setupEncoder() { 
}



void Encoder::deInitCodec() {

    int64_t sTime = mStats->getCurTime();

    if (mFormat) {

        AMediaFormat_delete(mFormat);

        mFormat = nullptr;

    }

    if (!mCodec) return;

    int64_t sTime = mStats->getCurTime();

    AMediaCodec_stop(mCodec);

    AMediaCodec_delete(mCodec);

    int64_t eTime = mStats->getCurTime();

media/tests/benchmark/src/native/muxer/Muxer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ int32_t Muxer::initMuxer(int32_t fd, MUXER_OUTPUT_T outputFormat) { 
}



void Muxer::deInitMuxer() {

    int64_t sTime = mStats->getCurTime();

    if (mFormat) {

        AMediaFormat_delete(mFormat);

        mFormat = nullptr;

    }

    if (!mMuxer) return;

    int64_t sTime = mStats->getCurTime();

    AMediaMuxer_stop(mMuxer);

    AMediaMuxer_delete(mMuxer);

    int64_t eTime = mStats->getCurTime();