commit 8b8528056ffacbd4cd7aaa9d905a485612b20deb
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 02 19:52:51 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 02 19:52:51 2017 +0000
tree f947d7071055051e59bec024abeda0bec0545f8c
parent 46c17d1375cc41d6f8be8d284231e6c64fcd9345
parent 10fd056c636861b9e45e3df8456c95a5ddbcc556

Merge "libaudiohal: When starting write, consider the stream buffer size" into oc-mr1-dev

media/libstagefright/StagefrightMetadataRetriever.cpp

diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index 03dc9df..57af772 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -422,15 +422,8 @@
                 && trackMeta->findInt32(kKeyDisplayHeight, &height)
                 && frame->mDisplayWidth > 0 && frame->mDisplayHeight > 0
                 && width > 0 && height > 0) {
-            if (frame->mDisplayHeight * (int64_t)width / height > (int64_t)frame->mDisplayWidth) {
-                frame->mDisplayHeight =
-                        (int32_t)(height * (int64_t)frame->mDisplayWidth / width);
-            } else {
-                frame->mDisplayWidth =
-                        (int32_t)(frame->mDisplayHeight * (int64_t)width / height);
-            }
-            ALOGV("thumbNail width and height are overridden to %d x %d",
-                    frame->mDisplayWidth, frame->mDisplayHeight);
+            frame->mDisplayWidth = width;
+            frame->mDisplayHeight = height;
         }
     }