[FFmpeg-cvslog] libavcodec/libaomenc: add support for transfer characteristics and color primaries

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 29 01:03:24 2018 -0300| [e5819fa62930966e6fb905cef21c985b91631d87] | committer: James Almer

libavcodec/libaomenc: add support for transfer characteristics and color primaries

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavcodec/libaomenc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index c424f14824..7aac019b5b 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -74,6 +74,9 @@ static const char *const ctlidstr[] = {
     [AOME_SET_ENABLEAUTOALTREF] = "AOME_SET_ENABLEAUTOALTREF",
     [AOME_SET_STATIC_THRESHOLD] = "AOME_SET_STATIC_THRESHOLD",
     [AV1E_SET_COLOR_RANGE]      = "AV1E_SET_COLOR_RANGE",
+    [AV1E_SET_COLOR_PRIMARIES]  = "AV1E_SET_COLOR_PRIMARIES",
+    [AV1E_SET_MATRIX_COEFFICIENTS] = "AV1E_SET_MATRIX_COEFFICIENTS",
+    [AV1E_SET_TRANSFER_CHARACTERISTICS] = "AV1E_SET_TRANSFER_CHARACTERISTICS",
 };
 
 static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
@@ -449,6 +452,9 @@ static av_cold int aom_init(AVCodecContext *avctx,
     if (ctx->crf >= 0)
         codecctl_int(avctx, AOME_SET_CQ_LEVEL,          ctx->crf);
 
+    codecctl_int(avctx, AV1E_SET_COLOR_PRIMARIES, avctx->color_primaries);
+    codecctl_int(avctx, AV1E_SET_MATRIX_COEFFICIENTS, avctx->colorspace);
+    codecctl_int(avctx, AV1E_SET_TRANSFER_CHARACTERISTICS, avctx->color_trc);
     set_color_range(avctx);
 
     // provide dummy value to initialize wrapper, values will be updated each _encode()