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

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

Merge "C2SoftFlacEnc: Fix integer overflows" into main am: 8b9cef70 

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



Change-Id: Ib357f673488392e5e26a6d723ba051e7a879f921
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ca199ac 8b9cef70

media/codec2/components/flac/C2SoftFlacEnc.cpp

+4 −4
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ c2_status_t C2SoftFlacEnc::onInit() { 
    mSignalledError = false;

    mSignalledOutputEos = false;

    mIsFirstFrame = true;

    mAnchorTimeStamp = 0ull;

    mAnchorTimeStamp = 0;

    mProcessedSamples = 0u;

    mEncoderWriteData = false;

    mEncoderReturnedNbBytes = 0;
@@ -186,7 +186,7 @@ c2_status_t C2SoftFlacEnc::onStop() { 
    mSignalledError = false;

    mSignalledOutputEos = false;

    mIsFirstFrame = true;

    mAnchorTimeStamp = 0ull;

    mAnchorTimeStamp = 0;

    mProcessedSamples = 0u;

    mEncoderWriteData = false;

    mEncoderReturnedNbBytes = 0;
@@ -236,7 +236,7 @@ void C2SoftFlacEnc::process( 
              inSize, (int)work->input.ordinal.timestamp.peeku(),

              (int)work->input.ordinal.frameIndex.peeku(), work->input.flags);

    if (mIsFirstFrame && inSize) {

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

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

        mIsFirstFrame = false;

    }
@@ -405,7 +405,7 @@ FLAC__StreamEncoderWriteStatus C2SoftFlacEnc::onEncodedFlacAvailable( 
    C2WriteView wView = mOutputBlock->map().get();

    uint8_t* outData = wView.data();

    const uint32_t sampleRate = mIntf->getSampleRate();

    const uint64_t outTimeStamp = mProcessedSamples * 1000000ll / sampleRate;

    const int64_t outTimeStamp = mProcessedSamples * 1000000ll / sampleRate;

    ALOGV("writing %zu bytes of encoded data on output", bytes);

    // increment mProcessedSamples to maintain audio synchronization during

    // play back

media/codec2/components/flac/C2SoftFlacEnc.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ private: 
    bool mSignalledOutputEos;

    uint32_t mBlockSize;

    bool mIsFirstFrame;

    uint64_t mAnchorTimeStamp;

    int64_t mAnchorTimeStamp;

    uint64_t mProcessedSamples;

    // should the data received by the callback be written to the output port

    bool mEncoderWriteData;