commit 25df0fc0328920c585eb30cc21eb85b74d103eb2
author Lajos Molnar <lajos@google.com> Sat Apr 09 05:49:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 09 05:49:59 2016 +0000
tree 5bc99d42c99869b19a38c4f90126a3e5d0c6ff63
parent 8a049c2f127f95715375d5ede39b2363b3a68329
parent 94e5455150064f40041dddf7a1a83b8414f01b91

Merge "stagefright: propagate float frame rates to MetaData" into nyc-dev

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 7daae20..448f8aa 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -828,8 +828,13 @@
     }
 
     int32_t fps;
+    float fpsFloat;
     if (msg->findInt32("frame-rate", &fps) && fps > 0) {
         meta->setInt32(kKeyFrameRate, fps);
+    } else if (msg->findFloat("frame-rate", &fpsFloat)
+            && fpsFloat >= 1 && fpsFloat <= INT32_MAX) {
+        // truncate values to distinguish between e.g. 24 vs 23.976 fps
+        meta->setInt32(kKeyFrameRate, (int32_t)fpsFloat);
     }
 
     // reassemble the csd data into its original form