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

Commit 6c92756b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "aacenc: fix possible shift in remainder"

parents ea08908d f15bccb8

media/codec2/components/aac/C2SoftAacEnc.cpp

+4 −6
Original line number Diff line number Diff line
@@ -521,16 +521,14 @@ void C2SoftAacEnc::process( 
                mInputSize += outargs.numInSamples * sizeof(int16_t);

            }



            if (outargs.numInSamples > 0) {

                inBuffer[0] = (int16_t *)inBuffer[0] + outargs.numInSamples;

                inBufferSize[0] -= outargs.numInSamples * sizeof(int16_t);

                inargs.numInSamples -= outargs.numInSamples;

            }



            if (inBuffer[0] == mRemainder) {

                inBuffer[0] = const_cast<uint8_t *>(data);

                inBufferSize[0] = capacity;

                inargs.numInSamples = capacity / sizeof(int16_t);

            } else if (outargs.numInSamples > 0) {

                inBuffer[0] = (int16_t *)inBuffer[0] + outargs.numInSamples;

                inBufferSize[0] -= outargs.numInSamples * sizeof(int16_t);

                inargs.numInSamples -= outargs.numInSamples;

            }

        }

        ALOGV("encoderErr = %d mInputSize = %zu "