diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-01-28 15:04:28 -0800 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-01-28 15:04:28 -0800 |
| commit | 1338e177ad49369e83ff724ee8428b0b833d48d1 (patch) | |
| tree | bea8452c8ffc05c517ae36598e9a2a344ba0e124 | |
| parent | 64c496c8d51c71605cd34a510da2ecd8180656ec (diff) | |
| download | frameworks_av-1338e177ad49369e83ff724ee8428b0b833d48d1.zip frameworks_av-1338e177ad49369e83ff724ee8428b0b833d48d1.tar.gz frameworks_av-1338e177ad49369e83ff724ee8428b0b833d48d1.tar.bz2 | |
stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder
Bug:19013118
Change-Id: I58f63ae13559c93ea5e627b658c9919e86769076
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp index 8e8e78a..60c79a6 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp @@ -118,10 +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. */ + /* While not technically supported, try to decode SPL4&SPL5 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 != 0x04 && tmpvar != 0x05 && tmpvar != 0x10 && tmpvar != 0x11 && tmpvar != 0x12 && tmpvar != 0x21 && tmpvar != 0x22 && /* Core Profile Levels */ tmpvar != 0xA1 && tmpvar != 0xA2 && tmpvar != 0xA3 && |