if (s->ps.pps->pic_slice_level_chroma_qp_offsets_present_flag) {
sh->slice_cb_qp_offset = get_se_golomb(gb);
sh->slice_cr_qp_offset = get_se_golomb(gb);
+ if (sh->slice_cb_qp_offset < -12 || sh->slice_cb_qp_offset > 12 ||
+ sh->slice_cr_qp_offset < -12 || sh->slice_cr_qp_offset > 12) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid slice cx qp offset.\n");
+ return AVERROR_INVALIDDATA;
+ }
} else {
sh->slice_cb_qp_offset = 0;
sh->slice_cr_qp_offset = 0;
s->sei.timecode.num_clock_ts = 0;
}
+ if (s->sei.dynamic_hdr_plus.info) {
+ AVBufferRef *info_ref = av_buffer_ref(s->sei.dynamic_hdr_plus.info);
+ if (!info_ref)
+ return AVERROR(ENOMEM);
+
+ if (!av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS, info_ref)) {
+ av_buffer_unref(&info_ref);
+ return AVERROR(ENOMEM);
+ }
+ }
+
return 0;
}
if (s->ps.sps != s0->ps.sps)
s->ps.sps = NULL;
for (i = 0; i < FF_ARRAY_ELEMS(s->ps.vps_list); i++) {
- av_buffer_unref(&s->ps.vps_list[i]);
- if (s0->ps.vps_list[i]) {
- s->ps.vps_list[i] = av_buffer_ref(s0->ps.vps_list[i]);
- if (!s->ps.vps_list[i])
- return AVERROR(ENOMEM);
- }
+ ret = av_buffer_replace(&s->ps.vps_list[i], s0->ps.vps_list[i]);
+ if (ret < 0)
+ return ret;
}
for (i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) {
- av_buffer_unref(&s->ps.sps_list[i]);
- if (s0->ps.sps_list[i]) {
- s->ps.sps_list[i] = av_buffer_ref(s0->ps.sps_list[i]);
- if (!s->ps.sps_list[i])
- return AVERROR(ENOMEM);
- }
+ ret = av_buffer_replace(&s->ps.sps_list[i], s0->ps.sps_list[i]);
+ if (ret < 0)
+ return ret;
}
for (i = 0; i < FF_ARRAY_ELEMS(s->ps.pps_list); i++) {
- av_buffer_unref(&s->ps.pps_list[i]);
- if (s0->ps.pps_list[i]) {
- s->ps.pps_list[i] = av_buffer_ref(s0->ps.pps_list[i]);
- if (!s->ps.pps_list[i])
- return AVERROR(ENOMEM);
- }
+ ret = av_buffer_replace(&s->ps.pps_list[i], s0->ps.pps_list[i]);
+ if (ret < 0)
+ return ret;
}
if (s->ps.sps != s0->ps.sps)
s->max_ra = INT_MAX;
}
- av_buffer_unref(&s->sei.a53_caption.buf_ref);
- if (s0->sei.a53_caption.buf_ref) {
- s->sei.a53_caption.buf_ref = av_buffer_ref(s0->sei.a53_caption.buf_ref);
- if (!s->sei.a53_caption.buf_ref)
- return AVERROR(ENOMEM);
- }
+ ret = av_buffer_replace(&s->sei.a53_caption.buf_ref, s0->sei.a53_caption.buf_ref);
+ if (ret < 0)
+ return ret;
for (i = 0; i < s->sei.unregistered.nb_buf_ref; i++)
av_buffer_unref(&s->sei.unregistered.buf_ref[i]);
}
}
+ ret = av_buffer_replace(&s->sei.dynamic_hdr_plus.info, s0->sei.dynamic_hdr_plus.info);
+ if (ret < 0)
+ return ret;
+
s->sei.frame_packing = s0->sei.frame_packing;
s->sei.display_orientation = s0->sei.display_orientation;
s->sei.mastering_display = s0->sei.mastering_display;