[FFmpeg-cvslog] avcodec/hevc_sei: switch to AVBufferRef buffer for a53 caption
Limin Wang
git at videolan.org
Fri Dec 20 19:01:44 EET 2019
ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Fri Dec 20 09:17:21 2019 +0800| [dbb051767fabddc58a7a24e72eeb715fd303dd62] | committer: James Almer
avcodec/hevc_sei: switch to AVBufferRef buffer for a53 caption
Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbb051767fabddc58a7a24e72eeb715fd303dd62
---
libavcodec/hevc_sei.c | 14 +++++++-------
libavcodec/hevc_sei.h | 3 +--
libavcodec/hevcdec.c | 16 ++++++++--------
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index c59bd4321e..daca9d57bc 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -177,7 +177,8 @@ static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB
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;
@@ -185,14 +186,14 @@ static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB
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
}
@@ -363,6 +364,5 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s,
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);
}
diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h
index f6516ae982..2769d41445 100644
--- a/libavcodec/hevc_sei.h
+++ b/libavcodec/hevc_sei.h
@@ -83,8 +83,7 @@ typedef struct HEVCSEIPictureTiming {
} HEVCSEIPictureTiming;
typedef struct HEVCSEIA53Caption {
- int a53_caption_size;
- uint8_t *a53_caption;
+ AVBufferRef *buf_ref;
} HEVCSEIA53Caption;
typedef struct HEVCSEIMasteringDisplay {
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 8f1c162ace..f8270b87c3 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -2778,14 +2778,14 @@ static int set_side_data(HEVCContext *s)
metadata->MaxCLL, metadata->MaxFALL);
}
- if (s->sei.a53_caption.a53_caption) {
- AVFrameSideData* sd = av_frame_new_side_data(out,
- AV_FRAME_DATA_A53_CC,
- s->sei.a53_caption.a53_caption_size);
- if (sd)
- memcpy(sd->data, s->sei.a53_caption.a53_caption, s->sei.a53_caption.a53_caption_size);
- av_freep(&s->sei.a53_caption.a53_caption);
- s->sei.a53_caption.a53_caption_size = 0;
+ if (s->sei.a53_caption.buf_ref) {
+ HEVCSEIA53Caption *a53 = &s->sei.a53_caption;
+
+ AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_A53_CC, a53->buf_ref);
+ if (!sd)
+ av_buffer_unref(&a53->buf_ref);
+ a53->buf_ref = NULL;
+
s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS;
}
More information about the ffmpeg-cvslog
mailing list