diff options
| author | Chong Zhang <chz@google.com> | 2015-07-21 17:29:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 17:29:15 +0000 |
| commit | 8f0547a954b39d5750488be7e060ebe1ebfdf666 (patch) | |
| tree | d97e28a280958c5c99c171c6af4dadbaf49b912e /media | |
| parent | 17d0efd17fbb2573adcde8dcbe77726f622817da (diff) | |
| parent | 87aed14c3d1462eaa92ddd00ca0b1167a2e5749e (diff) | |
| download | frameworks_av-8f0547a954b39d5750488be7e060ebe1ebfdf666.zip frameworks_av-8f0547a954b39d5750488be7e060ebe1ebfdf666.tar.gz frameworks_av-8f0547a954b39d5750488be7e060ebe1ebfdf666.tar.bz2 | |
Merge "SoftAVCDec: init decoder using updated size" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/avcdec/SoftAVCDec.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp index aab3af7..8e7a277 100644 --- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp +++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp @@ -526,6 +526,8 @@ OMX_ERRORTYPE SoftAVC::internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR p const uint32_t oldHeight = mHeight; OMX_ERRORTYPE ret = SoftVideoDecoderOMXComponent::internalSetParameter(index, params); if (mWidth != oldWidth || mHeight != oldHeight) { + mNewWidth = mWidth; + mNewHeight = mHeight; status_t err = reInitDecoder(mNewWidth, mNewHeight); if (err != OK) { notify(OMX_EventError, OMX_ErrorUnsupportedSetting, err, NULL); |