From patchwork Wed Jun 19 23:45:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13635 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 76F3E448B0E for ; Thu, 20 Jun 2019 02:57:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EB9868AB6B; Thu, 20 Jun 2019 02:55:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DAAA68AB40 for ; Thu, 20 Jun 2019 02:55:51 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id g135so1165586wme.4 for ; Wed, 19 Jun 2019 16:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZZW3fXMT4O0dGA4i1nygEDSil5rHDNK31dGNtAr9CbQ=; b=DuamlJNW0q9sy5bc3qiQ9mNg/8afxHUUr82M7ZnlhNRVrZiMoxJ4aEKFf8DhircPVc iBjgS34izPRYitAvX2jBWP7bA8zSYQMHGIkklUEGFgcdRN6xFNvaGKToXVuZHKgSeai6 mN2OTzhre36FoeXy/3mQJaJY5zsMeQhr834mCV9vlWJQNtPtyEYKqMXmBQgPKp7iB0rM AtMbuU6rsxV49b6zb03gRvpGgh30mykNwSv4MvI/KrvRrwWiOo9EmiDcJfOztNyzMNdz A+hZ2gYRdn8Z0xT2ZCOo3ovLjWn0rNJYinenfAsd41wbAwCFwYL+Wvb2AbQQYSP0cvbb V/gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZZW3fXMT4O0dGA4i1nygEDSil5rHDNK31dGNtAr9CbQ=; b=MZq7+nkU0Tl9KpOZNZ2ZRRy5QKK/X6cRSwB7KaWj1hzEBqZqiM91GVJFrVpB1bKKOh fG4QipfdObNjXHIHI8kXiW83cF+yaOy6v/Qx1pzr9SpD7ARDxt1YFtx4FzX/mRKo+tZX IXDo4jhvTnhLkQ62h4UYp6qICbHrivsM2hCB7sfPoTfRVSGOZ/Q1tM3z95216RjwDNyA 0HNLXVCWbS8j2GcJGDtHJ6erkqoUsr16h3aM9EVePXEREiV/oFvuxo97xaooWAFy/pSq zdN5ecui17tPRi19POoWmNnRNVN0UgVghpHJXeVDRbvE1VAZYVDZY6H+N0/D7Va11tDO BsKw== X-Gm-Message-State: APjAAAV4DKNl+mqBJTZ2mgDxnzRbZyGJHAa5oDtb8SJ7WSg4S6NCGyP5 z3rHtS9z0lozuGX+x3YB2wmA3N+r X-Google-Smtp-Source: APXvYqzFYCDp4i7rOqx0fR1UNWQGU63vvJHJdzhqklcAL5TQLUEt0qU8vjw/mB7z0kPj++NvoKpbug== X-Received: by 2002:a1c:6154:: with SMTP id v81mr9850375wmb.92.1560988550359; Wed, 19 Jun 2019 16:55:50 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id t63sm2758989wmt.6.2019.06.19.16.55.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 16:55:49 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 01:45:18 +0200 Message-Id: <20190619234521.15619-20-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619234521.15619-1-andreas.rheinhardt@gmail.com> References: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> <20190619234521.15619-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 28/31] vp9_metadata: Improve spec-compliance and warnings 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The earlier version had three deficits: 1. It allowed to set the stream to RGB although this is not allowed when the profile is 0 or 2. 2. If it set the stream to RGB, then it did not automatically set the range to full range; the result was that one got a warning every time a frame with color_config element was processed if the frame originally had TV range and the user didn't explicitly choose PC range. Now one gets only one warning in such a situation. 3. Intra-only frames in profile 0 are automatically BT.601, but if the user wished another color space, he was not informed about his wishes being unfulfillable. The commit also improves the documentation about this. Signed-off-by: Andreas Rheinhardt --- doc/bitstream_filters.texi | 8 ++++--- libavcodec/vp9_metadata_bsf.c | 40 ++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index e5ce7bc0a3..c9dff7ae03 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -660,7 +660,9 @@ Modify metadata embedded in a VP9 stream. @table @option @item color_space -Set the color space value in the frame header. +Set the color space value in the frame header. Note that any frame +set to RGB will be implicitly set to PC range and that RGB is +incompatible with profiles 0 and 2. @table @samp @item unknown @item bt601 @@ -672,8 +674,8 @@ Set the color space value in the frame header. @end table @item color_range -Set the color range value in the frame header. Note that this cannot -be set in RGB streams. +Set the color range value in the frame header. Note that any value +imposed by the color space will take precedence over this value. @table @samp @item tv @item pc diff --git a/libavcodec/vp9_metadata_bsf.c b/libavcodec/vp9_metadata_bsf.c index 1bde1b96aa..52e962b1c0 100644 --- a/libavcodec/vp9_metadata_bsf.c +++ b/libavcodec/vp9_metadata_bsf.c @@ -33,7 +33,7 @@ typedef struct VP9MetadataContext { int color_space; int color_range; - int color_range_rgb_warned; + int color_warnings; } VP9MetadataContext; @@ -56,20 +56,36 @@ static int vp9_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) for (i = 0; i < frag->nb_units; i++) { VP9RawFrame *frame = frag->units[i].content; VP9RawFrameHeader *header = &frame->header; + int profile = (header->profile_high_bit << 1) + header->profile_low_bit; + + if (header->frame_type == VP9_KEY_FRAME || + header->intra_only && profile > 0) { + if (ctx->color_space >= 0) { + if (!(profile & 1) && ctx->color_space == VP9_CS_RGB) { + if (!(ctx->color_warnings & 2)) { + av_log(bsf, AV_LOG_WARNING, "Warning: RGB " + "incompatible with profiles 0 and 2.\n"); + ctx->color_warnings |= 2; + } + } else + header->color_space = ctx->color_space; + } - if (ctx->color_space >= 0) { - header->color_space = ctx->color_space; - } - if (ctx->color_range >= 0) { - if (ctx->color_range == 0 && - header->color_space == VP9_CS_RGB && - !ctx->color_range_rgb_warned) { - av_log(bsf, AV_LOG_WARNING, "Warning: color_range cannot " - "be set to limited in RGB streams.\n"); - ctx->color_range_rgb_warned = 1; - } else { + if (ctx->color_range >= 0) header->color_range = ctx->color_range; + if (header->color_space == VP9_CS_RGB) { + if (!(ctx->color_warnings & 1) && !header->color_range) { + av_log(bsf, AV_LOG_WARNING, "Warning: Color space RGB " + "implicitly sets color range to PC range.\n"); + ctx->color_warnings |= 1; + } + header->color_range = 1; } + } else if (!(ctx->color_warnings & 4) && header->intra_only && !profile && + ctx->color_space >= 0 && ctx->color_space != VP9_CS_BT_601) { + av_log(bsf, AV_LOG_WARNING, "Warning: Intra-only frames in " + "profile 0 are automatically BT.601.\n"); + ctx->color_warnings |= 4; } }