From patchwork Tue Jul 9 01:10:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13866 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 920C2447954 for ; Tue, 9 Jul 2019 04:17:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7175768AF54; Tue, 9 Jul 2019 04:17:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04DCA68AF29 for ; Tue, 9 Jul 2019 04:17:40 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id s3so1309638wms.2 for ; Mon, 08 Jul 2019 18:17:39 -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=aGlXQqDKPjP8nz5QPuhOHPJeBp2r/vix+3eNpZpC1kY=; b=LR8azwJVz6GAdn2yMjWOtdR11300RfRIpGUA3/5dSaqb3/4/eQfcRJZvI7ZSr184ve p8rQ7Vsa+RQu4UhNXSaqpqoylp6wZ+NWMHt0E58cdycForZSg+xMHYqzSaDxdWmKylOF mEKe5CGCCHvTD0wxcQHocVeiQYPa5oiwJdZtbxtIBOZHfH4KQUSGagpYY9eebPlNzWsj lw9LpBQpSjEhAb4M+kJ0ipWv7MQYDd8C2f6Kuk5Mu1GH9H7y/4EAtwg+Kzx6T1VElFCX 6H/JuNe/J8W4ThKmiCVmSOC6YUtEckHYzKlI/7n97kp/W2peGI36C3xfFzfetBzABm0V /z+A== 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=aGlXQqDKPjP8nz5QPuhOHPJeBp2r/vix+3eNpZpC1kY=; b=pXxXjMYkF+ojhLLQ8TYY6SEKBbwqXpTwe+a8m6GibjkVXx3k1QiwaW7Lh9RYKqBnc2 2so85q5zqnO+XNUi2Cd6FZeeBfn7d3f8aVq30uI0Qh+4/Ym9zV9BxO5fhkBmywpMd1j1 PPUR2hKHdXgJ+ae2FZ73KFQ+lLbiZeWovFdAOHeS1daEPNQBLsBZ4Q74je6ToM7Y0rn2 8jdU0P/B9Eh90cL+80b6JT6JR5JxMeRnNWggGR215Bzqpu2oyrwj27wrNBhlf8tNsap2 rdhMw8UFz9psThwoPZnqXjEtVQH/oDgNdy8qU827bif3PO8i0q3rTTB/Evzeil1m3D8n SuyQ== X-Gm-Message-State: APjAAAWEE9UfbYaa4Zw+K+U1Xv68L1cfcNPa7E02ZSgH75+UDskeEjcL 4j46GRxTzM6pUDHSTtXhN71E0ahU X-Google-Smtp-Source: APXvYqw5Ln2lBWyooOBP8NKzVJE+X++SSEnBnflkTt99NM6K6CTylFXCVt8Mo+3uwBVsRb81H2jhUA== X-Received: by 2002:a1c:ac81:: with SMTP id v123mr19417879wme.145.1562634701090; Mon, 08 Jul 2019 18:11:41 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b8f.dynamic.kabel-deutschland.de. [188.192.139.143]) by smtp.gmail.com with ESMTPSA id a84sm1140319wmf.29.2019.07.08.18.11.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 18:11:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jul 2019 03:10:46 +0200 Message-Id: <20190709011048.29601-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190709011048.29601-1-andreas.rheinhardt@gmail.com> References: <7166cd5e-8604-3842-3191-e0d47d7ac934@gmail.com> <20190709011048.29601-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 29/31] vp9_metadata: Update AVCodecParameters during init 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" This commit changes vp9_metadata to update the AVCodecParameters to reflect the output bitstream. This brings vp9_metadata in line with what is expected of a bitstream filter. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_metadata_bsf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/vp9_metadata_bsf.c b/libavcodec/vp9_metadata_bsf.c index 52e962b1c0..0ce017ffea 100644 --- a/libavcodec/vp9_metadata_bsf.c +++ b/libavcodec/vp9_metadata_bsf.c @@ -107,7 +107,23 @@ fail: static int vp9_metadata_init(AVBSFContext *bsf) { + static const uint8_t conversion_table[8] = { + AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_BT470BG, + AVCOL_SPC_BT709, AVCOL_SPC_SMPTE170M, + AVCOL_SPC_SMPTE240M, AVCOL_SPC_BT2020_NCL, + AVCOL_SPC_RESERVED, AVCOL_SPC_RGB + }; VP9MetadataContext *ctx = bsf->priv_data; + AVCodecParameters *par = bsf->par_out; + + if (ctx->color_space >= 0 && (par->profile & 1 || + ctx->color_space != VP9_CS_RGB)) + par->color_space = conversion_table[ctx->color_space]; + + if (par->color_space == AVCOL_SPC_RGB) + par->color_range = AVCOL_RANGE_JPEG; + else if (ctx->color_range >= 0) + par->color_range = ctx->color_range + 1; return ff_cbs_init(&ctx->cbc, AV_CODEC_ID_VP9, bsf); }