commit 7a931674473110c2ae47b0f385e66086f22b7648
author Lajos Molnar <lajos@google.com> Thu Sep 15 22:26:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 15 22:26:50 2016 +0000
tree 6fe1fc4aa832d8588eda8147b62a0b8c53925f0e
parent e0de63ea415876d9271c27178af91367cfb378ba
parent 38cd617b13ae0ba48ce5e7760ed56945c7909eef

IOMX: restrict conversion of ANWB to gralloc source in emptyBuffer am: 087ff38490 am: d5e14dcd5d
am: 38cd617b13

Change-Id: Ib6f1b6b7ff9d90f1013d6c62c92ade159282f80e

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index a0dc2ec..13b7cbb 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -167,6 +167,10 @@
         return buf;
     }
 
+    bool copyToOmx() const {
+        return mCopyToOmx;
+    }
+
     void setGraphicBuffer(const sp<GraphicBuffer> &graphicBuffer) {
         mGraphicBuffer = graphicBuffer;
     }
@@ -788,7 +792,7 @@
                 params, portIndex, false /* copyToOmx */, false /* copyFromOmx */, data);
     } else {
         buffer_meta = new BufferMeta(
-                params, portIndex, false /* copyFromOmx */, false /* copyToOmx */, NULL);
+                params, portIndex, false /* copyToOmx */, false /* copyFromOmx */, NULL);
     }
 
     OMX_BUFFERHEADERTYPE *header;
@@ -1277,7 +1281,8 @@
 
     // convert incoming ANW meta buffers if component is configured for gralloc metadata mode
     // ignore rangeOffset in this case
-    if (mMetadataType[kPortIndexInput] == kMetadataBufferTypeGrallocSource
+    if (buffer_meta->copyToOmx()
+            && mMetadataType[kPortIndexInput] == kMetadataBufferTypeGrallocSource
             && backup->capacity() >= sizeof(VideoNativeMetadata)
             && codec->capacity() >= sizeof(VideoGrallocMetadata)
             && ((VideoNativeMetadata *)backup->base())->eType