commit 1441fdc2037c00bf9106dad98dcd7a02886fbd02
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 02 16:21:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 02 16:21:34 2018 +0000
tree e61bfc6f0805ffa11051147f74a3b1cddbab5e87
parent d2e705a7cb2ff043fc7d2ec8a773fdf3910f5f89
parent 0147f95f7b11817835c94f44753cfad4fea0d65e

Merge "Fix media extractor abort"

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 8412812..44b6a3d 100644
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -5231,9 +5231,13 @@
     uint32_t cts = 0;
     bool isSyncSample = false;
     bool newBuffer = false;
-    if (mBuffer == NULL) {
+    if (mBuffer == NULL || mCurrentSampleIndex >= mCurrentSamples.size()) {
         newBuffer = true;
 
+        if (mBuffer != NULL) {
+            mBuffer->release();
+            mBuffer = NULL;
+        }
         if (mCurrentSampleIndex >= mCurrentSamples.size()) {
             // move to next fragment if there is one
             if (mNextMoofOffset <= mCurrentMoofOffset) {