commit f8f2f89cf1781091cba8ce8ce6f38bc6ad069dff
author Bartosz Dolewski <bartosz.dolewski@sonymobile.com> Fri Jun 17 02:24:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 17 02:24:00 2016 +0000
tree 2e8f1de6f23681bfab68c582d6e0d5eba76654b5
parent dbcce36298345b3e40034e44f2ba706e3c544f1e
parent 42cf4c39dcfc7c2cbd9fa3e6769dcd130d56c171

Merge \"Using requested video scaling mode in NuPlayer\"
am: 42cf4c39dc

Change-Id: I3fa1f06ba5a492019371e43dd08f38ffa24aafca

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 172b5c3..fc98982 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1005,6 +1005,7 @@
                 sp<AMessage> inputFormat =
                         mSource->getFormat(false /* audio */);
 
+                setVideoScalingMode(mVideoScalingMode);
                 updateVideoSize(inputFormat, format);
             } else if (what == DecoderBase::kWhatShutdownCompleted) {
                 ALOGV("%s shutdown completed", audio ? "audio" : "video");