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

h264: do not update the context fields copied between threads after finish_setup()

Browse Source 
Should fix a large number of possible races with frame threading.
This commit is contained in:
Anton Khirnov 2015-05-09 21:54:47 +02:00
parent 6d4d3fee63
commit 5ec0bdf2c5
3 changed files with 89 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264.c
View File

@ -950,8 +950,12 @@ static void decode_postinit(H264Context *h, int setup_finished)
h->next_output_pic->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_SEI); h->next_output_pic->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_SEI);
} }
if (setup_finished && !h->avctx->hwaccel) if (setup_finished && !h->avctx->hwaccel) {
ff_thread_finish_setup(h->avctx); ff_thread_finish_setup(h->avctx);
if (h->avctx->active_thread_type & FF_THREAD_FRAME)
h->setup_finished = 1;
}
} }
int ff_pred_weight_table(H264Context *h, H264SliceContext *sl) int ff_pred_weight_table(H264Context *h, H264SliceContext *sl)
@ -1618,6 +1622,7 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
int ret; int ret;
h->flags = avctx->flags; h->flags = avctx->flags;
h->setup_finished = 0;
/* end of stream, output what is still in the buffers */ /* end of stream, output what is still in the buffers */
out: out:

5
libavcodec/h264.h
View File

@ -721,6 +721,11 @@ typedef struct H264Context {
int frame_recovered; ///< Initial frame has been completely recovered int frame_recovered; ///< Initial frame has been completely recovered
/* for frame threading, this is set to 1
* after finish_setup() has been called, so we cannot modify
* some context properties (which are supposed to stay constant between
* slices) anymore */
int setup_finished;
// Timestamp stuff // Timestamp stuff
int sei_buffering_period_present; ///< Buffering period SEI flag int sei_buffering_period_present; ///< Buffering period SEI flag

65
libavcodec/h264_slice.c
View File

@ -1039,6 +1039,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
int last_pic_structure, last_pic_droppable; int last_pic_structure, last_pic_droppable;
int needs_reinit = 0; int needs_reinit = 0;
int field_pic_flag, bottom_field_flag; int field_pic_flag, bottom_field_flag;
int frame_num, droppable, picture_structure;
int mb_aff_frame = 0;
h->qpel_put = h->h264qpel.put_h264_qpel_pixels_tab; h->qpel_put = h->h264qpel.put_h264_qpel_pixels_tab;
h->qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab; h->qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab;
@ -1088,6 +1090,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
} }
// to make a few old functions happy, it's wrong though // to make a few old functions happy, it's wrong though
if (!h->setup_finished)
h->pict_type = sl->slice_type; h->pict_type = sl->slice_type;
pps_id = get_ue_golomb(&sl->gb); pps_id = get_ue_golomb(&sl->gb);
@ -1101,7 +1104,12 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
pps_id); pps_id);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (!h->setup_finished) {
h->pps = *h->pps_buffers[pps_id]; h->pps = *h->pps_buffers[pps_id];
} else if (h->dequant_coeff_pps != pps_id) {
av_log(h->avctx, AV_LOG_ERROR, "PPS changed between slices\n");
return AVERROR_INVALIDDATA;
}
if (!h->sps_buffers[h->pps.sps_id]) { if (!h->sps_buffers[h->pps.sps_id]) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
@ -1135,6 +1143,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
} }
if (!h->setup_finished) {
h->avctx->profile = ff_h264_get_profile(&h->sps); h->avctx->profile = ff_h264_get_profile(&h->sps);
h->avctx->level = h->sps.level_idc; h->avctx->level = h->sps.level_idc;
h->avctx->refs = h->sps.ref_frame_count; h->avctx->refs = h->sps.ref_frame_count;
@ -1170,6 +1179,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
h->avctx->colorspace = h->sps.colorspace; h->avctx->colorspace = h->sps.colorspace;
} }
} }
}
if (h->context_initialized && needs_reinit) { if (h->context_initialized && needs_reinit) {
h->context_initialized = 0; h->context_initialized = 0;
@ -1221,35 +1231,41 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
h264_init_dequant_tables(h); h264_init_dequant_tables(h);
} }
h->frame_num = get_bits(&sl->gb, h->sps.log2_max_frame_num); frame_num = get_bits(&sl->gb, h->sps.log2_max_frame_num);
if (!h->setup_finished)
h->frame_num = frame_num;
sl->mb_mbaff = 0; sl->mb_mbaff = 0;
h->mb_aff_frame = 0;
last_pic_structure = h->picture_structure; last_pic_structure = h->picture_structure;
last_pic_droppable = h->droppable; last_pic_droppable = h->droppable;
h->droppable = h->nal_ref_idc == 0;
droppable = h->nal_ref_idc == 0;
if (h->sps.frame_mbs_only_flag) { if (h->sps.frame_mbs_only_flag) {
h->picture_structure = PICT_FRAME; picture_structure = PICT_FRAME;
} else { } else {
field_pic_flag = get_bits1(&sl->gb); field_pic_flag = get_bits1(&sl->gb);
if (field_pic_flag) { if (field_pic_flag) {
bottom_field_flag = get_bits1(&sl->gb); bottom_field_flag = get_bits1(&sl->gb);
h->picture_structure = PICT_TOP_FIELD + bottom_field_flag; picture_structure = PICT_TOP_FIELD + bottom_field_flag;
} else { } else {
h->picture_structure = PICT_FRAME; picture_structure = PICT_FRAME;
h->mb_aff_frame = h->sps.mb_aff; mb_aff_frame = h->sps.mb_aff;
} }
} }
if (!h->setup_finished) {
h->droppable = droppable;
h->picture_structure = picture_structure;
h->mb_aff_frame = mb_aff_frame;
}
sl->mb_field_decoding_flag = h->picture_structure != PICT_FRAME; sl->mb_field_decoding_flag = h->picture_structure != PICT_FRAME;
if (h->current_slice != 0) { if (h->current_slice != 0) {
if (last_pic_structure != h->picture_structure || if (last_pic_structure != picture_structure ||
last_pic_droppable != h->droppable) { last_pic_droppable != droppable) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"Changing field mode (%d -> %d) between slices is not allowed\n", "Changing field mode (%d -> %d) between slices is not allowed\n",
last_pic_structure, h->picture_structure); last_pic_structure, h->picture_structure);
h->picture_structure = last_pic_structure;
h->droppable = last_pic_droppable;
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if (!h->cur_pic_ptr) { } else if (!h->cur_pic_ptr) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
@ -1415,6 +1431,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
} }
} }
if (!h->setup_finished)
h->cur_pic_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup h->cur_pic_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup
assert(h->mb_num == h->mb_width * h->mb_height); assert(h->mb_num == h->mb_width * h->mb_height);
@ -1442,19 +1459,33 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
get_ue_golomb(&sl->gb); /* idr_pic_id */ get_ue_golomb(&sl->gb); /* idr_pic_id */
if (h->sps.poc_type == 0) { if (h->sps.poc_type == 0) {
h->poc_lsb = get_bits(&sl->gb, h->sps.log2_max_poc_lsb); int poc_lsb = get_bits(&sl->gb, h->sps.log2_max_poc_lsb);
if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME) if (!h->setup_finished)
h->delta_poc_bottom = get_se_golomb(&sl->gb); h->poc_lsb = poc_lsb;
if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME) {
int delta_poc_bottom = get_se_golomb(&sl->gb);
if (!h->setup_finished)
h->delta_poc_bottom = delta_poc_bottom;
}
} }
if (h->sps.poc_type == 1 && !h->sps.delta_pic_order_always_zero_flag) { if (h->sps.poc_type == 1 && !h->sps.delta_pic_order_always_zero_flag) {
h->delta_poc[0] = get_se_golomb(&sl->gb); int delta_poc = get_se_golomb(&sl->gb);
if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME) if (!h->setup_finished)
h->delta_poc[1] = get_se_golomb(&sl->gb); h->delta_poc[0] = delta_poc;
if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME) {
delta_poc = get_se_golomb(&sl->gb);
if (!h->setup_finished)
h->delta_poc[1] = delta_poc;
}
} }
if (!h->setup_finished)
ff_init_poc(h, h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc); ff_init_poc(h, h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc);
if (h->pps.redundant_pic_cnt_present) if (h->pps.redundant_pic_cnt_present)