From patchwork Fri Jan 24 12:39:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 17517 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp280706qvb; Fri, 24 Jan 2020 04:40:14 -0800 (PST) X-Google-Smtp-Source: APXvYqzLdwHFGf2ERI+/yHJuBAZOXorg/v157lztEv+OLNT0NpJqFlFEKU0T2kd1lFrcCCkGlOt8 X-Received: by 2002:a17:906:6888:: with SMTP id n8mr1864007ejr.171.1579869614004; Fri, 24 Jan 2020 04:40:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579869613; cv=none; d=google.com; s=arc-20160816; b=FVVCFZ16y9yaZXv3STmtjPl9zwOvLCdR/waVFreE71zQthXJRHDjR93XyHx/GQOTAs tzoBOg5qO/Xgp0nmuj2yvVjIajF7Q2flAihZOEj8G5GE7jVCKctTUOmK2Kl2yNy2E3Qs i3mvpWXqguce/PjN5YJzmMGdwIW+58umhoaldGk9HVW1Sc2v6JQcMPiALlxIvZu0X3fn ia++wLgjO/fNFzGuKyN3ZE2UF+9+T8waGi1ruXLfUWCi2Q3tK+7RDIVBrn0s0JR0tZz5 /2Bi3D0683ajX95Q0hxcyVD3KXLmxC2rNr3XvlaCI9uA7fKzsWQeyW2DC1w36ETnlOCA hQfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=ng6plCBrJEaJIrR82uXwCNq32u09lqmnJdtml4dBc64=; b=iQeu6xYaQCmcQ+VI7ItwJ85ICx8JcycVFbVOoSQfl37qJX8LJ5nO1ew0+SIhclKYWK 3clX3jeFI+VAgZJCFw+TFp429nvQmbyj10NltWvosJs7qhNnx+78zFLpl3ts+CYSSN0k hBeYHZGf24IrMP2AmP7je+iECpoiFuigx+ddQIj0sCTfQoMa0PbNJAV58HsWiDotrf2e 9dua1RbDtfZvZG+l6WHo/mtCwz60rU9MJ34Tv8g0Z5qr4y80dSYxt9YXo2i5xKlAxPyP /fpziQXueciXL68lgs2PaYdILTZg3fBWT6TSoswqb4dPgvhZ8rerZGvBjSboYRYqJnTI PkRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=o81VPdm6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bf23si3085524edb.505.2020.01.24.04.40.13; Fri, 24 Jan 2020 04:40:13 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=o81VPdm6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A655B68B057; Fri, 24 Jan 2020 14:40:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79F2868A957 for ; Fri, 24 Jan 2020 14:40:01 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id t2so1815074wrr.1 for ; Fri, 24 Jan 2020 04:40:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=63fV0YZs3Qtp/kK/L4g4TZ49n6UtjkRtVuU0GGP1hYk=; b=o81VPdm6SHbaeukp/1ofNXj5YH8leVOnb7qSOFNRPt0iUwFLh1FqwcTfGczkuT9M8J lM+F7h9BB8qFRepxWtkx0tx5GgwqhxtbyQjjg9MeU1fK7QtB81Hi2UWEZcBYxjCHGHx4 4t91YvHwByjoP/UAK2+n5A7gQIdei8drwhHUGIIOMC5RWzElDtyw6uM9fQ/7iVhPLPvp RA/Qkw1FcJbOmHqe+qCfHY4F3aM8ldE+JoQ7Z5X79J3vpxVRSKyRYi6jN5NqkbRHa7jX kDbauM5IUfMRi+3ylZX1u0k+faSXLkQ6GMXwJ+Vd+J8MtZ7KyU+iaLo5ts36eqd4D+DD JCqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=63fV0YZs3Qtp/kK/L4g4TZ49n6UtjkRtVuU0GGP1hYk=; b=rsptS1j1yIv/aGHeKYlEP7aJYY3pwMayrfrqULLfBvJUx1dq4EyRfS9ZkFuLc416OH NliNGdMgwUmEfSwSnTlS8alDOi9pDpfNRfj8FWAf9LlWrwqRZNml7bHj0+Q1ExqDoE1x T2jgBUGZhHUIKa5BbzUcc51VcVT0Fq+1qGSBLfyEa//8yBBqMTF7Wg1na1Xj3KGCdv5e wpnxwzibsIen+Aj56qs+PoJeuW1SdgAKkUKZDb/0x08LDghFBvY/pmLBzEYLmqeNqHSd G5lAM44VU0IrJzmWickagAx7V0vPKMO2/ACUIKSid80hDVsumKugE4cYOMQeQo0SDvH6 nWmw== X-Gm-Message-State: APjAAAU6LGF0A8uUDZ7Uod6fbSEy6rNTwnSjEFkj+5o+JHPWIykdLYRG ESh/I7UDkNwOlopSGYUK/PAz9tmViUw= X-Received: by 2002:a5d:5452:: with SMTP id w18mr3897233wrv.333.1579869600380; Fri, 24 Jan 2020 04:40:00 -0800 (PST) Received: from localhost.localdomain ([94.250.182.166]) by smtp.gmail.com with ESMTPSA id o187sm7688208wme.36.2020.01.24.04.39.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 04:39:58 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 13:39:51 +0100 Message-Id: <20200124123952.15984-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dnxhddec: properly set colorspace X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rrxj9uEzQm++ Content-Length: 1784 Signed-off-by: Paul B Mahol --- 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");