int must_reinit;
int needs_reinit = 0;
int field_pic_flag, bottom_field_flag;
+ int first_slice = h == h0 && !h0->current_slice;
+ int frame_num, picture_structure, droppable;
+ PPS *pps;
h->qpel_put = h->h264qpel.put_h264_qpel_pixels_tab;
h->qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab;
h0->au_pps_id, pps_id);
return AVERROR_INVALIDDATA;
}
- h->pps = *h0->pps_buffers[pps_id];
- if (!h0->sps_buffers[h->pps.sps_id]) {
+ pps = h0->pps_buffers[pps_id];
+
+ if (!h0->sps_buffers[pps->sps_id]) {
av_log(h->avctx, AV_LOG_ERROR,
"non-existing SPS %u referenced\n",
h->pps.sps_id);
return AVERROR_INVALIDDATA;
}
+ if (first_slice)
+ h->pps = *h0->pps_buffers[pps_id];
+
+ if (pps->sps_id != h->sps.sps_id ||
+ pps->sps_id != h->current_sps_id ||
+ h0->sps_buffers[pps->sps_id]->new) {
- if (h->pps.sps_id != h->sps.sps_id ||
- h->pps.sps_id != h->current_sps_id ||
- h0->sps_buffers[h->pps.sps_id]->new) {
+ if (!first_slice) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "SPS changed in the middle of the frame\n");
+ return AVERROR_INVALIDDATA;
+ }
h->sps = *h0->sps_buffers[h->pps.sps_id];
|| 16*h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag) != h->avctx->coded_height
|| h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma
|| h->cur_chroma_format_idc != h->sps.chroma_format_idc
- || av_cmp_q(h->sps.sar, h->avctx->sample_aspect_ratio)
|| h->mb_width != h->sps.mb_width
|| h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag)
));
if (non_j_pixfmt(h0->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h0, 0)))
must_reinit = 1;
+ if (first_slice && av_cmp_q(h->sps.sar, h->avctx->sample_aspect_ratio))
+ must_reinit = 1;
+
h->mb_width = h->sps.mb_width;
h->mb_height = h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
h->mb_num = h->mb_width * h->mb_height;
return AVERROR_INVALIDDATA;
}
+ av_assert1(first_slice);
+
ff_h264_flush_change(h);
if ((ret = get_pixel_format(h, 1)) < 0)
h264_init_dequant_tables(h);
}
- h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num);
+ frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num);
+ if (!first_slice) {
+ if (h0->frame_num != frame_num) {
+ av_log(h->avctx, AV_LOG_ERROR, "Frame num change from %d to %d\n",
+ h0->frame_num, frame_num);
+ return AVERROR_INVALIDDATA;
+ }
+ }
h->mb_mbaff = 0;
h->mb_aff_frame = 0;
last_pic_structure = h0->picture_structure;
last_pic_droppable = h0->droppable;
- h->droppable = h->nal_ref_idc == 0;
+ droppable = h->nal_ref_idc == 0;
if (h->sps.frame_mbs_only_flag) {
- h->picture_structure = PICT_FRAME;
+ picture_structure = PICT_FRAME;
} else {
if (!h->sps.direct_8x8_inference_flag && slice_type == AV_PICTURE_TYPE_B) {
av_log(h->avctx, AV_LOG_ERROR, "This stream was generated by a broken encoder, invalid 8x8 inference\n");
return -1;
}
field_pic_flag = get_bits1(&h->gb);
+
if (field_pic_flag) {
bottom_field_flag = get_bits1(&h->gb);
- h->picture_structure = PICT_TOP_FIELD + bottom_field_flag;
+ picture_structure = PICT_TOP_FIELD + bottom_field_flag;
} else {
- h->picture_structure = PICT_FRAME;
+ picture_structure = PICT_FRAME;
h->mb_aff_frame = h->sps.mb_aff;
}
}
- h->mb_field_decoding_flag = h->picture_structure != PICT_FRAME;
-
- if (h0->current_slice != 0) {
- if (last_pic_structure != h->picture_structure ||
- last_pic_droppable != h->droppable) {
+ if (h0->current_slice) {
+ if (last_pic_structure != picture_structure ||
+ last_pic_droppable != droppable) {
av_log(h->avctx, AV_LOG_ERROR,
"Changing field mode (%d -> %d) between slices is not allowed\n",
last_pic_structure, h->picture_structure);
- h->picture_structure = last_pic_structure;
- h->droppable = last_pic_droppable;
return AVERROR_INVALIDDATA;
} else if (!h0->cur_pic_ptr) {
av_log(h->avctx, AV_LOG_ERROR,
h0->current_slice + 1);
return AVERROR_INVALIDDATA;
}
- } else {
+ }
+
+ h->picture_structure = picture_structure;
+ h->droppable = droppable;
+ h->frame_num = frame_num;
+ h->mb_field_decoding_flag = picture_structure != PICT_FRAME;
+
+ if (h0->current_slice == 0) {
/* Shorten frame num gaps so we don't have to allocate reference
* frames just to throw them away */
if (h->frame_num != h->prev_frame_num) {
(h->ref_list[j][i].reference & 3);
}
- if (h->ref_count[0]) {
- ff_h264_set_erpic(&h->er.last_pic, &h->ref_list[0][0]);
- } else if (h->last_pic_for_ec.f.buf[0]) {
- ff_h264_set_erpic(&h->er.last_pic, &h->last_pic_for_ec);
- }
-
- if (h->ref_count[1]) ff_h264_set_erpic(&h->er.next_pic, &h->ref_list[1][0]);
-
- h->er.ref_count = h->ref_count[0];
h0->au_pps_id = pps_id;
h->sps.new =
h0->sps_buffers[h->pps.sps_id]->new = 0;