mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpeg4parser: fix some issues related to video object layer parsing

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=683254
This commit is contained in:
Arnaud Vrac 2012-09-02 20:18:32 +02:00 committed by Edward Hervey
parent 207a76daea
commit af379b0b8e
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst-libs/gst/codecparsers/gstmpeg4parser.c
View file

@ -943,6 +943,9 @@ gst_mpeg4_parse_video_object_layer (GstMpeg4VideoObjectLayer * vol,
if (vo) { if (vo) {
vol->verid = vo->verid; vol->verid = vo->verid;
vol->priority = vo->priority; vol->priority = vo->priority;
} else {
vol->verid = 1;
vol->priority = 0;
} }
vol->low_delay = FALSE; vol->low_delay = FALSE;
@ -1074,10 +1077,9 @@ gst_mpeg4_parse_video_object_layer (GstMpeg4VideoObjectLayer * vol,
READ_UINT8 (&br, vol->interlaced, 1); READ_UINT8 (&br, vol->interlaced, 1);
READ_UINT8 (&br, vol->obmc_disable, 1); READ_UINT8 (&br, vol->obmc_disable, 1);
if (vol->verid == 0x1) { if (vol->verid == 0x1)
READ_UINT8 (&br, tmp, 1); READ_UINT8 (&br, tmp, 1);
vol->sprite_enable = tmp; else
} else
READ_UINT8 (&br, tmp, 2); READ_UINT8 (&br, tmp, 2);
vol->sprite_enable = tmp; vol->sprite_enable = tmp;
@ -1115,7 +1117,7 @@ gst_mpeg4_parse_video_object_layer (GstMpeg4VideoObjectLayer * vol,
gst_bit_reader_get_bits_uint8_unchecked (&br, 1); gst_bit_reader_get_bits_uint8_unchecked (&br, 1);
} }
if (vol->shape != GST_MPEG4_RECTANGULAR) if (vol->verid != 0x1 && vol->shape != GST_MPEG4_RECTANGULAR)
READ_UINT8 (&br, vol->sadct_disable, 1); READ_UINT8 (&br, vol->sadct_disable, 1);
READ_UINT8 (&br, vol->not_8_bit, 1); READ_UINT8 (&br, vol->not_8_bit, 1);
@ -1169,14 +1171,14 @@ gst_mpeg4_parse_video_object_layer (GstMpeg4VideoObjectLayer * vol,
if (vol->data_partitioned) if (vol->data_partitioned)
READ_UINT8 (&br, vol->reversible_vlc, 1); READ_UINT8 (&br, vol->reversible_vlc, 1);
if (vol->verid != 0x01) if (vol->verid != 0x01) {
READ_UINT8 (&br, vol->newpred_enable, 1); READ_UINT8 (&br, vol->newpred_enable, 1);
if (vol->newpred_enable)
/* requested_upstream_message_type and newpred_segment_type */
SKIP (&br, 3);
if (vol->newpred_enable) READ_UINT8 (&br, vol->reduced_resolution_vop_enable, 1);
/* requested_upstream_message_type and newpred_segment_type */ }
SKIP (&br, 3);
READ_UINT8 (&br, vol->reduced_resolution_vop_enable, 1);
READ_UINT8 (&br, vol->scalability, 1); READ_UINT8 (&br, vol->scalability, 1);
if (vol->scalability) { if (vol->scalability) {