commit 123efa3d1b317c3e055205827113e6f78603107c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 31 23:10:34 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 31 23:10:35 2016 +0000
tree e812443a162bd622dc25a26880907c258eed683f
parent 83c4ce76b54de9f45ee0451c4b105ae27a51bea9
parent 84eb96049ce0690334530ad916e22d6933c0223b

Merge "Camera API1: relax the fps check with some margin" into nyc-mr1-dev

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 5f903a9..43a50ae 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -805,13 +805,6 @@
         }
         memset(data, 0, allottedSize);
 
-        // if we are not connecting the buffers, the sizes must match
-        if (allottedSize != params->size()) {
-            CLOG_ERROR(useBuffer, BAD_VALUE, SIMPLE_BUFFER(portIndex, (size_t)allottedSize, data));
-            delete[] data;
-            return BAD_VALUE;
-        }
-
         buffer_meta = new BufferMeta(
                 params, portIndex, false /* copyToOmx */, false /* copyFromOmx */, data);
     } else {