diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2014-10-03 18:23:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-03 18:23:46 +0000 |
| commit | 8c8b2e4ddbae88751f47f1bc9d4e9e159d61ef24 (patch) | |
| tree | 88cb24b1a5b185d7fb5e377db92d5fb8041101e0 /media/libstagefright/codecs | |
| parent | 12d0cd1bf756ec96755fae2e573659898bfba6d6 (diff) | |
| parent | c4fd8b3b7fc24932626143ea45ab75192cc247c2 (diff) | |
| download | frameworks_av-8c8b2e4ddbae88751f47f1bc9d4e9e159d61ef24.zip frameworks_av-8c8b2e4ddbae88751f47f1bc9d4e9e159d61ef24.tar.gz frameworks_av-8c8b2e4ddbae88751f47f1bc9d4e9e159d61ef24.tar.bz2 | |
am c4fd8b3b: am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev
* commit 'c4fd8b3b7fc24932626143ea45ab75192cc247c2':
stagefright: fix fake-stride handling for H263 SW decoder
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp index d98fa80..1f4b6fd 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp @@ -156,7 +156,8 @@ void SoftMPEG4::onQueueFilled(OMX_U32 /* portIndex */) { (mMode == MODE_MPEG4) ? MPEG4_MODE : H263_MODE; Bool success = PVInitVideoDecoder( - mHandle, vol_data, &vol_size, 1, mWidth, mHeight, mode); + mHandle, vol_data, &vol_size, 1, + outputBufferWidth(), outputBufferHeight(), mode); if (!success) { ALOGW("PVInitVideoDecoder failed. Unsupported content?"); @@ -321,7 +322,7 @@ bool SoftMPEG4::handlePortSettingsChange() { vol_data[0] = NULL; if (!PVInitVideoDecoder( - mHandle, vol_data, &vol_size, 1, mWidth, mHeight, + mHandle, vol_data, &vol_size, 1, outputBufferWidth(), outputBufferHeight(), H263_MODE)) { notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL); mSignalledError = true; |