|
|
|
@ -25,6 +25,7 @@ |
|
|
|
|
* @author Michael Niedermayer <michaelni@gmx.at> |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
#include "atsc_a53.h" |
|
|
|
|
#include "avcodec.h" |
|
|
|
|
#include "get_bits.h" |
|
|
|
|
#include "golomb.h" |
|
|
|
@ -173,55 +174,10 @@ static int decode_registered_user_data_closed_caption(H264SEIA53Caption *h, |
|
|
|
|
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, |
|
|
|
|