[FFmpeg-cvslog] avcodec/dnxhddec: properly set colorspace

Paul B Mahol git at videolan.org
Wed Jan 29 10:44:48 EET 2020


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Jan 24 13:30:24 2020 +0100| [d01d606504399ffa21b89c4be49f513ab819de24] | committer: Paul B Mahol

avcodec/dnxhddec: properly set colorspace

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

 libavcodec/dnxhddec.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 1e95086696..2ec004333f 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -235,7 +235,14 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
         av_log(ctx->avctx, AV_LOG_WARNING,
                "Adaptive MB interlace flag in an unsupported profile.\n");
 
-    ctx->act = buf[0x2C] & 7;
+    switch ((buf[0x2C] >> 1) & 3) {
+    case 0: frame->colorspace = AVCOL_SPC_BT709;       break;
+    case 1: frame->colorspace = AVCOL_SPC_BT2020_NCL;  break;
+    case 2: frame->colorspace = AVCOL_SPC_BT2020_CL;   break;
+    case 3: frame->colorspace = AVCOL_SPC_UNSPECIFIED; break;
+    }
+
+    ctx->act = buf[0x2C] & 1;
     if (ctx->act && ctx->cid_table->cid != 1256 && ctx->cid_table->cid != 1270)
         av_log(ctx->avctx, AV_LOG_WARNING,
                "Adaptive color transform in an unsupported profile.\n");



More information about the ffmpeg-cvslog mailing list