diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-01-23 19:56:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 19:56:17 +0000 |
| commit | 0a953586cdc498a2df6f8562d6e2b9c39594738c (patch) | |
| tree | a311cada45c3d3c0975722fedf93e194f73777e2 /media/libstagefright/codecs | |
| parent | c079c5db8057d0ab602841f47fef1b40faaeccb3 (diff) | |
| parent | 40a0ac3aba5ff8fc44e51ba4f7b0bac3448818c9 (diff) | |
| download | frameworks_av-0a953586cdc498a2df6f8562d6e2b9c39594738c.zip frameworks_av-0a953586cdc498a2df6f8562d6e2b9c39594738c.tar.gz frameworks_av-0a953586cdc498a2df6f8562d6e2b9c39594738c.tar.bz2 | |
am 40a0ac3a: am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
* commit '40a0ac3aba5ff8fc44e51ba4f7b0bac3448818c9':
stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp index b03ec8c..8e8e78a 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp @@ -118,6 +118,10 @@ PV_STATUS DecodeVOLHeader(VideoDecData *video, int layer) { /* support SPL0-3 & SSPL0-2 */ if (tmpvar != 0x01 && tmpvar != 0x02 && tmpvar != 0x03 && tmpvar != 0x08 && + /* While not technically supported, try to decode SPL4 files as well. */ + /* We'll fail later if the size is too large. This is to allow playback of */ + /* some <=CIF files generated by other encoders. */ + tmpvar != 0x04 && tmpvar != 0x10 && tmpvar != 0x11 && tmpvar != 0x12 && tmpvar != 0x21 && tmpvar != 0x22 && /* Core Profile Levels */ tmpvar != 0xA1 && tmpvar != 0xA2 && tmpvar != 0xA3 && |