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

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

Merge "c2SoftAacEnc: fix bad optional access of frame pts" into main am: cd1f39d6 am: 645343d3 

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



Change-Id: Ic1ea278431a3babcbb5e87a7ffd65ce7acf2d9c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1847a689 645343d3

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;

        }