commit 45714825e06b0990afc71bd547672eb45d5abcf5
author Chong Zhang <chz@google.com> Sun Sep 22 05:08:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sun Sep 22 05:08:35 2019 -0700
tree 14fb832b8fccf6839a772a8e369d8854b582e223
parent 3644001ea41d1b54407dc56fd914a9a257560aba
parent 16639a6e00d6f0f43486209795011f21ff0dc465

Merge "ACodec: read max pts gap and max fps keys for image encoders" into qt-qpr1-dev
am: 16639a6e00

Change-Id: I2b9a85c45dc8d7fe5a6c4993cb6679ff29b8db5d

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 35492bd..369e13f 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1826,6 +1826,23 @@
             mRepeatFrameDelayUs = -1LL;
         }
 
+        if (!msg->findDouble("time-lapse-fps", &mCaptureFps)) {
+            float captureRate;
+            if (msg->findAsFloat(KEY_CAPTURE_RATE, &captureRate)) {
+                mCaptureFps = captureRate;
+            } else {
+                mCaptureFps = -1.0;
+            }
+        }
+
+        if (!msg->findInt32(
+                KEY_CREATE_INPUT_SURFACE_SUSPENDED,
+                (int32_t*)&mCreateInputBuffersSuspended)) {
+            mCreateInputBuffersSuspended = false;
+        }
+    }
+
+    if (encoder && (mIsVideo || mIsImage)) {
         // only allow 32-bit value, since we pass it as U32 to OMX.
         if (!msg->findInt64(KEY_MAX_PTS_GAP_TO_ENCODER, &mMaxPtsGapUs)) {
             mMaxPtsGapUs = 0LL;
@@ -1842,21 +1859,6 @@
         if (mMaxPtsGapUs < 0LL) {
             mMaxFps = -1;
         }
-
-        if (!msg->findDouble("time-lapse-fps", &mCaptureFps)) {
-            float captureRate;
-            if (msg->findAsFloat(KEY_CAPTURE_RATE, &captureRate)) {
-                mCaptureFps = captureRate;
-            } else {
-                mCaptureFps = -1.0;
-            }
-        }
-
-        if (!msg->findInt32(
-                KEY_CREATE_INPUT_SURFACE_SUSPENDED,
-                (int32_t*)&mCreateInputBuffersSuspended)) {
-            mCreateInputBuffersSuspended = false;
-        }
     }
 
     // NOTE: we only use native window for video decoders