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

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

Merge "C2SoftAmrWbEnc: Fix integer overflows leading to crash by changing... 

Merge "C2SoftAmrWbEnc:  Fix integer overflows leading to crash by changing data type" am: bfe11d22 am: 4f58aade

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

Change-Id: Ib0030e6300ac36619cafe2116eb3acbd9fc87ff0
parents 346503bd 4f58aade

media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ void C2SoftAmrWbEnc::process( 
        work->result = wView.error();

        return;

    }

    uint64_t outTimeStamp =

    int64_t outTimeStamp =

        mProcessedSamples * 1000000ll / mIntf->getSampleRate();

    size_t inPos = 0;

    size_t outPos = 0;
@@ -341,7 +341,7 @@ void C2SoftAmrWbEnc::process( 
    ALOGV("causal sample size %d", mFilledLen);

    if (mIsFirst && outPos != 0) {

        mIsFirst = false;

        mAnchorTimeStamp = work->input.ordinal.timestamp.peekull();

        mAnchorTimeStamp = work->input.ordinal.timestamp.peekll();

    }

    fillEmptyWork(work);

    if (outPos != 0) {

media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ private: 
    bool mIsFirst;

    bool mSignalledError;

    bool mSignalledOutputEos;

    uint64_t mAnchorTimeStamp;

    int64_t mAnchorTimeStamp;

    uint64_t mProcessedSamples;

    int32_t mFilledLen;

    int16_t mInputFrame[kNumSamplesPerFrame];