* @author Michael Niedermayer <michaelni@gmx.at>
*/
+#include "atsc_a53.h"
#include "avcodec.h"
#include "get_bits.h"
#include "golomb.h"
h->afd.present = 0;
av_buffer_unref(&h->a53_caption.buf_ref);
+ for (int i = 0; i < h->unregistered.nb_buf_ref; i++)
+ av_buffer_unref(&h->unregistered.buf_ref[i]);
+ h->unregistered.nb_buf_ref = 0;
+ av_freep(&h->unregistered.buf_ref);
}
-static int decode_picture_timing(H264SEIPictureTiming *h, GetBitContext *gb,
- const H264ParamSets *ps, void *logctx)
+int ff_h264_sei_process_picture_timing(H264SEIPictureTiming *h, const SPS *sps,
+ void *logctx)
{
- int i;
- const SPS *sps = ps->sps;
-
- for (i = 0; i<MAX_SPS_COUNT; i++)
- if ((!sps || !sps->log2_max_frame_num) && ps->sps_list[i])
- sps = (const SPS *)ps->sps_list[i]->data;
+ GetBitContext gb;
- if (!sps) {
- av_log(logctx, AV_LOG_ERROR, "SPS unavailable in decode_picture_timing\n");
- return AVERROR_PS_NOT_FOUND;
- }
+ init_get_bits(&gb, h->payload, h->payload_size_bits);
if (sps->nal_hrd_parameters_present_flag ||
sps->vcl_hrd_parameters_present_flag) {
- h->cpb_removal_delay = get_bits_long(gb, sps->cpb_removal_delay_length);
- h->dpb_output_delay = get_bits_long(gb, sps->dpb_output_delay_length);
+ h->cpb_removal_delay = get_bits_long(&gb, sps->cpb_removal_delay_length);
+ h->dpb_output_delay = get_bits_long(&gb, sps->dpb_output_delay_length);
}
if (sps->pic_struct_present_flag) {
unsigned int i, num_clock_ts;
- h->pic_struct = get_bits(gb, 4);
+ h->pic_struct = get_bits(&gb, 4);
h->ct_type = 0;
if (h->pic_struct > H264_SEI_PIC_STRUCT_FRAME_TRIPLING)
return AVERROR_INVALIDDATA;
num_clock_ts = sei_num_clock_ts_table[h->pic_struct];
-
+ h->timecode_cnt = 0;
for (i = 0; i < num_clock_ts; i++) {
- if (get_bits(gb, 1)) { /* clock_timestamp_flag */
+ if (get_bits(&gb, 1)) { /* clock_timestamp_flag */
+ H264SEITimeCode *tc = &h->timecode[h->timecode_cnt++];
unsigned int full_timestamp_flag;
-
- h->ct_type |= 1 << get_bits(gb, 2);
- skip_bits(gb, 1); /* nuit_field_based_flag */
- skip_bits(gb, 5); /* counting_type */
- full_timestamp_flag = get_bits(gb, 1);
- skip_bits(gb, 1); /* discontinuity_flag */
- skip_bits(gb, 1); /* cnt_dropped_flag */
- skip_bits(gb, 8); /* n_frames */
+ unsigned int counting_type, cnt_dropped_flag;
+ h->ct_type |= 1 << get_bits(&gb, 2);
+ skip_bits(&gb, 1); /* nuit_field_based_flag */
+ counting_type = get_bits(&gb, 5); /* counting_type */
+ full_timestamp_flag = get_bits(&gb, 1);
+ skip_bits(&gb, 1); /* discontinuity_flag */
+ cnt_dropped_flag = get_bits(&gb, 1); /* cnt_dropped_flag */
+ if (cnt_dropped_flag && counting_type > 1 && counting_type < 7)
+ tc->dropframe = 1;
+ tc->frame = get_bits(&gb, 8); /* n_frames */
if (full_timestamp_flag) {
- skip_bits(gb, 6); /* seconds_value 0..59 */
- skip_bits(gb, 6); /* minutes_value 0..59 */
- skip_bits(gb, 5); /* hours_value 0..23 */
+ tc->full = 1;
+ tc->seconds = get_bits(&gb, 6); /* seconds_value 0..59 */
+ tc->minutes = get_bits(&gb, 6); /* minutes_value 0..59 */
+ tc->hours = get_bits(&gb, 5); /* hours_value 0..23 */
} else {
- if (get_bits(gb, 1)) { /* seconds_flag */
- skip_bits(gb, 6); /* seconds_value range 0..59 */
- if (get_bits(gb, 1)) { /* minutes_flag */
- skip_bits(gb, 6); /* minutes_value 0..59 */
- if (get_bits(gb, 1)) /* hours_flag */
- skip_bits(gb, 5); /* hours_value 0..23 */
+ tc->seconds = tc->minutes = tc->hours = tc->full = 0;
+ if (get_bits(&gb, 1)) { /* seconds_flag */
+ tc->seconds = get_bits(&gb, 6);
+ if (get_bits(&gb, 1)) { /* minutes_flag */
+ tc->minutes = get_bits(&gb, 6);
+ if (get_bits(&gb, 1)) /* hours_flag */
+ tc->hours = get_bits(&gb, 5);
}
}
}
+
if (sps->time_offset_length > 0)
- skip_bits(gb,
+ skip_bits(&gb,
sps->time_offset_length); /* time_offset */
}
}
h->ct_type, h->pic_struct);
}
+ return 0;
+}
+
+static int decode_picture_timing(H264SEIPictureTiming *h, GetBitContext *gb,
+ void *logctx)
+{
+ int index = get_bits_count(gb);
+ int size_bits = get_bits_left(gb);
+ int size = (size_bits + 7) / 8;
+
+ if (index & 7) {
+ av_log(logctx, AV_LOG_ERROR, "Unaligned SEI payload\n");
+ return AVERROR_INVALIDDATA;
+ }
+ if (size > sizeof(h->payload)) {
+ av_log(logctx, AV_LOG_ERROR, "Picture timing SEI payload too large\n");
+ return AVERROR_INVALIDDATA;
+ }
+ memcpy(h->payload, gb->buffer + index / 8, size);
+
+ h->payload_size_bits = size_bits;
+
h->present = 1;
return 0;
}
GetBitContext *gb, void *logctx,
int size)
{
- int flag;
- int user_data_type_code;
- int cc_count;
-
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); // zero bit
- cc_count = get_bits(gb, 5);
- skip_bits(gb, 8); // reserved
- size -= 2;
-
- if (cc_count && size >= cc_count * 3) {
- int old_size = h->buf_ref ? h->buf_ref->size : 0;
- const uint64_t new_size = (old_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_buffer_realloc(&h->buf_ref, new_size);
- if (ret < 0)
- return ret;
-
- /* Use of av_buffer_realloc assumes buffer is writeable */
- for (i = 0; i < cc_count; i++) {
- h->buf_ref->data[old_size++] = get_bits(gb, 8);
- h->buf_ref->data[old_size++] = get_bits(gb, 8);
- h->buf_ref->data[old_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 0;
+ return ff_parse_a53_cc(&h->buf_ref, gb->buffer + get_bits_count(gb) / 8, size);
}
static int decode_registered_user_data(H264SEIContext *h, GetBitContext *gb,
void *logctx, int size)
{
- uint32_t country_code;
- uint32_t user_identifier;
+ int country_code, provider_code;
- if (size < 7)
+ if (size < 3)
return AVERROR_INVALIDDATA;
- size -= 7;
+ size -= 3;
country_code = get_bits(gb, 8); // itu_t_t35_country_code
if (country_code == 0xFF) {
+ if (size < 1)
+ return AVERROR_INVALIDDATA;
+
skip_bits(gb, 8); // itu_t_t35_country_code_extension_byte
size--;
}
+ 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);
+ return 0;
+ }
+
/* itu_t_t35_payload_byte follows */
- skip_bits(gb, 8); // terminal provider code
- skip_bits(gb, 8); // terminal provider oriented code
- user_identifier = get_bits_long(gb, 32);
+ provider_code = get_bits(gb, 16);
+
+ switch (provider_code) {
+ case 0x31: { // atsc_provider_code
+ uint32_t user_identifier;
- switch (user_identifier) {
+ if (size < 4)
+ return AVERROR_INVALIDDATA;
+ size -= 4;
+
+ user_identifier = get_bits_long(gb, 32);
+ switch (user_identifier) {
case MKBETAG('D', 'T', 'G', '1'): // afd_data
return decode_registered_user_data_afd(&h->afd, gb, size);
case MKBETAG('G', 'A', '9', '4'): // closed captions
return decode_registered_user_data_closed_caption(&h->a53_caption, gb,
logctx, size);
default:
- skip_bits(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;
}
return 0;
{
uint8_t *user_data;
int e, build, i;
+ AVBufferRef *buf_ref, **tmp;
- if (size < 16 || size >= INT_MAX - 16)
+ if (size < 16 || size >= INT_MAX - 1)
return AVERROR_INVALIDDATA;
- user_data = av_malloc(16 + size + 1);
- if (!user_data)
+ tmp = av_realloc_array(h->buf_ref, h->nb_buf_ref + 1, sizeof(*h->buf_ref));
+ if (!tmp)
+ return AVERROR(ENOMEM);
+ h->buf_ref = tmp;
+
+ buf_ref = av_buffer_alloc(size + 1);
+ if (!buf_ref)
return AVERROR(ENOMEM);
+ user_data = buf_ref->data;
- for (i = 0; i < size + 16; i++)
+ for (i = 0; i < size; i++)
user_data[i] = get_bits(gb, 8);
user_data[i] = 0;
+ buf_ref->size = size;
+ h->buf_ref[h->nb_buf_ref++] = buf_ref;
+
e = sscanf(user_data + 16, "x264 - core %d", &build);
if (e == 1 && build > 0)
h->x264_build = build;
if (e == 1 && build == 1 && !strncmp(user_data+16, "x264 - core 0000", 16))
h->x264_build = 67;
- av_free(user_data);
return 0;
}
int master_ret = 0;
while (get_bits_left(gb) > 16 && show_bits(gb, 16)) {
+ GetBitContext gb_payload;
int type = 0;
unsigned size = 0;
- unsigned next;
int ret = 0;
do {
type, 8*size, get_bits_left(gb));
return AVERROR_INVALIDDATA;
}
- next = get_bits_count(gb) + 8 * size;
+
+ ret = init_get_bits8(&gb_payload, gb->buffer + get_bits_count(gb) / 8, size);
+ if (ret < 0)
+ return ret;
switch (type) {
- case H264_SEI_TYPE_PIC_TIMING: // Picture timing SEI
- ret = decode_picture_timing(&h->picture_timing, gb, ps, logctx);
+ case SEI_TYPE_PIC_TIMING: // Picture timing SEI
+ ret = decode_picture_timing(&h->picture_timing, &gb_payload, logctx);
break;
- case H264_SEI_TYPE_USER_DATA_REGISTERED:
- ret = decode_registered_user_data(h, gb, logctx, size);
+ case SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35:
+ ret = decode_registered_user_data(h, &gb_payload, logctx, size);
break;
- case H264_SEI_TYPE_USER_DATA_UNREGISTERED:
- ret = decode_unregistered_user_data(&h->unregistered, gb, logctx, size);
+ case SEI_TYPE_USER_DATA_UNREGISTERED:
+ ret = decode_unregistered_user_data(&h->unregistered, &gb_payload, logctx, size);
break;
- case H264_SEI_TYPE_RECOVERY_POINT:
- ret = decode_recovery_point(&h->recovery_point, gb, logctx);
+ case SEI_TYPE_RECOVERY_POINT:
+ ret = decode_recovery_point(&h->recovery_point, &gb_payload, logctx);
break;
- case H264_SEI_TYPE_BUFFERING_PERIOD:
- ret = decode_buffering_period(&h->buffering_period, gb, ps, logctx);
+ case SEI_TYPE_BUFFERING_PERIOD:
+ ret = decode_buffering_period(&h->buffering_period, &gb_payload, ps, logctx);
break;
- case H264_SEI_TYPE_FRAME_PACKING:
- ret = decode_frame_packing_arrangement(&h->frame_packing, gb);
+ case SEI_TYPE_FRAME_PACKING_ARRANGEMENT:
+ ret = decode_frame_packing_arrangement(&h->frame_packing, &gb_payload);
break;
- case H264_SEI_TYPE_DISPLAY_ORIENTATION:
- ret = decode_display_orientation(&h->display_orientation, gb);
+ case SEI_TYPE_DISPLAY_ORIENTATION:
+ ret = decode_display_orientation(&h->display_orientation, &gb_payload);
break;
- case H264_SEI_TYPE_GREEN_METADATA:
- ret = decode_green_metadata(&h->green_metadata, gb);
+ case SEI_TYPE_GREEN_METADATA:
+ ret = decode_green_metadata(&h->green_metadata, &gb_payload);
break;
- case H264_SEI_TYPE_ALTERNATIVE_TRANSFER:
- ret = decode_alternative_transfer(&h->alternative_transfer, gb);
+ case SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
+ ret = decode_alternative_transfer(&h->alternative_transfer, &gb_payload);
break;
default:
av_log(logctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type);
if (ret < 0)
master_ret = ret;
- skip_bits_long(gb, next - get_bits_count(gb));
+ if (get_bits_left(&gb_payload) < 0) {
+ av_log(logctx, AV_LOG_WARNING, "SEI type %d overread by %d bits\n",
+ type, -get_bits_left(&gb_payload));
+ }
- // FIXME check bits here
- align_get_bits(gb);
+ skip_bits_long(gb, 8 * size);
}
return master_ret;
projects / ffmpeg / blobdiff