generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Refactor ff_h264_decode_ref_pic_list_reordering

Browse Source 
In preparation for MVC support.
This commit is contained in:
Luca Barbato 2014-02-13 15:31:57 +01:00
parent 73eca738ac
commit f8c507f44b
1 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/h264_refs.c
View File

@ -237,14 +237,16 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
return -1; return -1;
} }
if (reordering_of_pic_nums_idc < 3) { switch (reordering_of_pic_nums_idc) {
if (reordering_of_pic_nums_idc < 2) { case 0:
case 1: {
const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 1; const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 1;
int frame_num; int frame_num;
if (abs_diff_pic_num > h->max_pic_num) { if (abs_diff_pic_num > h->max_pic_num) {
av_log(h->avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); av_log(h->avctx, AV_LOG_ERROR,
return -1; "abs_diff_pic_num overflow\n");
return AVERROR_INVALIDDATA;
} }
if (reordering_of_pic_nums_idc == 0) if (reordering_of_pic_nums_idc == 0)
@ -265,15 +267,18 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
} }
if (i >= 0) if (i >= 0)
ref->pic_id = pred; ref->pic_id = pred;
} else { break;
}
case 2: {
int long_idx; int long_idx;
pic_id = get_ue_golomb(&h->gb); // long_term_pic_idx pic_id = get_ue_golomb(&h->gb); // long_term_pic_idx
long_idx = pic_num_extract(h, pic_id, &pic_structure); long_idx = pic_num_extract(h, pic_id, &pic_structure);
if (long_idx > 31) { if (long_idx > 31) {
av_log(h->avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n"); av_log(h->avctx, AV_LOG_ERROR,
return -1; "long_term_pic_idx overflow\n");
return AVERROR_INVALIDDATA;
} }
ref = h->long_ref[long_idx]; ref = h->long_ref[long_idx];
assert(!(ref && !ref->reference)); assert(!(ref && !ref->reference));
@ -284,10 +289,17 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
} else { } else {
i = -1; i = -1;
} }
break;
}
default:
av_log(h->avctx, AV_LOG_ERROR,
"illegal reordering_of_pic_nums_idc\n");
return AVERROR_INVALIDDATA;
} }
if (i < 0) { if (i < 0) {
av_log(h->avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); av_log(h->avctx, AV_LOG_ERROR,
"reference picture missing during reorder\n");
memset(&h->ref_list[list][index], 0, sizeof(Picture)); // FIXME memset(&h->ref_list[list][index], 0, sizeof(Picture)); // FIXME
} else { } else {
for (i = index; i + 1 < h->ref_count[list]; i++) { for (i = index; i + 1 < h->ref_count[list]; i++) {
@ -303,10 +315,6 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
pic_as_field(&h->ref_list[list][index], pic_structure); pic_as_field(&h->ref_list[list][index], pic_structure);
} }
} }
} else {
av_log(h->avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
return -1;
}
} }
} }
} }