Skip to content

F
ffmpeg.wasm-core
Commit 98c5db89 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/h264_slice: make current_slice reset code more strict 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 514d9bb5
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 3 deletions
libavcodec/h264_slice.c
View file @ 98c5db89
...@@ -1206,11 +1206,21 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) ...@@ -1206,11 +1206,21 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
first_mb_in_slice = get_ue_golomb_long(&sl->gb); first_mb_in_slice = get_ue_golomb_long(&sl->gb);
if (first_mb_in_slice == 0) { // FIXME better field boundary detection if (first_mb_in_slice == 0) { // FIXME better field boundary detection
if (h->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) { if (h->current_slice) {
ff_h264_field_end(h, sl, 1); if (h->cur_pic_ptr && FIELD_PICTURE(h) && h->first_field) {
ff_h264_field_end(h, sl, 1);
h->current_slice = 0;
} else if (h->cur_pic_ptr && !FIELD_PICTURE(h) && !h->first_field && h->nal_unit_type == NAL_IDR_SLICE) {
av_log(h, AV_LOG_WARNING, "Broken frame packetizing\n");
ff_h264_field_end(h, sl, 1);
h->current_slice = 0;
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0);
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1);
h->cur_pic_ptr = NULL;
} else
return AVERROR_INVALIDDATA;
} }
h->current_slice = 0;
if (!h->first_field) { if (!h->first_field) {
if (h->cur_pic_ptr && !h->droppable) { if (h->cur_pic_ptr && !h->droppable) {
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment