RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2018-01-29 13:49:39 +01:00 committed by Kevin Mitchell
parent 3d367e009c
commit 1d5991ef30
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/mp_image.c
View File

@ -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) {

2
video/mp_image.h
View File

@ -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);