mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecparsers: h264: rename ref_pic_list_reordering() to ref_pic_list_modification().

Browse source 
Upgrade to current AVC specification.
This commit is contained in:
Gwenole Beauchesne 2011-11-22 09:47:57 +01:00 committed by Thibault Saunier
parent 2099a39459
commit 99101a5824
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -743,55 +743,57 @@ error:
} }
static gboolean static gboolean
slice_parse_ref_pic_list_reordering (GstH264SliceHdr * slice, NalReader * nr) slice_parse_ref_pic_list_modification (GstH264SliceHdr * slice, NalReader * nr)
{ {
GST_DEBUG ("parsing \"Reference picture list reordering\""); GST_DEBUG ("parsing \"Reference picture list modification\"");
if (!GST_H264_IS_I_SLICE (slice) && !GST_H264_IS_SI_SLICE (slice)) { if (!GST_H264_IS_I_SLICE (slice) && !GST_H264_IS_SI_SLICE (slice)) {
guint8 ref_pic_list_reordering_flag_l0; guint8 ref_pic_list_modification_flag_l0;
guint32 reordering_of_pic_nums_idc; guint32 modification_of_pic_nums_idc;
READ_UINT8 (nr, ref_pic_list_reordering_flag_l0, 1); READ_UINT8 (nr, ref_pic_list_modification_flag_l0, 1);
if (ref_pic_list_reordering_flag_l0) if (ref_pic_list_modification_flag_l0)
do { do {
READ_UE (nr, reordering_of_pic_nums_idc); READ_UE (nr, modification_of_pic_nums_idc);
if (reordering_of_pic_nums_idc == 0 || reordering_of_pic_nums_idc == 1) { if (modification_of_pic_nums_idc == 0
|| modification_of_pic_nums_idc == 1) {
guint32 abs_diff_pic_num_minus1 G_GNUC_UNUSED; guint32 abs_diff_pic_num_minus1 G_GNUC_UNUSED;
READ_UE_ALLOWED (nr, abs_diff_pic_num_minus1, 0, READ_UE_ALLOWED (nr, abs_diff_pic_num_minus1, 0,
slice->max_pic_num - 1); slice->max_pic_num - 1);
} else if (reordering_of_pic_nums_idc == 2) { } else if (modification_of_pic_nums_idc == 2) {
guint32 long_term_pic_num; guint32 long_term_pic_num;
READ_UE (nr, long_term_pic_num); READ_UE (nr, long_term_pic_num);
} }
} while (reordering_of_pic_nums_idc != 3); } while (modification_of_pic_nums_idc != 3);
} }
if (GST_H264_IS_B_SLICE (slice)) { if (GST_H264_IS_B_SLICE (slice)) {
guint8 ref_pic_list_reordering_flag_l1; guint8 ref_pic_list_modification_flag_l1;
guint32 reordering_of_pic_nums_idc; guint32 modification_of_pic_nums_idc;
READ_UINT8 (nr, ref_pic_list_reordering_flag_l1, 1); READ_UINT8 (nr, ref_pic_list_modification_flag_l1, 1);
if (ref_pic_list_reordering_flag_l1) if (ref_pic_list_modification_flag_l1)
do { do {
READ_UE (nr, reordering_of_pic_nums_idc); READ_UE (nr, modification_of_pic_nums_idc);
if (reordering_of_pic_nums_idc == 0 || reordering_of_pic_nums_idc == 1) { if (modification_of_pic_nums_idc == 0
|| modification_of_pic_nums_idc == 1) {
guint32 abs_diff_num_minus1; guint32 abs_diff_num_minus1;
READ_UE (nr, abs_diff_num_minus1); READ_UE (nr, abs_diff_num_minus1);
} else if (reordering_of_pic_nums_idc == 2) { } else if (modification_of_pic_nums_idc == 2) {
guint32 long_term_pic_num; guint32 long_term_pic_num;
READ_UE (nr, long_term_pic_num); READ_UE (nr, long_term_pic_num);
} }
} while (reordering_of_pic_nums_idc != 3); } while (modification_of_pic_nums_idc != 3);
} }
return TRUE; return TRUE;
error: error:
GST_WARNING ("error parsing \"Reference picture list reordering\""); GST_WARNING ("error parsing \"Reference picture list modification\"");
return FALSE; return FALSE;
} }
@ -1781,7 +1783,7 @@ gst_h264_parser_parse_slice_hdr (GstH264NalParser * nalparser,
} }
} }
if (!slice_parse_ref_pic_list_reordering (slice, &nr)) if (!slice_parse_ref_pic_list_modification (slice, &nr))
goto error; goto error;
if ((pps->weighted_pred_flag && (GST_H264_IS_P_SLICE (slice) if ((pps->weighted_pred_flag && (GST_H264_IS_P_SLICE (slice)