From patchwork Mon Nov 4 11:10:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16095 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 800D34489FE for ; Mon, 4 Nov 2019 13:18:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 618F968A656; Mon, 4 Nov 2019 13:18:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D9DD68A0FA for ; Mon, 4 Nov 2019 13:18:10 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id x28so8755705pfo.6 for ; Mon, 04 Nov 2019 03:18:10 -0800 (PST) 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; bh=qEIYFwmLGK1KFMSuyzZdZEiCxuIrNEduFS0bB2hWzUo=; b=aZWSa0oANsG6wxnW36L9VZzBsoQpi3gU3031dFeU7jjiruYxoTh5V7yn5aZG079Xj5 cUs/9zr7Gy2Ewg69BEPs3r3UGTH1gbip33sAVCOY7v+81rIS5ttvQmGO8iPLxChqQG7z PQw5rrg2D/gstJssGU28MsrrbMn+6lrsXuyu9tS6CZoKR4xTvrPk978qLt/CxP1tH1fQ KiA8y3kwY8oqxp4aBJM07YyK6b9tA/3o194yjeOgM+s6Ho7JhXCzXITUy7+6G8OCgMrf 8/cIRCWtipU0I4RT/I2n8ZC5Eje4L8v4AjmV1y1QHJKDElJRXlkz/bc4Hpk6FTOTkkez qBkg== 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; bh=qEIYFwmLGK1KFMSuyzZdZEiCxuIrNEduFS0bB2hWzUo=; b=AooaBU1Ig2iLhI+gLXd4gJ9+Rx3crdTICvCAGkPExMzlQlNQOoBNxJTvm958ibfTAc v7aDTG/WxKVaz0zdnV0cp8v6JdMAI332hOYz4nTivibLFIFzFRnVM3Sm0gPYxICsz2Za f5uWJJ0/mTCxZ3xoXVfOGfcEEg7tjZkk+EiEFiB/EJK+0UBdwb+rERHVxPUSFY6tbOjM dHjUILKDuAc1vGG5m1vk7H6DsAHOhPng6V1oqKsgmr6E0mZkku5MbflmWZ8nCXA4dxib mgLSALBr0+hStbCjFmpEJ1mW4xhCS9TMZ0g/42IEZ7okL+r5XNJXNBueIGwJYpRthQWT US1w== X-Gm-Message-State: APjAAAUzGrc8q+DlCa2UQCq1qKBArNJw94lPZ9OV034qnAT4XXrsqN8y CQUdLC3uratUi36mvyh3Sw2pFx8N5QI= X-Google-Smtp-Source: APXvYqxlHdv9sEb2plZKvtfDwDWV1gnnG9nhmMsqa9YUfLiJwrcAl6VvDmpf/kdBroA3LHEzUIt/KQ== X-Received: by 2002:a63:c749:: with SMTP id v9mr28685850pgg.265.1572865813797; Mon, 04 Nov 2019 03:10:13 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f12sm14522745pfn.152.2019.11.04.03.10.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Nov 2019 03:10:13 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Nov 2019 19:10:00 +0800 Message-Id: <20191104111001.6426-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191104111001.6426-1-lance.lmwang@gmail.com> References: <20191104111001.6426-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/4] avcodec/prores_metadata_bsf: add smpte2084 format support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang It's based on the following specs: RDD 36:2015 - SMPTE Registered Disclosure Doc - Apple ProRes Bitstream Syntax and Decoding Process Signed-off-by: Limin Wang --- doc/bitstream_filters.texi | 2 ++ libavcodec/prores_metadata_bsf.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 8fe5b3ad75..e2de4fd4ed 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -589,6 +589,8 @@ Keep the same transfer characteristics property (default). @item unknown @item bt709 BT 601, BT 709, BT 2020 +@item smpte2084 +SMPTE ST 2084 @end table diff --git a/libavcodec/prores_metadata_bsf.c b/libavcodec/prores_metadata_bsf.c index 0510d3520a..24615e9305 100644 --- a/libavcodec/prores_metadata_bsf.c +++ b/libavcodec/prores_metadata_bsf.c @@ -140,10 +140,11 @@ static const AVOption options[] = { {"smpte431", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_PRI_SMPTE431}, INT_MIN, INT_MAX, FLAGS, "color_primaries"}, {"smpte432", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_PRI_SMPTE432}, INT_MIN, INT_MAX, FLAGS, "color_primaries"}, - {"color_trc", "select color transfer", OFFSET(transfer_characteristics), AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCOL_TRC_BT709, FLAGS, "color_trc"}, + {"color_trc", "select color transfer", OFFSET(transfer_characteristics), AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCOL_TRC_NB, FLAGS, "color_trc"}, {"auto", "keep the same color transfer", 0, AV_OPT_TYPE_CONST, {.i64=-1}, INT_MIN, INT_MAX, FLAGS, "color_trc"}, {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, INT_MIN, INT_MAX, FLAGS, "color_trc"}, {"bt709", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_TRC_BT709}, INT_MIN, INT_MAX, FLAGS, "color_trc"}, + {"smpte2084", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_TRC_SMPTE2084}, INT_MIN, INT_MAX, FLAGS, "color_trc"}, {"colorspace", "select colorspace", OFFSET(matrix_coefficients), AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCOL_SPC_BT2020_NCL, FLAGS, "colorspace"}, {"auto", "keep the same colorspace", 0, AV_OPT_TYPE_CONST, {.i64=-1}, INT_MIN, INT_MAX, FLAGS, "colorspace"},