From patchwork Fri Jan 18 03:43:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Birkbeck X-Patchwork-Id: 11786 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 172F744DFC1 for ; Fri, 18 Jan 2019 05:50:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2762668AC02; Fri, 18 Jan 2019 05:50:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A771268ABCA for ; Fri, 18 Jan 2019 05:49:58 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id c25so5396801pgb.4 for ; Thu, 17 Jan 2019 19:50:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=k3pvjGqb+fA+cdX3N0pplAZoK5QUeW689nMgaREv2bE=; b=EbxcZST5at0D5c0aCzDiUblHPkDBDJNbVSIKMqtIuHULAFO7MU2uUSBUAdImW7xk/Z mc9c3o963Jjx163fwO/ZS+6LLmNuMs+awM1mCNzMKQH8KTlbRB6oY0pl77AOv8RgOt99 845e+N9YBws3TgzZPqp7etgpq4kToZJybc09+U1fTXGsh554l1dzsr0+EaJel8KfSDI+ uS+oQ7Vj1OLuID5q8CChfyxHyHqkHaNgRCMYWUQpkjrsVGpxzbvkSJaPwHXoT7vk8Xrm qohEn1nhAsqEFikpIcItK/TPPSpaLQHI9Q+Bbg44i6MA1h3fzw7kzrokbKKgT+X4yvP3 zqXQ== 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:mime-version :content-transfer-encoding; bh=k3pvjGqb+fA+cdX3N0pplAZoK5QUeW689nMgaREv2bE=; b=XF2Ml8a0nORbNU/U/NzQMc2zAzqVXYoMiavg7wj3rv8hTiPK2MzHXlIGjKm/K99QqF NY9ud9HpfWJZ7+i3IjBCaA+/0KGWINavyqPKPUZMRvoLBvmwyk6GLaWcyUTEEOKbBreH 0lw4Lq+O6lyrCofSapfuOeU3P+psXiGmZi4W8KL6+4SUBfa2gGt/+w8XkV4TUCZsrj9N LzLO00lewh+v3z+YN+4sh1W2XlPb5MwkacTU2CHwGRI7XQx7c4orHLC0zxI9QxcVC43Z 0zvv7ecl9cde/QjH5eeEkMVLCJdRI7r0323Erxa27ialVop16ewcQyzHr2HpK5TGpddQ ehew== X-Gm-Message-State: AJcUukdotpxqq07otakwhqqSMH3+8MIVFA/YnudgbUUz5AgIMRdNcJzw XBG9QZpnD0srt5keKig85d/j6w6h X-Google-Smtp-Source: ALg8bN6PdO8VxCFBBgo/i/MthPHrFWg16SG6fngNmS+5i5XB+8wPx3ddLkZ/iVe4C016ULR+hkJSMQ== X-Received: by 2002:a63:6103:: with SMTP id v3mr15571994pgb.75.1547782994023; Thu, 17 Jan 2019 19:43:14 -0800 (PST) Received: from birkbeck2.mtv.corp.google.com ([2620:0:1000:4011:a316:d3d3:606a:85fd]) by smtp.gmail.com with ESMTPSA id t12sm4688782pfi.45.2019.01.17.19.43.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 19:43:13 -0800 (PST) From: Neil Birkbeck To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jan 2019 19:43:06 -0800 Message-Id: <20190118034306.257742-1-neil.birkbeck@gmail.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/proresdec2: only set avctx->color* when values are specified 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This allows preservation of color values set from the container, while still letting the bitstream take precedent when its values are specified to some actual value (e.g., not *UNSPECIFIED). Signed-off-by: Neil Birkbeck --- libavcodec/proresdec2.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 6209c229c9..662ca7d48b 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -262,9 +262,12 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, } } - avctx->color_primaries = buf[14]; - avctx->color_trc = buf[15]; - avctx->colorspace = buf[16]; + if (buf[14] != AVCOL_PRI_UNSPECIFIED) + avctx->color_primaries = buf[14]; + if (buf[15] != AVCOL_TRC_UNSPECIFIED) + avctx->color_trc = buf[15]; + if (buf[16] != AVCOL_SPC_UNSPECIFIED) + avctx->colorspace = buf[16]; avctx->color_range = AVCOL_RANGE_MPEG; ptr = buf + 20;