| commit | bfc9d5e5d594652410ee03827adf01b323818952 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Jun 17 02:26:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 02:26:51 2016 +0000 |
| tree | 9182d0d2ebd949d0592765fce88a111a332346a0 | |
| parent | 0d088dede12e7bb646665918687c5bd77e7d3a26 [diff] | |
| parent | f8f2f89cf1781091cba8ce8ce6f38bc6ad069dff [diff] |
Merge \\"Using requested video scaling mode in NuPlayer\\" am: 42cf4c39dc am: f8f2f89cf1 Change-Id: I3c00f5086d3292aeb0a491f43623a1f38247efd7
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");