* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "atsc_a53.h"
+#include "dynamic_hdr10_plus.h"
#include "golomb.h"
#include "hevc_ps.h"
#include "hevc_sei.h"
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
static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetBitContext *gb,
int size)
{
- int flag;
- int user_data_type_code;
- int cc_count;
+ int ret;
if (size < 3)
- return AVERROR(EINVAL);
-
- user_data_type_code = get_bits(gb, 8);
- if (user_data_type_code == 0x3) {
- skip_bits(gb, 1); // reserved
-
- flag = get_bits(gb, 1); // process_cc_data_flag
- if (flag) {
- skip_bits(gb, 1);
- cc_count = get_bits(gb, 5);
- skip_bits(gb, 8); // reserved
- size -= 2;
-
- if (cc_count && size >= cc_count * 3) {
- const uint64_t new_size = (s->a53_caption_size + cc_count
- * UINT64_C(3));
- int i, ret;
-
- if (new_size > INT_MAX)
- return AVERROR(EINVAL);
-
- /* Allow merging of the cc data from two fields. */
- ret = av_reallocp(&s->a53_caption, 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);
- }
- skip_bits(gb, 8); // marker_bits
- }
- }
- } else {
- int i;
- for (i = 0; i < size - 1; i++)
- skip_bits(gb, 8);
+ return AVERROR_INVALIDDATA;
+
+ ret = ff_parse_a53_cc(&s->buf_ref, gb->buffer + get_bits_count(gb) / 8, size);
+
+ if (ret < 0)
+ return ret;
+
+ skip_bits_long(gb, size * 8);
+
+ 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_registered_user_data_dynamic_hdr_plus(HEVCSEIDynamicHDRPlus *s,
+ GetBitContext *gb, int size)
+{
+ size_t meta_size;
+ int err;
+ AVDynamicHDRPlus *metadata = av_dynamic_hdr_plus_alloc(&meta_size);
+ if (!metadata)
+ return AVERROR(ENOMEM);
+
+ err = ff_parse_itu_t_t35_to_dynamic_hdr10_plus(metadata,
+ gb->buffer + get_bits_count(gb) / 8, size);
+ if (err < 0) {
+ av_free(metadata);
+ return err;
}
+ av_buffer_unref(&s->info);
+ s->info = av_buffer_create((uint8_t *)metadata, meta_size, NULL, NULL, 0);
+ if (!s->info) {
+ av_free(metadata);
+ return AVERROR(ENOMEM);
+ }
+
+ skip_bits_long(gb, size * 8);
+
return 0;
}
static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb,
- int size)
+ void *logctx, int size)
{
- uint32_t country_code;
- uint32_t user_identifier;
+ int country_code, provider_code;
- if (size < 7)
- return AVERROR(EINVAL);
- size -= 7;
+ if (size < 3)
+ return AVERROR_INVALIDDATA;
+ size -= 3;
country_code = get_bits(gb, 8);
if (country_code == 0xFF) {
+ if (size < 1)
+ return AVERROR_INVALIDDATA;
+
skip_bits(gb, 8);
size--;
}
- skip_bits(gb, 8);
- skip_bits(gb, 8);
+ if (country_code != 0xB5) { // usa_country_code
+ av_log(logctx, AV_LOG_VERBOSE,
+ "Unsupported User Data Registered ITU-T T35 SEI message (country_code = %d)\n",
+ country_code);
+ goto end;
+ }
+
+ provider_code = get_bits(gb, 16);
+
+ switch (provider_code) {
+ case 0x3C: { // smpte_provider_code
+ // A/341 Amendment - 2094-40
+ const uint16_t smpte2094_40_provider_oriented_code = 0x0001;
+ const uint8_t smpte2094_40_application_identifier = 0x04;
+ uint16_t provider_oriented_code;
+ uint8_t application_identifier;
+
+ if (size < 3)
+ return AVERROR_INVALIDDATA;
+ size -= 3;
+
+ provider_oriented_code = get_bits(gb, 16);
+ application_identifier = get_bits(gb, 8);
+ if (provider_oriented_code == smpte2094_40_provider_oriented_code &&
+ application_identifier == smpte2094_40_application_identifier) {
+ return decode_registered_user_data_dynamic_hdr_plus(&s->dynamic_hdr_plus, gb, size);
+ }
+ break;
+ }
+ case 0x31: { // atsc_provider_code
+ uint32_t user_identifier;
- user_identifier = get_bits_long(gb, 32);
+ if (size < 4)
+ return AVERROR_INVALIDDATA;
+ size -= 4;
- switch (user_identifier) {
+ user_identifier = get_bits_long(gb, 32);
+ switch (user_identifier) {
case MKBETAG('G', 'A', '9', '4'):
return decode_registered_user_data_closed_caption(&s->a53_caption, gb, size);
default:
- skip_bits_long(gb, size * 8);
+ av_log(logctx, AV_LOG_VERBOSE,
+ "Unsupported User Data Registered ITU-T T35 SEI message (atsc user_identifier = 0x%04x)\n",
+ user_identifier);
break;
+ }
+ break;
}
+ default:
+ av_log(logctx, AV_LOG_VERBOSE,
+ "Unsupported User Data Registered ITU-T T35 SEI message (provider_code = %d)\n",
+ provider_code);
+ break;
+ }
+
+end:
+ skip_bits_long(gb, size * 8);
return 0;
}
return 0;
}
+static int decode_nal_sei_timecode(HEVCSEITimeCode *s, GetBitContext *gb)
+{
+ s->num_clock_ts = get_bits(gb, 2);
+
+ for (int i = 0; i < s->num_clock_ts; i++) {
+ s->clock_timestamp_flag[i] = get_bits(gb, 1);
+
+ if (s->clock_timestamp_flag[i]) {
+ s->units_field_based_flag[i] = get_bits(gb, 1);
+ s->counting_type[i] = get_bits(gb, 5);
+ s->full_timestamp_flag[i] = get_bits(gb, 1);
+ s->discontinuity_flag[i] = get_bits(gb, 1);
+ s->cnt_dropped_flag[i] = get_bits(gb, 1);
+
+ s->n_frames[i] = get_bits(gb, 9);
+
+ if (s->full_timestamp_flag[i]) {
+ s->seconds_value[i] = av_clip(get_bits(gb, 6), 0, 59);
+ s->minutes_value[i] = av_clip(get_bits(gb, 6), 0, 59);
+ s->hours_value[i] = av_clip(get_bits(gb, 5), 0, 23);
+ } else {
+ s->seconds_flag[i] = get_bits(gb, 1);
+ if (s->seconds_flag[i]) {
+ s->seconds_value[i] = av_clip(get_bits(gb, 6), 0, 59);
+ s->minutes_flag[i] = get_bits(gb, 1);
+ if (s->minutes_flag[i]) {
+ s->minutes_value[i] = av_clip(get_bits(gb, 6), 0, 59);
+ s->hours_flag[i] = get_bits(gb, 1);
+ if (s->hours_flag[i]) {
+ s->hours_value[i] = av_clip(get_bits(gb, 5), 0, 23);
+ }
+ }
+ }
+ }
+
+ s->time_offset_length[i] = get_bits(gb, 5);
+ if (s->time_offset_length[i] > 0) {
+ s->time_offset_value[i] = get_bits(gb, s->time_offset_length[i]);
+ }
+ }
+ }
+
+ s->present = 1;
+ return 0;
+}
+
+
static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s,
const HEVCParamSets *ps, int type, int size)
{
switch (type) {
case 256: // Mismatched value from HM 8.1
return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gb);
- case HEVC_SEI_TYPE_FRAME_PACKING:
+ case SEI_TYPE_FRAME_PACKING_ARRANGEMENT:
return decode_nal_sei_frame_packing_arrangement(&s->frame_packing, gb);
- case HEVC_SEI_TYPE_DISPLAY_ORIENTATION:
+ case SEI_TYPE_DISPLAY_ORIENTATION:
return decode_nal_sei_display_orientation(&s->display_orientation, gb);
- case HEVC_SEI_TYPE_PICTURE_TIMING:
+ case SEI_TYPE_PIC_TIMING:
return decode_nal_sei_pic_timing(s, gb, ps, logctx, size);
- case HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO:
+ case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME:
return decode_nal_sei_mastering_display_info(&s->mastering_display, gb);
- case HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
+ case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
return decode_nal_sei_content_light_info(&s->content_light, gb);
- case HEVC_SEI_TYPE_ACTIVE_PARAMETER_SETS:
+ case SEI_TYPE_ACTIVE_PARAMETER_SETS:
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_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
+ case SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35:
+ return decode_nal_sei_user_data_registered_itu_t_t35(s, gb, logctx, size);
+ case SEI_TYPE_USER_DATA_UNREGISTERED:
+ return decode_nal_sei_user_data_unregistered(&s->unregistered, gb, size);
+ case SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
return decode_nal_sei_alternative_transfer(&s->alternative_transfer, gb);
+ case SEI_TYPE_TIME_CODE:
+ return decode_nal_sei_timecode(&s->timecode, gb);
default:
av_log(logctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type);
skip_bits_long(gb, 8 * size);
int type, int size)
{
switch (type) {
- case HEVC_SEI_TYPE_DECODED_PICTURE_HASH:
+ case SEI_TYPE_DECODED_PICTURE_HASH:
return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gb);
default:
av_log(logctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", type);
byte = get_bits(gb, 8);
payload_size += byte;
}
+ if (get_bits_left(gb) < 8LL*payload_size)
+ return AVERROR_INVALIDDATA;
if (nal_unit_type == HEVC_NAL_SEI_PREFIX) {
return decode_nal_sei_prefix(gb, logctx, s, ps, payload_type, payload_size);
} else { /* nal_unit_type == NAL_SEI_SUFFIX */
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);
+ av_buffer_unref(&s->dynamic_hdr_plus.info);
}
projects / ffmpeg / blobdiff