| commit | e8653ac8f0a8c9a2e91e73dccdc45e70c161b0c0 | [log] [tgz] |
|---|---|---|
| author | Bartosz Dolewski <bartosz.dolewski@sonymobile.com> | Fri Jun 17 02:32:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 02:32:18 2016 +0000 |
| tree | 3c0ab6d608cb53bcec72646e1f61f1c575d4f786 | |
| parent | e193b37a92515206241a25ede18fcab5678354fd [diff] | |
| parent | bfc9d5e5d594652410ee03827adf01b323818952 [diff] |
Merge \\\"Using requested video scaling mode in NuPlayer\\\" am: 42cf4c39dc am: f8f2f89cf1 am: bfc9d5e5d5 Change-Id: I44dc761fde557fa49b178d208c0ae9474d65596b
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");