diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-01-21 09:53:53 -0800 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-01-22 09:43:59 -0800 |
| commit | 463c54e007279996943e27a78ed32f573236e042 (patch) | |
| tree | edd5ed874414e6117a79d69ed8be58203b3f3885 /media/libstagefright/codecs/m4v_h263/dec | |
| parent | 4d4ea7f7ca04cfe70ecf6f35658389f52ae6d3c1 (diff) | |
| download | frameworks_av-463c54e007279996943e27a78ed32f573236e042.zip frameworks_av-463c54e007279996943e27a78ed32f573236e042.tar.gz frameworks_av-463c54e007279996943e27a78ed32f573236e042.tar.bz2 | |
stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
Bug: 19014147
Change-Id: Ie90e8fc69e9ac2cb34d6362e67ad289d002a2c14
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/dec')
| -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 && |