commit 9ec10a72bf56471a8afea7b8a7aaa705ef7d7cca
author Wei Jia <wjia@google.com> Fri Jun 17 23:14:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 17 23:14:38 2016 +0000
tree 3445375d42a3e2df8c844a439984f339acf02e75
parent 85eb70d63f722641eb0b382e8137fee88b56b69f
parent 5af6a9b4a6924377d80de7c3f460f99b89cff91e

Merge "MediaPlayer: disallow calling setPlaybackParams in stopped state." into nyc-mr1-dev

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 0b10ae4..4504b58 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");