From patchwork Thu Aug 20 02:36:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Bradshaw X-Patchwork-Id: 21748 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 1C82A44BBFD for ; Thu, 20 Aug 2020 05:45:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB44968B4FD; Thu, 20 Aug 2020 05:44:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f201.google.com (mail-il1-f201.google.com [209.85.166.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F126C689734 for ; Thu, 20 Aug 2020 05:44:52 +0300 (EEST) Received: by mail-il1-f201.google.com with SMTP id t79so577563ild.5 for ; Wed, 19 Aug 2020 19:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=4jCSq7AmFRlyjeRb3tyh803Af4ydWvYwWG6nuHeGxug=; b=kYEQCWVMABiq72Wx26Tc05FrQoNGXMIHwpqGScvPL6XAJYsQNVjjj16StsKISFLNVo xQfujkQBdxdW2Sgip3BPAbTgER2j/8NR+i1PAewp5ovze+OvUO0ujWv7/RZrIeF6lt1T L0J/Lcs8LjZcWY2h/ig0NRX6dof9SNEXxPla5wYiwPb64MMmptG/vNHuuTebqJ3bj3CM CjgAVTGZLWaxT9tlS6IJ0/zbY5w+NSFSVKG4sA40XTed+0Pq5baietN6ZcmMVSsQff91 ei/PYVDY9iR6W4afZj6XL/6rIWqXyqxSjd7gx/aKp9Y0HyDyoxO/Y6u3zIWjA+Ic43fZ iWqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=4jCSq7AmFRlyjeRb3tyh803Af4ydWvYwWG6nuHeGxug=; b=FqvtVZve4oGZGyrP2IJ344rN2wd2U49t5rktlJaIqEGu47v7XWbFXnEWeZfEmogC/Q OEbRmZvEnKLuzUuc8fkbtYLC4au1UFp9qKzugrH3iaqcPvNa0twjXwxBYCtWpBIZ/p5V rbMWjFZThHdCRuDruPj3wx16ibuxLRF3c9JkJpflpMJB18bLvwjvs/8rTax3H5Gu6npi GLt3U5Fjmk+Y6H4BB8o0qmJ6IdgcOFpiqqmJO9nKwnnN2REh/J8H9kjEoaNwCat/q/hL YaT795NT7WwwavBlcxB/UHNKV5UkwLdu+OGBH9UDinmDcfz5sz5hEdCoqJh9WGh2IfzM 2foQ== X-Gm-Message-State: AOAM531B4+rUGfZRsmUiGDACxpYbpZWw6yWrQA/8qUtmk01Glo/0kJNY uZBCsyhAkQFzQsGxYw1RntUA4ZTHZZbbbIuLoAN1owP2eyxTOt3RkmopfTivEZ5l9b97mhJPJ0n lV5mZHRi95mEbafdIboZCggIIn7o/fYK3O047sO2IZD5v1GmZqRG7Kyl9kTFTrHXx1A== X-Google-Smtp-Source: ABdhPJzuN9ZL1I2J7/RuWZCXAEZ4VIFL+QEcGagqKwwzys6Hc9XhcV7j92RTlY59qZouiWuMT6XO/0p3U6BI X-Received: from mjbshaw2.sbo.corp.google.com ([2620:0:1006:111:f693:9fff:feec:45c8]) (user=mjbshaw job=sendgmr) by 2002:a63:2d42:: with SMTP id t63mr993471pgt.450.1597891013119; Wed, 19 Aug 2020 19:36:53 -0700 (PDT) Date: Wed, 19 Aug 2020 19:36:26 -0700 In-Reply-To: Message-Id: <20200820023625.1667627-1-mjbshaw@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog From: Michael Bradshaw To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/proresenc: add support for PQ and HLG 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: Michael Bradshaw Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Bradshaw --- libavcodec/proresenc_anatoliy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 1128978330..3005db0bb4 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -55,7 +55,8 @@ static const int bitrate_table[6] = { 1000, 2100, 3500, 5400, 7000, 10000}; static const int valid_primaries[9] = { AVCOL_PRI_RESERVED0, AVCOL_PRI_BT709, AVCOL_PRI_UNSPECIFIED, AVCOL_PRI_BT470BG, AVCOL_PRI_SMPTE170M, AVCOL_PRI_BT2020, AVCOL_PRI_SMPTE431, AVCOL_PRI_SMPTE432,INT_MAX }; -static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, INT_MAX }; +static const int valid_trc[6] = { AVCOL_TRC_RESERVED0, AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, AVCOL_TRC_SMPTE2084, + AVCOL_TRC_ARIB_STD_B67, INT_MAX }; static const int valid_colorspace[5] = { AVCOL_SPC_BT709, AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_SMPTE170M, AVCOL_SPC_BT2020_NCL, INT_MAX };