commit df6c6af2634ef9e2495e129d9608ffa60d8e7f5a
author Wei Jia <wjia@google.com> Thu Sep 29 11:27:15 2016 -0700
committer Wei Jia <wjia@google.com> Thu Oct 13 22:22:45 2016 +0000
tree 5628eeee58bda2b53bb543e41491a4fb5108a4f4
parent 52dd2e30b204949353c2dee0b1f1712677bbda43

NuPlayer: use width and height from tkhd for display and thumbnail.

Bug: 29061766
Change-Id: I863219e20986da1319bc5e84f35feb76ae038a69

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 7178661..0490fd5 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1756,6 +1756,20 @@
         displayWidth = (displayWidth * sarWidth) / sarHeight;
 
         ALOGV("display dimensions %d x %d", displayWidth, displayHeight);
+    } else {
+        int32_t width, height;
+        if (inputFormat->findInt32("display-width", &width)
+                && inputFormat->findInt32("display-height", &height)
+                && width > 0 && height > 0
+                && displayWidth > 0 && displayHeight > 0) {
+            if (displayHeight * (int64_t)width / height > (int64_t)displayWidth) {
+                displayHeight = (int32_t)(displayWidth * (int64_t)height / width);
+            } else {
+                displayWidth = (int32_t)(displayHeight * (int64_t)width / height);
+            }
+            ALOGV("Video display width and height are overridden to %d x %d",
+                 displayWidth, displayHeight);
+        }
     }
 
     int32_t rotationDegrees;