From patchwork Fri Jul 23 02:02:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Degawa X-Patchwork-Id: 29023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1019933ios; Thu, 22 Jul 2021 19:02:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzODH2rK6QJNn+QK+STR45j0gvXxg6Gpqk7i5X5dDnafMJjftI7JowWypvdOF+QeWjX65P0 X-Received: by 2002:a05:6402:334:: with SMTP id q20mr2924214edw.384.1627005743565; Thu, 22 Jul 2021 19:02:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627005743; cv=none; d=google.com; s=arc-20160816; b=rBb9Qglo+pqAKZ4pEee5q2klOYCO47EFMBnewmJZB3FwT78lJucILjhscpGmAZ2h04 AH+zZIteyUiPq+iHhkbZ9gOAZJZDUmlMcJhX+kibhSCLWuy8A/ZU9lL4Wqhnl+3GIDGO D8Fj8BjK3FdYs8vuBWq6C67XO97v+iM8lr3pcqY0JDE0RyeNglf3fPpX+PguCGzX572O P7Dv+8mpcqo6+dMtFR2xSUSY7w7bIwsS7hcPZuq6aj8Gv5JG6Biblgwnzo07js9pb/vA qZ5H3FLSV+1UIySdTDCylr09243mcjOz/UiLV/oMhILRKklY4SZqb4AXQHEEzwWw1Ll6 1vbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=4PALArCJE3MSxzn7pJqluV4k80jmOQ3i0kIyJSH1Siw=; b=APcWe6c35leZo7xlF2I7swaRe0vK35KL+938R+b9+GjkcZQVkGeTq5C3NwLafmlGta yGe1RiYbyLuPkli8i+2KDl0KGSozQGSg5pvA7oOFBAVoFVKRXYRGxMRP+zTVnkAmEh8P wr1P+Z5MGAO/7J+QSnBeknfvc7+8H3qBhdmO54b4icR0zAtPk3prUlfLxwvybUTh4IYy uN1/hAySYAK3lJ3BH0Tqa1rBl1O1AtzCxyHhH5Al+SnxSCS69XHB2y4frNaEgDkIAPXu /0Ozi2il9bcnTlsOxBZl7PxAuxON1g2xiuTKesnOupl2Gyigbhr9FygmFvinXtIU5KEb EO9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@randomderp.com header.s=default header.b=1OJol+8e; 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 kv5si4332971ejc.532.2021.07.22.19.02.23; Thu, 22 Jul 2021 19:02:23 -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=@randomderp.com header.s=default header.b=1OJol+8e; 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 6F9E668ACAE; Fri, 23 Jul 2021 05:02:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from degawa.com (unknown [174.127.109.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 821DD68A758 for ; Fri, 23 Jul 2021 05:02:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomderp.com; s=default; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vaYgWx/ZViFGloG+uXh2Y9od/5W6LiI8VFJH5SNV3VA=; b=1OJol+8eSNBTHkH4BGjlQpfpzY CvS8+JNZHx8JYsr/en8Mi5uhMDz3FdF8V5yHIy7+jPDhUaf2dQ5KZEa92KcDA3GzvzleLjNQixB63 B6wPZP6tOKiZkDwMbv8Lp9Ke6xr5vVuJaoSxOZItvDZ+eglh7ILGtGFG+WtkI6dJI59W/E+AN0RL3 wn2ryC0fE3tyazcle3yn9NRUQXFdT/xQf6A9yHnsDl6XGY1aJm1avInvvHd9+tEz6gtR3kFw7QI8l F7DCWg3x3yjUTvqDxgQr5lHlZy848RRW6kwdlE+Q42qzVyvZaSXnnFddBWAgmDZznopn9F4fIakmC pw4lzHdQ==; Received: from 108-216-168-194.lightspeed.mmphtn.sbcglobal.net ([108.216.168.194]:36588 helo=localhost.localdomain) by slmp-550-1.slc.westdc.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1m6kVx-0006aK-Gd; Thu, 22 Jul 2021 20:02:11 -0600 From: Christopher Degawa To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Jul 2021 21:02:10 -0500 Message-Id: <20210723020210.317634-1-ccom@randomderp.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - slmp-550-1.slc.westdc.net X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - randomderp.com X-Get-Message-Sender-Via: slmp-550-1.slc.westdc.net: authenticated_id: ccom/from_h X-Authenticated-Sender: slmp-550-1.slc.westdc.net: ccom@randomderp.com X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH] libsvtav1: pass color description info X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Christopher Degawa Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: So8kz6Y/itr9 these fields are only available past svt-av1 0.8.7 Signed-off-by: Christopher Degawa --- libavcodec/libsvtav1.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index fabc4e6428..6c12777911 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -37,6 +37,14 @@ #include "avcodec.h" #include "profiles.h" +#ifndef SVTAV1_MAKE_VERSION +#define SVTAV1_MAKE_VERSION(x,y,z) ((x) << 16 | (y) << 8 | z) +#endif + +#ifndef SVTAV1_CURR_VERSION +#define SVTAV1_CURR_VERSION SVTAV1_MAKE_VERSION(SVT_VERSION_MAJOR, SVT_VERSION_MINOR, SVT_VERSION_PATCHLEVEL) +#endif + typedef enum eos_status { EOS_NOT_REACHED = 0, EOS_SENT, @@ -218,6 +226,18 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->tile_columns = svt_enc->tile_columns; param->tile_rows = svt_enc->tile_rows; +#if SVTAV1_CURR_VERSION >= SVTAV1_MAKE_VERSION(0, 8, 7) + if (desc->flags & AV_PIX_FMT_FLAG_RGB) { + param->color_primaries = AVCOL_PRI_BT709; + param->matrix_coefficients = AVCOL_SPC_RGB; + param->transfer_characteristics = AVCOL_TRC_IEC61966_2_1; + } else { + param->color_primaries = avctx->color_primaries; + param->matrix_coefficients = avctx->colorspace; + param->transfer_characteristics = avctx->color_trc; + } +#endif + return 0; }