Commit 17e7c03e authored by Anton Khirnov's avatar Anton Khirnov

h264: only allow ending a field/starting a new one before finish_setup()

Doing this after ff_thread_finish_setup() is called is invalid and can
conflict with reads from the other thread.
parent debca908
...@@ -1381,26 +1381,30 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, ...@@ -1381,26 +1381,30 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (sl->first_mb_addr == 0) { // FIXME better field boundary detection if (!h->setup_finished) {
if (h->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) { if (sl->first_mb_addr == 0) { // FIXME better field boundary detection
ff_h264_field_end(h, sl, 1); if (h->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) {
} ff_h264_field_end(h, sl, 1);
}
h->current_slice = 0; 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,
h->picture_structure == PICT_BOTTOM_FIELD); h->picture_structure == PICT_BOTTOM_FIELD);
}
h->cur_pic_ptr = NULL;
} }
h->cur_pic_ptr = NULL; }
if (h->current_slice == 0) {
ret = h264_field_start(h, sl, nal);
if (ret < 0)
return ret;
} }
} }
if (h->current_slice == 0) { if (h->current_slice > 0) {
ret = h264_field_start(h, sl, nal);
if (ret < 0)
return ret;
} else {
if (h->ps.pps != (const PPS*)h->ps.pps_list[sl->pps_id]->data) { if (h->ps.pps != (const PPS*)h->ps.pps_list[sl->pps_id]->data) {
av_log(h->avctx, AV_LOG_ERROR, "PPS changed between slices\n"); av_log(h->avctx, AV_LOG_ERROR, "PPS changed between slices\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
......
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