commit 252993dd283aec7468fa51af76341fe9484d401a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 27 15:00:21 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 27 15:00:21 2023 +0000
tree b1492b8a63992d76bdc1ecd0aa51e5f18d4c5230
parent 8ee1950cf52837dd976e20064cae6ae9c61419a0
parent da3f561b375fedbde41906dc1d37a2320b192dfd

Merge "Fix paths for unit test media resources" into main

media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp

diff --git a/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp b/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp
index 2016b2a..fee5c94 100644
--- a/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp
+++ b/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp
@@ -226,7 +226,13 @@
         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();
         }
     }

media/module/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp

diff --git a/media/module/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp b/media/module/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp
index 8f8ad4e..86979f4 100644
--- a/media/module/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp
+++ b/media/module/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp
@@ -615,7 +615,7 @@
 }
 
 void CustomCsvReporter::PrintRunData(const Run& run) {
-    if (run.error_occurred) {
+    if (run.skipped) {
         return;
     }
     std::ostream& Out = GetOutputStream();