diff options
| author | quietvoid <39477805+quietvoid@users.noreply.github.com> | 2023-02-20 12:24:47 -0500 |
|---|---|---|
| committer | Leo Izen <leo.izen@gmail.com> | 2023-04-10 05:18:58 -0400 |
| commit | 1808f264b3871891ff48875f0900be52ad4a3e1d (patch) | |
| tree | 0499dd3c726f615e657b0767cc34af096f86b307 /video | |
| parent | 9a8b31707e5ed4e12a3670d45cde68fee3bed54f (diff) | |
| download | mpv-1808f264b3871891ff48875f0900be52ad4a3e1d.tar.bz2 mpv-1808f264b3871891ff48875f0900be52ad4a3e1d.tar.xz | |
mp_image: always add AV_FRAME_DATA_DOVI_METADATA when present
As the Dolby Vision metadata is only supported for vo_gpu_next, the check
whether to use the metadata is now handled by `mp_map_dovi_metadata_to_pl`.
It doesn't hurt to keep the metadata in `mp_image`, and might be useful to
library users.
Diffstat (limited to 'video')
| -rw-r--r-- | video/mp_image.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index bc29d298e2..0473bda36e 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -1030,14 +1030,8 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *src) #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 16, 100) sd = av_frame_get_side_data(src, AV_FRAME_DATA_DOVI_METADATA); - if (sd) { - // Strip DoVi metadata that requires an EL, since it's near-impossible - // for us to support easily or sanely - const AVDOVIMetadata *metadata = (AVDOVIMetadata *) sd->buf->data; - const AVDOVIRpuDataHeader *rpu = av_dovi_get_header(metadata); - if (rpu->disable_residual_flag) - dst->dovi = sd->buf; - } + if (sd) + dst->dovi = sd->buf; sd = av_frame_get_side_data(src, AV_FRAME_DATA_DOVI_RPU_BUFFER); if (sd) |