From 1d5991ef306f5a0306f79ba99ae5a919357b18ff Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 29 Jan 2018 13:49:39 +0100
Subject: mp_image: preserve AVFrame closed captions data

This is preparation for a change in vd_lavc.c: it should not have to
access the demuxer (to pass along closed captions), so the idea is to
make them part of mp_image, and to let the layer above vd_lavc propagate
the buffer.

Don't bother with preserving them for mp_image->AVFrame, because we
don't need this.
---
 video/mp_image.c | 6 ++++++
 video/mp_image.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/video/mp_image.c b/video/mp_image.c
index 0c07fd3098..f6b6045c6d 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -208,6 +208,7 @@ static void mp_image_destructor(void *ptr)
         av_buffer_unref(&mpi->bufs[p]);
     av_buffer_unref(&mpi->hwctx);
     av_buffer_unref(&mpi->icc_profile);
+    av_buffer_unref(&mpi->a53_cc);
 }
 
 int mp_chroma_div_up(int size, int shift)
@@ -326,6 +327,7 @@ struct mp_image *mp_image_new_ref(struct mp_image *img)
 
     fail |= !ref_buffer(&new->hwctx);
     fail |= !ref_buffer(&new->icc_profile);
+    fail |= !ref_buffer(&new->a53_cc);
 
 
     if (!fail)
@@ -891,6 +893,10 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *src)
         if (mdm->has_luminance)
             dst->params.color.sig_peak = av_q2d(mdm->max_luminance) / MP_REF_WHITE;
     }
+
+    sd = av_frame_get_side_data(src, AV_FRAME_DATA_A53_CC);
+    if (sd)
+        dst->a53_cc = av_buffer_ref(sd->buf);
 #endif
 
     if (dst->hwctx) {
diff --git a/video/mp_image.h b/video/mp_image.h
index 5591b2fd9f..f7969a4314 100644
--- a/video/mp_image.h
+++ b/video/mp_image.h
@@ -119,6 +119,8 @@ typedef struct mp_image {
     struct AVBufferRef *hwctx;
     // Embedded ICC profile, if any
     struct AVBufferRef *icc_profile;
+    // Closed captions packet, if any (only after decoder)
+    struct AVBufferRef *a53_cc;
 } mp_image_t;
 
 int mp_chroma_div_up(int size, int shift);
-- 
cgit v1.2.3