From patchwork Thu Oct 4 23:09:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10570 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp1467203uaq; Thu, 4 Oct 2018 16:10:29 -0700 (PDT) X-Google-Smtp-Source: ACcGV62pY+PdrAxvuBEsvlDAEtvRZbtOqtJUovSIeDTFMq7T+VE1H+LJPuhsTanYlPVXaf6dCpK1 X-Received: by 2002:adf:8b5e:: with SMTP id v30-v6mr5803210wra.282.1538694629801; Thu, 04 Oct 2018 16:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538694629; cv=none; d=google.com; s=arc-20160816; b=glHHlI6diQ1cVD66UOwkLq56MmwTSGt4lXbK+xr9pVYEqmOgzJvwvloLF+K+PJYXZK nMBDyw/y/GtdMCL+Qslxrnzxg7qPNsvCCvqnNHjkzb33lzqGKVzW1IZ6y1ZEI1yz4sBC mpGBFjVLuh5T0JCE+rghDGiinZ0SAFy331ji/P85Vy3AIBXNHmpXMM7MGROFazxCmN7f IbST3V8IKvXR7Ayj2tpd7yo6rVtLcOWz66HBDEq7fVLcJWscuwt+UwiUPsoU6RHcbOxe 3zAGvY3ie00vr0ODWlYLCMnqfjXKJdnuWaAa5cWOB9pxakoj8lAKSjbTEom3hx3q1qq3 8GSA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=e0F1vUuFOlTiLQUoqwgNLzLauOZplT/TayuZMPFv+wM=; b=VZGcazTObnA/J31sSC6LrO7ONRqf2KvB8U5sk7sBFXEx6u/xTCKLpJsC6hwgPiamCJ 4uYzZ4Fy9RHo7cppCq0CoFl3Snb+6Hur1SuZ9X9okkHxM/NfF3RQeCSewwqz6eyNcgdI /EsXSEon9CuK0Kpm82MyqCxZ+BCh6UVerzud7TYxNiHUlRfyiPztyX6Q+dopAZh0p2zv pCsC5UdqqMBsVnfuvi7SSrTPW/1QlDnW5nN5wLYsu/8kwsP2TCoc0sLK8hFpByTXx/IR 71Hvi0UHrIcvR3r8fJb7JBwoxulkhc/IEFRFLz3qEC8gZDqWnppVpy7meSurz+4VG5xN jL+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=JoOODkpk; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m13-v6si4835332wro.9.2018.10.04.16.10.28; Thu, 04 Oct 2018 16:10:29 -0700 (PDT) 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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=JoOODkpk; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED0F568A482; Fri, 5 Oct 2018 02:09:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DDD268A457 for ; Fri, 5 Oct 2018 02:09:35 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id x12-v6so11612532wru.8 for ; Thu, 04 Oct 2018 16:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=AqGZREdlcy6bbvUXwiiiF/IZ8wfPhXTGoWlRcG35QG0=; b=JoOODkpkW+Y/W8SqE7wIjOVM17fX4wLXn9aVaoFO3kHHca04dGD66rINKN1wmr08M7 QIYoGJT1qgJd6L2Lc8QFHd1PZDMhx6h8A8dsSyFmpiIokN8HR1+5cWtFySj9QxB1d1HD 5t0eZb/qSpaQMa019wX8kEU6394iRoRW37Wgdp7o/ZsQckEPBtKKmOTBsE2xNaDn7Y0G GWWRHnyCW2isKiiVU/aH98n7I2cGBAY1inOvXTSQzvYOiF8eKIZta2znbWZi14XT1Hq/ x7mRcK90CjwkmYydKJ+HY+Ra0zkLH9WkJThFBZ+xElAhNT/n7ZosZT6JQuuhOgvO4jnP bbkQ== 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:in-reply-to :references; bh=AqGZREdlcy6bbvUXwiiiF/IZ8wfPhXTGoWlRcG35QG0=; b=r23g4EW0U8rDL5w1ECzaiO/WAVpVEqIPd0QdzBLdRODEAlA27Hmk0+mUVOi6KPfpe2 AfHvrteqoxHIGXyOljCayYL1SoQM98/ASQgqkk1zWUC3YDETqNuWJrvtqmfq0DvE70ib I+Z54d9Tf6uITgTrRKQsYn/OnLZqasptEsH85LHJH1t0IwS8V9M6qh+eN3m+JnzqJYHa ST8ACzZvWDQiptfT8clUUqUf/ji2AqwdcWIY/57lNf0UTy9FJtvJvjTdSznyhOKipb28 fi6qXE+J5LUH3tkWQQPjWmbE9Ep6+mbcj8NNSlsxr/Qv3x/pTrY5Tzvxkf+YhRii8YHQ WuhQ== X-Gm-Message-State: ABuFfoh1xWayUjPw8gMApkZd8tNUc6hM4KY17sexHFPNj7nZwFKFzg0l q2nHt6PSyRZzOzQGzpxG8WYh89VTu+U= X-Received: by 2002:a5d:680b:: with SMTP id w11-v6mr5840155wru.186.1538694595069; Thu, 04 Oct 2018 16:09:55 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id a105-v6sm11822006wrc.23.2018.10.04.16.09.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 16:09:54 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Oct 2018 00:09:46 +0100 Message-Id: <20181004230947.9658-4-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181004230947.9658-1-sw@jkqxz.net> References: <20181004230947.9658-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 4/5] av1_metadata: Fix constraint on setting chroma_sample_position 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" It can't be set for 4:2:2 streams. --- libavcodec/av1_metadata_bsf.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index 20c3a39da7..52d383661f 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -86,13 +86,9 @@ static int av1_metadata_update_sequence_header(AVBSFContext *bsf, } if (ctx->chroma_sample_position >= 0) { - if (clc->mono_chrome) { + if (clc->mono_chrome || !clc->subsampling_x || !clc->subsampling_y) { av_log(bsf, AV_LOG_WARNING, "Warning: chroma_sample_position " - "is not meaningful for monochrome streams.\n"); - } else if (clc->subsampling_x == 0 && - clc->subsampling_y == 0) { - av_log(bsf, AV_LOG_WARNING, "Warning: chroma_sample_position " - "is not meaningful for non-chroma-subsampled streams.\n"); + "can only be set for 4:2:0 streams.\n"); } else { clc->chroma_sample_position = ctx->chroma_sample_position; }