generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hevc: Fix a53 caption extraction

Browse Source 
Just realized my previous patch doesn't work quite right.  I uploaded a better
sample file that actually has visible captions to /incoming/hevc_cc.ts.  I
tested with that file doing hevc->x264 and it works.

This is basically an exact copy of the existing h264 logic.

Signed-off-by: Will Kelleher <wkelleher@gogoair.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Will Kelleher 2015-11-11 15:37:29 -06:00 committed by Michael Niedermayer
parent 58d32c00be
commit b1a32429ef
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/hevc.c
View File

@ -2573,6 +2573,7 @@ static int set_side_data(HEVCContext *s)
if (sd) if (sd)
memcpy(sd->data, s->a53_caption, s->a53_caption_size); memcpy(sd->data, s->a53_caption, s->a53_caption_size);
av_freep(&s->a53_caption); av_freep(&s->a53_caption);
s->a53_caption_size = 0;
s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS;
} }

23
libavcodec/hevc_sei.c
View File

@ -151,7 +151,6 @@ static int decode_registered_user_data_closed_caption(HEVCContext *s, int size)
int flag; int flag;
int user_data_type_code; int user_data_type_code;
int cc_count; int cc_count;
int i;
GetBitContext *gb = &s->HEVClc->gb; GetBitContext *gb = &s->HEVClc->gb;
@ -170,20 +169,28 @@ static int decode_registered_user_data_closed_caption(HEVCContext *s, int size)
size -= 2; size -= 2;
if (cc_count && size >= cc_count * 3) { if (cc_count && size >= cc_count * 3) {
av_freep(&s->a53_caption); const uint64_t new_size = (s->a53_caption_size + cc_count
s->a53_caption_size = cc_count * 3; * UINT64_C(3));
int i, ret;
s->a53_caption = av_malloc(s->a53_caption_size); if (new_size > INT_MAX)
if (!s->a53_caption) return AVERROR(EINVAL);
return(AVERROR(ENOMEM));
for (i = 0; i < s->a53_caption_size; i++) { /* Allow merging of the cc data from two fields. */
s->a53_caption[i++] = get_bits(gb, 8); 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 skip_bits(gb, 8); // marker_bits
} }
} }
} else { } else {
int i;
for (i = 0; i < size - 1; i++) for (i = 0; i < size - 1; i++)
skip_bits(gb, 8); skip_bits(gb, 8);
} }