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

Commit ecef6ceb authored by Ram Mohan's avatar Ram Mohan
Browse files

c2SoftAmr: dont discard trailing samples during encoding 

amr plugins at the point of eos, if they do not contain integral
multiple of frame size samples, they are discarding it. this change
aligns them to frame size by adding mute samples and encodes them

Bug: 375055097
Test: atest MctsMediaV2TestCases:AudioEncoderTest
Test: atest MctsMediaV2TestCases:CodecEncoderTest
Test: atest MctsMediaEncoderTestCases:EncoderTest
Test: atest MctsMediaV2TestCases:CodecEncoderBlockModelTest
Test: atest MctsMediaV2TestCases:CodecEncoderMultiAccessUnitTest
Test: atest MctsMediaV2TestCases:CodecEncoderBlockModelMultiAccessUnitTest
Test: atest VtsHalMediaC2V1_0TargetAudioEncTest

Change-Id: Icc354e258d5db0369d2957c1c186fbee62087df5
parent 78a63413

media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp

+2 −4
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ void C2SoftAmrNbEnc::process( 
        mProcessedSamples * 1000000ll / mIntf->getSampleRate();

    size_t inPos = 0;

    size_t outPos = 0;

    while (inPos < inSize) {

    while (inPos < inSize || eos) {

        const uint8_t *inPtr = rView.data() + inOffset;

        int validSamples = mFilledLen / sizeof(int16_t);

        if ((inPos + (kNumBytesPerInputFrame - mFilledLen)) <= inSize) {
@@ -240,11 +240,10 @@ void C2SoftAmrNbEnc::process( 
            memcpy(mInputFrame + validSamples, inPtr + inPos, (inSize - inPos));

            mFilledLen += (inSize - inPos);

            inPos += (inSize - inPos);

            if (eos) {

            if (eos && (mFilledLen > 0)) {

                validSamples = mFilledLen / sizeof(int16_t);

                memset(mInputFrame + validSamples, 0, (kNumBytesPerInputFrame - mFilledLen));

            } else break;



        }

        Frame_Type_3GPP frameType;

        int numEncBytes = AMREncode(mEncState, mSidState, mMode, mInputFrame,
@@ -278,7 +277,6 @@ void C2SoftAmrNbEnc::process( 
    if (eos) {

        mSignalledOutputEos = true;

        ALOGV("signalled EOS");

        if (mFilledLen) ALOGV("Discarding trailing %d bytes", mFilledLen);

    }

}

media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp

+2 −3
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void C2SoftAmrWbEnc::process( 
        mProcessedSamples * 1000000ll / mIntf->getSampleRate();

    size_t inPos = 0;

    size_t outPos = 0;

    while (inPos < inSize) {

    while (inPos < inSize || eos) {

        const uint8_t *inPtr = rView.data() + inOffset;

        int validSamples = mFilledLen / sizeof(int16_t);

        if ((inPos + (kNumBytesPerInputFrame - mFilledLen)) <= inSize) {
@@ -322,7 +322,7 @@ void C2SoftAmrWbEnc::process( 
            memcpy(mInputFrame + validSamples, inPtr + inPos, (inSize - inPos));

            mFilledLen += (inSize - inPos);

            inPos += (inSize - inPos);

            if (eos) {

            if (eos && (mFilledLen > 0)) {

                validSamples = mFilledLen / sizeof(int16_t);

                memset(mInputFrame + validSamples, 0, (kNumBytesPerInputFrame - mFilledLen));

            } else break;
@@ -352,7 +352,6 @@ void C2SoftAmrWbEnc::process( 
    if (eos) {

        mSignalledOutputEos = true;

        ALOGV("signalled EOS");

        if (mFilledLen) ALOGV("Discarding trailing %d bytes", mFilledLen);

    }

}