commit 444cbbbad5d9188a92b34736ce68ebdb3371ab9e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 27 17:54:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 27 17:54:20 2023 +0000
tree 7ee6941bce78e1f941c17e472496f9dce4b9af50
parent b25313685a4c8e067091af3af2a575b42090865d
parent 912d7b02cbf2eb1aa2e6dfaca800938fbdcc8603

Merge "C2BqPool: Do not call cancelBuffer() after invalidated" into main

media/libstagefright/include/media/stagefright/MPEG4Writer.h

diff --git a/media/libstagefright/include/media/stagefright/MPEG4Writer.h b/media/libstagefright/include/media/stagefright/MPEG4Writer.h
index 18237e5..054a4b8 100644
--- a/media/libstagefright/include/media/stagefright/MPEG4Writer.h
+++ b/media/libstagefright/include/media/stagefright/MPEG4Writer.h
@@ -77,9 +77,6 @@
     virtual void setStartTimeOffsetMs(int ms) { mStartTimeOffsetMs = ms; }
     virtual int32_t getStartTimeOffsetMs() const { return mStartTimeOffsetMs; }
     virtual status_t setNextFd(int fd);
-    bool isSampleMetadataValid([[maybe_unused]] size_t trackIndex, int64_t timeUs) override {
-        return timeUs >= 0;
-    }
 
 protected:
     virtual ~MPEG4Writer();

media/module/TEST_MAPPING

diff --git a/media/module/TEST_MAPPING b/media/module/TEST_MAPPING
index c59df72..1b572da 100644
--- a/media/module/TEST_MAPPING
+++ b/media/module/TEST_MAPPING
@@ -1,8 +1,7 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "hal_implementation_test"
     }
   ]
 }
-