commit 11eddd5a222180edbf7fba4f69d733463ebf4553
author Robert Shih <robertshih@google.com> Sat Jul 14 06:23:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 14 06:23:21 2018 +0000
tree 9efb7939ffa1ba612e39a5dcbab59722ef776203
parent d8cbab144398d0e9b3cdc2f8c42b4ea0c921e355
parent 7fd048b3fbb31b8e53bc2d76452bd3fb20d03f7a

Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev

* changes:
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74de5 am: a3acb4c0f2 am: b7b790ef84 am: 17ae208764 am: c60f2ff6b4
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74de5 am: a3acb4c0f2 am: b7b790ef84 am: 17ae208764
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74de5 am: a3acb4c0f2 am: b7b790ef84
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74de5 am: a3acb4c0f2
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74de5
  M3UParser: handle missing EXT-X-MEDIA URIs

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 2b29494..35fb312 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -1071,7 +1071,8 @@
         }
 
         case OMXBuffer::kBufferTypeANWBuffer: {
-            if (mPortMode[portIndex] != IOMX::kPortModePresetANWBuffer) {
+            if (mPortMode[portIndex] != IOMX::kPortModePresetANWBuffer
+                    && mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer) {
                 break;
             }
             return useGraphicBuffer_l(portIndex, omxBuffer.mGraphicBuffer, buffer);