From 631d5d94ed404afa04c5e62dc105d4798166e09f Mon Sep 17 00:00:00 2001 From: Cong Zhong Date: Wed, 17 Apr 2013 10:44:48 +0800 Subject: [PATCH] codecparsers: h264: fix picture level scaling lists derivation (rule B). Fix picture level scaling lists derivation from fall-back rule set B, as specified in 7.4.2.2. More precisely, the sequence level scaling lists need to be used but intra and inter lists arguments were swapped. This fixes FRExt/freh5.264 from conformance testing. https://bugzilla.gnome.org/show_bug.cgi?id=720099 Signed-off-by: Gwenole Beauchesne --- gst-libs/gst/codecparsers/gsth264parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c index 13f51339de..72abb130cd 100644 --- a/gst-libs/gst/codecparsers/gsth264parser.c +++ b/gst-libs/gst/codecparsers/gsth264parser.c @@ -1703,8 +1703,8 @@ gst_h264_parse_pps (GstH264NalParser * nalparser, GstH264NalUnit * nalu, if (sps->scaling_matrix_present_flag) { if (!gst_h264_parser_parse_scaling_list (&nr, pps->scaling_lists_4x4, pps->scaling_lists_8x8, - sps->scaling_lists_4x4[0], sps->scaling_lists_4x4[3], - sps->scaling_lists_8x8[0], sps->scaling_lists_8x8[3], n_lists)) + sps->scaling_lists_4x4[3], sps->scaling_lists_4x4[0], + sps->scaling_lists_8x8[3], sps->scaling_lists_8x8[0], n_lists)) goto error; } else { if (!gst_h264_parser_parse_scaling_list (&nr,