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

Commit 2b2611f9 authored by Ram Mohan's avatar Ram Mohan
Browse files

c2SoftAacEnc: fix bad optional access of frame pts 

In scenarios, when only eos is signalled with out any input, optional
variable is accessed when it has no value during pts computations. This
is addressed.

Bug: 396505100
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: I34416fab79e6cc38751595f05b15d6d8861d5df0
parent e2af49f4

media/codec2/components/aac/C2SoftAacEnc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ void C2SoftAacEnc::process( 
        MaybeLogTimestampWarning(mLastFrameEndTimestampUs->peekll(), inputTimestampUs.peekll());

        inputTimestampUs = *mLastFrameEndTimestampUs;

    }

    if (capacity > 0) {

    if (capacity > 0 || eos) {

        if (!mNextFrameTimestampUs) {

            mNextFrameTimestampUs = work->input.ordinal.timestamp;

        }