[vlc-commits] dav1d/aom: forward the colorimetry metadata from the container to the output

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jan  9 11:30:58 2019 +0100| [b59710fbdf8f2f985b675bb5d6085b1459cc5f8c] | committer: Steve Lhomme

dav1d/aom: forward the colorimetry metadata from the container to the output

If there is none and the stream contains some, it will be overridden in
NewPicture() otherwise the container values are used.

Fixes #21578

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b59710fbdf8f2f985b675bb5d6085b1459cc5f8c
---

 modules/codec/aom.c   | 4 ++++
 modules/codec/dav1d.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/modules/codec/aom.c b/modules/codec/aom.c
index 70953cf6d8..32271ed81b 100644
--- a/modules/codec/aom.c
+++ b/modules/codec/aom.c
@@ -360,6 +360,10 @@ static int OpenDecoder(vlc_object_t *p_this)
         dec->fmt_out.video.i_sar_num = dec->fmt_in.video.i_sar_num;
         dec->fmt_out.video.i_sar_den = dec->fmt_in.video.i_sar_den;
     }
+    dec->fmt_out.video.primaries   = dec->fmt_in.video.primaries;
+    dec->fmt_out.video.transfer    = dec->fmt_in.video.transfer;
+    dec->fmt_out.video.space       = dec->fmt_in.video.space;
+    dec->fmt_out.video.color_range = dec->fmt_in.video.color_range;
 
     return VLC_SUCCESS;
 }
diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
index 89112761c5..eb47d17f8a 100644
--- a/modules/codec/dav1d.c
+++ b/modules/codec/dav1d.c
@@ -316,6 +316,10 @@ static int OpenDecoder(vlc_object_t *p_this)
         dec->fmt_out.video.i_sar_num = dec->fmt_in.video.i_sar_num;
         dec->fmt_out.video.i_sar_den = dec->fmt_in.video.i_sar_den;
     }
+    dec->fmt_out.video.primaries   = dec->fmt_in.video.primaries;
+    dec->fmt_out.video.transfer    = dec->fmt_in.video.transfer;
+    dec->fmt_out.video.space       = dec->fmt_in.video.space;
+    dec->fmt_out.video.color_range = dec->fmt_in.video.color_range;
 
     return VLC_SUCCESS;
 }