commit fe9611bd65a8d968d6512f6a83078ac064ec8e6e
author Jeff Brown <jeffbrown@google.com> Mon Aug 12 23:59:55 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 12 23:59:55 2013 +0000
tree 4e4a1653930bab697eefd2ba0831dcfa41e64617
parent b8689b31813f55cbc1bf8e9ca0d46a9ee113e38a
parent ac0bbe16f3eba46b3d8057b66c2aff9101fc6f7d

Merge "Fix potential leak of audio input handle." into klp-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 5aefa58..36549d1 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -4123,13 +4123,28 @@
     if (params->findInt32("drop-input-frames", &dropInputFrames)) {
         bool suspend = dropInputFrames != 0;
 
-        CHECK_EQ((status_t)OK,
-                 mOMX->setInternalOption(
+        status_t err =
+            mOMX->setInternalOption(
                      mNode,
                      kPortIndexInput,
                      IOMX::INTERNAL_OPTION_SUSPEND,
                      &suspend,
-                     sizeof(suspend)));
+                     sizeof(suspend));
+
+        if (err != OK) {
+            ALOGE("Failed to set parameter 'drop-input-frames' (err %d)", err);
+            return err;
+        }
+    }
+
+    int32_t dummy;
+    if (params->findInt32("request-sync", &dummy)) {
+        status_t err = requestIDRFrame();
+
+        if (err != OK) {
+            ALOGE("Requesting a sync frame failed w/ err %d", err);
+            return err;
+        }
     }
 
     return OK;