mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecparsers: h264: fix derivation of default scaling lists.

Browse source 
When useDefaultScalingMatrixFlag is computed to be 1 while parsing
scaling_list(), then the scaling list shall be inferred to be equal
to the default list (7.4.2.1.1.1). That default list is really one
of Default_4x4_{Intra,Inter} or Default_8x8_{Intra,Inter} and not
one from fall-back rule sets A or B.

This fixes parsing for FRExt1_Panasonic_D, FRExt2_Panasonic_C,
FRExt3_Panasonic_E and FRExt4_Panasonic_B.

https://bugzilla.gnome.org/show_bug.cgi?id=724518

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Gwenole Beauchesne 2014-04-26 08:08:57 +02:00
parent 241c3acad5
commit 1b9e8a25a0
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/codecparsers/gsth264parser.c
View file

@ -364,6 +364,14 @@ gst_h264_parser_parse_scaling_list (NalReader * nr,
{ {
guint i; guint i;
static const guint8 *default_lists[12] = {
default_4x4_intra, default_4x4_intra, default_4x4_intra,
default_4x4_inter, default_4x4_inter, default_4x4_inter,
default_8x8_intra, default_8x8_inter,
default_8x8_intra, default_8x8_inter,
default_8x8_intra, default_8x8_inter
};
GST_DEBUG ("parsing scaling lists"); GST_DEBUG ("parsing scaling lists");
for (i = 0; i < 12; i++) { for (i = 0; i < 12; i++) {
@ -397,7 +405,8 @@ gst_h264_parser_parse_scaling_list (NalReader * nr,
next_scale = (last_scale + delta_scale) & 0xff; next_scale = (last_scale + delta_scale) & 0xff;
} }
if (j == 0 && next_scale == 0) { if (j == 0 && next_scale == 0) {
use_default = TRUE; /* Use default scaling lists (7.4.2.1.1.1) */
memcpy (scaling_list, default_lists[i], size);
break; break;
} }
last_scale = scaling_list[j] = last_scale = scaling_list[j] =