static int decode_nal_sei_content_light_info(HEVCSEIContentLight *s, GetBitContext *gb)
{
// Max and average light levels
- s->max_content_light_level = get_bits_long(gb, 16);
- s->max_pic_average_light_level = get_bits_long(gb, 16);
+ s->max_content_light_level = get_bits(gb, 16);
+ s->max_pic_average_light_level = get_bits(gb, 16);
// As this SEI message comes before the first frame that references it,
// initialize the flag to 2 and decrement on IRAP access unit so it
// persists for the coded video sequence (e.g., between two IRAPs)
} else if (pic_struct == 1 || pic_struct == 9 || pic_struct == 11) {
av_log(logctx, AV_LOG_DEBUG, "TOP Field\n");
h->picture_struct = AV_PICTURE_STRUCTURE_TOP_FIELD;
+ } else if (pic_struct == 7) {
+ av_log(logctx, AV_LOG_DEBUG, "Frame/Field Doubling\n");
+ h->picture_struct = HEVC_SEI_PIC_STRUCT_FRAME_DOUBLING;
+ } else if (pic_struct == 8) {
+ av_log(logctx, AV_LOG_DEBUG, "Frame/Field Tripling\n");
+ h->picture_struct = HEVC_SEI_PIC_STRUCT_FRAME_TRIPLING;
}
get_bits(gb, 2); // source_scan_type
get_bits(gb, 1); // duplicate_flag
size -= 2;
if (cc_count && size >= cc_count * 3) {
- const uint64_t new_size = (s->a53_caption_size + cc_count
+ int old_size = s->buf_ref ? s->buf_ref->size : 0;
+ const uint64_t new_size = (old_size + cc_count
* UINT64_C(3));
int i, ret;
return AVERROR(EINVAL);
/* Allow merging of the cc data from two fields. */
- ret = av_reallocp(&s->a53_caption, new_size);
+ ret = av_buffer_realloc(&s->buf_ref, new_size);
if (ret < 0)
return ret;
for (i = 0; i < cc_count; i++) {
- s->a53_caption[s->a53_caption_size++] = get_bits(gb, 8);
- s->a53_caption[s->a53_caption_size++] = get_bits(gb, 8);
- s->a53_caption[s->a53_caption_size++] = get_bits(gb, 8);
+ s->buf_ref->data[old_size++] = get_bits(gb, 8);
+ s->buf_ref->data[old_size++] = get_bits(gb, 8);
+ s->buf_ref->data[old_size++] = get_bits(gb, 8);
}
skip_bits(gb, 8); // marker_bits
}
return 0;
}
+static int decode_nal_sei_user_data_unregistered(HEVCSEIUnregistered *s, GetBitContext *gb,
+ int size)
+{
+ AVBufferRef *buf_ref, **tmp;
+
+ if (size < 16 || size >= INT_MAX - 1)
+ return AVERROR_INVALIDDATA;
+
+ tmp = av_realloc_array(s->buf_ref, s->nb_buf_ref + 1, sizeof(*s->buf_ref));
+ if (!tmp)
+ return AVERROR(ENOMEM);
+ s->buf_ref = tmp;
+
+ buf_ref = av_buffer_alloc(size + 1);
+ if (!buf_ref)
+ return AVERROR(ENOMEM);
+
+ for (int i = 0; i < size; i++)
+ buf_ref->data[i] = get_bits(gb, 8);
+ buf_ref->data[size] = 0;
+ buf_ref->size = size;
+ s->buf_ref[s->nb_buf_ref++] = buf_ref;
+
+ return 0;
+}
+
static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb,
int size)
{
return decode_nal_sei_active_parameter_sets(s, gb, logctx);
case HEVC_SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35:
return decode_nal_sei_user_data_registered_itu_t_t35(s, gb, size);
+ case HEVC_SEI_TYPE_USER_DATA_UNREGISTERED:
+ return decode_nal_sei_user_data_unregistered(&s->unregistered, gb, size);
case HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
return decode_nal_sei_alternative_transfer(&s->alternative_transfer, gb);
default:
void ff_hevc_reset_sei(HEVCSEI *s)
{
- s->a53_caption.a53_caption_size = 0;
- av_freep(&s->a53_caption.a53_caption);
+ av_buffer_unref(&s->a53_caption.buf_ref);
+
+ for (int i = 0; i < s->unregistered.nb_buf_ref; i++)
+ av_buffer_unref(&s->unregistered.buf_ref[i]);
+ s->unregistered.nb_buf_ref = 0;
+ av_freep(&s->unregistered.buf_ref);
}