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

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

Merge "mpeg4_writer_fuzzer: Bug Fix" into main am: 9a04a729 am: a2068299... 

Merge "mpeg4_writer_fuzzer: Bug Fix" into main am: 9a04a729 am: a2068299 am: 4a95cd5a am: 583e97a9 am: 2e6b3cb7

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



Change-Id: If65857c31e7a0c18c2d341c5c91b8374269b7a7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fd507db 2e6b3cb7

media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp

+7 −1
Original line number Diff line number Diff line
@@ -226,7 +226,13 @@ void WriterFuzzerBase::sendBuffersToWriter(sp<MediaAdapter> &currentTrack, int32 
        mediaBuffer->add_ref();



        // This pushBuffer will wait until the mediaBuffer is consumed.

        if (currentTrack->pushBuffer(mediaBuffer) != OK) {

        android::status_t pushStatus = currentTrack->pushBuffer(mediaBuffer);



        if (pushStatus != OK) {

            if (pushStatus == INVALID_OPERATION) {

                // In Case of INVALID_OPERATION, mObserver needs to be set before calling release()

                mediaBuffer->setObserver(currentTrack.get());

            }

            mediaBuffer->release();

        }

    }