mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 06:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264: fix modification process of reference picture lists.

Browse source 
Construction of RefPicList0/1 could be off by one element.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Wind Yuan 2012-02-29 03:08:46 -05:00 committed by Gwenole Beauchesne
parent 033a675bcc
commit 6b56c84c9b
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
View file

@ -1396,14 +1396,18 @@ exec_picture_refs_modification_1(
if (picNum > CurrPicNum) if (picNum > CurrPicNum)
picNum -= MaxPicNum; picNum -= MaxPicNum;
// (8-37)
for (j = num_refs; j > ref_list_idx; j--) for (j = num_refs; j > ref_list_idx; j--)
ref_list[j] = ref_list[j - 1]; ref_list[j] = ref_list[j - 1];
found_ref_idx = find_short_term_reference(decoder, picNum); found_ref_idx = find_short_term_reference(decoder, picNum);
ref_list[ref_list_idx++] = ref_list[ref_list_idx++] =
found_ref_idx >= 0 ? priv->short_ref[found_ref_idx] : NULL; found_ref_idx >= 0 ? priv->short_ref[found_ref_idx] : NULL;
n = ref_list_idx; n = ref_list_idx;
for (j = ref_list_idx; j < num_refs; j++) { for (j = ref_list_idx; j <= num_refs; j++) {
const gint32 PicNumF = ref_list[j]->is_long_term ? gint32 PicNumF;
if (!ref_list[j])
continue;
PicNumF = ref_list[j]->is_long_term ?
MaxPicNum : ref_list[j]->pic_num; MaxPicNum : ref_list[j]->pic_num;
if (PicNumF != picNum) if (PicNumF != picNum)
ref_list[n++] = ref_list[j]; ref_list[n++] = ref_list[j];
@ -1420,8 +1424,11 @@ exec_picture_refs_modification_1(
ref_list[ref_list_idx++] = ref_list[ref_list_idx++] =
found_ref_idx >= 0 ? priv->long_ref[found_ref_idx] : NULL; found_ref_idx >= 0 ? priv->long_ref[found_ref_idx] : NULL;
n = ref_list_idx; n = ref_list_idx;
for (j = ref_list_idx; j < num_refs; j++) { for (j = ref_list_idx; j <= num_refs; j++) {
const gint32 LongTermPicNumF = ref_list[j]->is_long_term ? gint32 LongTermPicNumF;
if (!ref_list[j])
continue;
LongTermPicNumF = ref_list[j]->is_long_term ?
ref_list[j]->long_term_pic_num : INT_MAX; ref_list[j]->long_term_pic_num : INT_MAX;
if (LongTermPicNumF != l->value.long_term_pic_num) if (LongTermPicNumF != l->value.long_term_pic_num)
ref_list[n++] = ref_list[j]; ref_list[n++] = ref_list[j];