From patchwork Wed Jul 6 04:23:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 36687 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3927794pzh; Tue, 5 Jul 2022 21:23:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sRukCL9CUWIWRQPhLsJlGFi/DeUr5rj44b2WSgHL676irnip6iVGwSpkEbhImBB0kHj7lV X-Received: by 2002:a17:906:c14f:b0:726:a609:a369 with SMTP id dp15-20020a170906c14f00b00726a609a369mr37618349ejc.326.1657081419676; Tue, 05 Jul 2022 21:23:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657081419; cv=none; d=google.com; s=arc-20160816; b=sucqpIkkk9XLx9EEgsZ7zwmK8w0i2orlU9njSgX0YBNNTgL0RYvkJu6XOkyU0/AFmW V40DduMMcZo7xPiXgyu2vrF0mDxZ9ilO0b/+lAbUYcUCLzjDO1HMCVxm+pX5iGOKi+qm ynDwwP9KXbCGH1oUjqNGvxqvcbmGiHb/YIkZg7nT/+ZoDbZ+igLdFQctYD1fmlG/6NBJ DX2cdmGuVH8FrHtzsmcJOYXgV2Fx7gjYU+Oo6b3qoqgJjOrBqu5g93ESihtICnGn+OpV jWNNxP9R9GG4B2/gokYA8q0Lz+sylPPDhPSrRkEc5jTr9yxZAFbW74iVOqDjxRBtu9ge QK9A== 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=5CgtqHuzcp6D8ngiFdFEQVbWidNeWQQ96srCqZtXW7s=; b=0fKW3HxUEElQOnijPqvja2hU4oW6idOuzTP+8JOrffLrORhFeNb1NTVAvEEGhvvrwk I78p1kO8umTuuPfDGuCT2rlFLjYm9qtvgILw4D4lok3EniMZaT6Ho19yQZqWijjrYiJX 1wukm04lZ0CBcF0Cv4dZpOarqhpP7cL4N8Th0dLJYZyXN22uWH4iggf99irqNdI7QEnb u7zM+quf4d6eLNoSDTxOa9zysSzFgZ+fxagFOvtGjbXmhc5Qfa/8++X8s7HgBr+dScnh nZd6V0rx0kc1PDL3jRpF4HZdVvMItqsJJ1WAc+mrCSQPVeaRafM/Kz7EcEq6/+c9txJk YCdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TDpLawvR; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hd34-20020a17090796a200b0072af8809a85si1201530ejc.332.2022.07.05.21.23.39; Tue, 05 Jul 2022 21:23:39 -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=@gmail.com header.s=20210112 header.b=TDpLawvR; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E293468B9E7; Wed, 6 Jul 2022 07:23:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B47268B960 for ; Wed, 6 Jul 2022 07:23:29 +0300 (EEST) Received: by mail-ed1-f46.google.com with SMTP id k30so9585485edk.8 for ; Tue, 05 Jul 2022 21:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YkpD3sBoq+QeGMsL3r1iUVtEgaYvBb1UMi9d/C2DzUs=; b=TDpLawvRbHXs3zjWy/Ge8oIGHzyQUDpXyfDK2yx0kE2JSulPyy7om9KaNqzwz2QBdM 2ary3Vk0c0Xt+R4ZNXW8YXwxAhDvNkfg5nCVu87rBISMtZ0xZfPFMOKQwwCqX8WgSSiB ig3TcXQZm5I7lDBdZBfo4mejeenRFyDYvFmx0wpGoaKHMxF6aYUOi1KQykxxRCOGGE3q NfTPZqM3oVn27GqfmPBiaRuML4cj7LFnLoPUFm1pECYO8um58dbh5agY2ZvYeYqq7/gc mlTUgdu/YMrxqqajLXe6dr0fWW4zRiy9Gqxav9kEJLsbkbzJu6Svt76/2js7c84ueJeJ 26kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YkpD3sBoq+QeGMsL3r1iUVtEgaYvBb1UMi9d/C2DzUs=; b=p66CXmWwFN/LWQmK3xWQm2wkxSGf6pa0EgJXYYqzPx1lxN5A0zNF6m+NfozTrcOCdY H7agRW6AOcjtW/NRJ2+sX6RIPTbjglvBSHiPNvtVnqljufsmCgDbeVRNZCd7mDOYMaCY KaUf9rdVo+w0WBFQNGUXpIBnhcQhwF4JF9ekeGFHaaVgIm+6NLDMrkvXMdUqac//gIT9 kAkmvDUIBrOn/5+gTTtpNygVhruRb90Xc/ZjkAB7YZ+E5wEjxZU+wmCjh2PKOenPuD0M 4guF8VX0iGrfv51bGEmxx9x6aMyH7AU20m36vqi1buePSpUIIaNGj11StFBUhjr7x8m1 rVxg== X-Gm-Message-State: AJIora+U7hmwEL+trTVr4cKQ1SODavYIR/8vh+gUeW7tt0cAGDKknXRJ +5EG4o2+gUdL3hI+p5XQpTjLVbFCRRA= X-Received: by 2002:a05:6402:3481:b0:435:b12d:a66d with SMTP id v1-20020a056402348100b00435b12da66dmr51821583edc.135.1657081408821; Tue, 05 Jul 2022 21:23:28 -0700 (PDT) Received: from localhost.localdomain (178-223-19-154.dynamic.isp.telekom.rs. [178.223.19.154]) by smtp.gmail.com with ESMTPSA id y14-20020a170906448e00b0072737733f9asm10145594ejo.106.2022.07.05.21.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 21:23:28 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jul 2022 06:23:12 +0200 Message-Id: <20220706042314.1099-1-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [avcodec/amfenc: 10 bit support 1/3] Update the min version to 1.4.23.0 for AMF SDK. 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: OvchinnikovDmitrii Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bzJpoxR7+jFd --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index fea512e8ef..29d60efad6 100755 --- a/configure +++ b/configure @@ -6988,7 +6988,7 @@ fi enabled amf && check_cpp_condition amf "AMF/core/Version.h" \ - "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400090000" + "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400170000" # Funny iconv installations are not unusual, so check it after all flags have been set if enabled libc_iconv; then From patchwork Wed Jul 6 04:23:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 36688 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3927823pzh; Tue, 5 Jul 2022 21:23:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tJ72vtNfbqg5bHeaxF6DHXlGZrGNhYEew8JCrmdaHOr6U71iGhGfAlfwYvuoYVj2VFicXC X-Received: by 2002:a17:906:118:b0:715:771b:251b with SMTP id 24-20020a170906011800b00715771b251bmr36755580eje.651.1657081427775; Tue, 05 Jul 2022 21:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657081427; cv=none; d=google.com; s=arc-20160816; b=Sc80g4X8p4yjvHEqdO2bd/X7x+1Itw7DzAOw3lVaFFzcXJByyz489Hpxn7h7+z8hLc bN8bX6Ln0P0IFlwWmWZ4uEPkqeXQGIlRxefh7Dtm2LLbqm2icII31j0u43TO9vKdYJV9 Znihom03Ax4V62PDUtyrBSgBBL+wQGms1CrUov+HLTorcU41BcjYzKZPBakWawDqzWWQ OUTK26HA+yrH8KcUVfhh01CpnI0Y0jzSRC+ls3t07BWM+v+d+sn/UwM7eGJ2nB6DHy98 p2fQtc1w+KVC4az8/klgpnbiC/xUc5v4BoS9o+XQPsaxDIzC9V6CUdy2PBN1DDkVJWEU yjow== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=5Gg8TkKrSDU7SZ5YUZtRED0t4UDVsmUVu2TsB8+FqSE=; b=ikKd+mkGTh0trSgdGtaXQR5p2shbl457AkTBQDCIaVe/XS1LfDAzqOEunkFFo8RawH a1dMPp9ypHpDkRa2iVEa/BbCM3jZIJKndgc7LaslbHtZkmNiCkhbOLtCD/LUgnDIV0sU LjmiXunMm1C+JfoEVfZ1gtfV7xd0FwNiqaIjWEeY7Sev0Gc6xZv8fcwyAx6INcLMQ/cg fPKIXdEFilA7pyeJwMB2ATDFTEfD3HMseocrgzKz8/+hdXkXbcG/yiY5h4OEkzaOfHT0 i5JBYH7OQk4CM/Lm8inQIiaFSmYRys4Lb7hOCw7KuLH+trWvcRxN0/sx1qO883UgXTf9 J9Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EVxHN9sp; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh33-20020a1709076ea100b00726b8c954b6si19954666ejc.846.2022.07.05.21.23.47; Tue, 05 Jul 2022 21:23:47 -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=@gmail.com header.s=20210112 header.b=EVxHN9sp; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E15F368BA42; Wed, 6 Jul 2022 07:23:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A147E68B9E7 for ; Wed, 6 Jul 2022 07:23:30 +0300 (EEST) Received: by mail-ej1-f47.google.com with SMTP id lg18so5146851ejb.0 for ; Tue, 05 Jul 2022 21:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hXXtywfQ2SkZDY7x3aXd9IzUrYqzL+QlGQHOQZYmfi4=; b=EVxHN9sptttphGAssdUguvW2IsXleQBUwDJUNC2HQ4wckOIKeIMvaDr2x4myGEElTT YQEiOF+MGjTyY9EENceGxYidxPBrXZGd5BvwGFiAzcxpdbHHUsHHtOj6MrsIdBHHGEsa Y5N3DNioh3YVPMrKo9il74/7djiZBav2I8o3cMf06Pj3ZCwUXGd/WDwCX0GM4O/VJuO3 SN9PXBvu9T2hLg0rizPr3Ft0Z5GPcom4hJeuLZ+j1W9Dx/CAzP506qfW039Be31I9iNl ReA/Vedjb15IJdhBtPlIAImkPZMTRjQJxs4pDpUEEMWamVx7Im6qfzizNzMAFJi2udSR vkqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hXXtywfQ2SkZDY7x3aXd9IzUrYqzL+QlGQHOQZYmfi4=; b=tch8EI/5vzGU5lmpBit2m4IJjZz0xVD35iAwPFZ+ByTE5xiQ9rFTQcA+ekkN8R4+WK 09/c+eVP+P3xVpg54a+nWIOjMuSntA4WoQKjHz/IeOGW6IIAVqyG6zhFutZqTu/U9oUf /q0Scw8u8KwLMlynxdeUfNNk7d2A5UfN7mNU6P2qWA7se6w7Tt/DOimCimf7ZBZ7JriA KRQx683P2d9n4tGdnbZFYoFBfbVTIrWcVC+zyq1GPx3q818DAGtePDbOsQwR2ao38WE+ NVDqoIo0etkkYAyfG62fcr9Mpe8xd6AbHIgamErGorPYIfGmyUbok2UXLCTLwHZZMF12 cKVg== X-Gm-Message-State: AJIora8smR9dFo6XzPORbL1SyZ/9BO7y65Zb1oR+bjoX73z8wPgWQv63 YrGEcoiEmp058pEq8IKpYlsWiQZTf4A= X-Received: by 2002:a17:907:75ca:b0:726:313b:8b0d with SMTP id jl10-20020a17090775ca00b00726313b8b0dmr35944811ejc.214.1657081409584; Tue, 05 Jul 2022 21:23:29 -0700 (PDT) Received: from localhost.localdomain (178-223-19-154.dynamic.isp.telekom.rs. [178.223.19.154]) by smtp.gmail.com with ESMTPSA id y14-20020a170906448e00b0072737733f9asm10145594ejo.106.2022.07.05.21.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 21:23:29 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jul 2022 06:23:13 +0200 Message-Id: <20220706042314.1099-2-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20220706042314.1099-1-ovchinnikov.dmitrii@gmail.com> References: <20220706042314.1099-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [avcodec/amfenc: 10 bit support 2/3] avcodec/amfenc: Fixes the color information in the output. 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: Michael Fabian 'Xaymar' Dirks Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AY1Cb5zqawK9 From: Michael Fabian 'Xaymar' Dirks added 10 bit support for amf hevc. before: command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file.mkv -an -c:v h264_amf res.dx11_hw_h264.mkv output - Format of input frames context (p010le) is not supported by AMF. command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file -an -c:v hevc_amf res.dx11_hw_hevc.mkv output - Format of input frames context (p010le) is not supported by AMF. after: command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file -an -c:v h264_amf res.dx11_hw_h264.mkv output - 8bit file command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file -an -c:v hevc_amf res.dx11_hw_hevc.mkv output - 10bit file --- libavcodec/amfenc.c | 1 + libavcodec/amfenc.h | 1 + libavcodec/amfenc_h264.c | 46 +++++++++++++++++++++++++++++++- libavcodec/amfenc_hevc.c | 57 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 102 insertions(+), 3 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index a033e1220e..5c38a29df1 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -72,6 +72,7 @@ static const FormatMap format_map[] = { { AV_PIX_FMT_NONE, AMF_SURFACE_UNKNOWN }, { AV_PIX_FMT_NV12, AMF_SURFACE_NV12 }, + { AV_PIX_FMT_P010, AMF_SURFACE_P010 }, { AV_PIX_FMT_BGR0, AMF_SURFACE_BGRA }, { AV_PIX_FMT_RGB0, AMF_SURFACE_RGBA }, { AV_PIX_FMT_GRAY8, AMF_SURFACE_GRAY8 }, diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index 1ab98d2f78..c5ee9d7e35 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -21,6 +21,7 @@ #include +#include #include #include diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index efb04589f6..098619f8e1 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -138,6 +138,9 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx) AMFRate framerate; AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); int deblocking_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0; + amf_int64 color_depth; + amf_int64 color_profile; + enum AVPixelFormat pix_fmt; if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); @@ -195,10 +198,51 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx) AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_ASPECT_RATIO, ratio); } - /// Color Range (Partial/TV/MPEG or Full/PC/JPEG) + // Color Metadata + /// Color Range (Support for older Drivers) if (avctx->color_range == AVCOL_RANGE_JPEG) { AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, 1); + } else { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, 0); + } + /// Color Space & Depth + pix_fmt = avctx->hw_frames_ctx ? ((AVHWFramesContext*)avctx->hw_frames_ctx->data)->sw_format + : avctx->pix_fmt; + color_depth = AMF_COLOR_BIT_DEPTH_8; + if (pix_fmt == AV_PIX_FMT_P010) { + color_depth = AMF_COLOR_BIT_DEPTH_10; + } + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; + switch (avctx->colorspace) { + case AVCOL_SPC_SMPTE170M: + if (avctx->color_range == AVCOL_RANGE_JPEG) { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_601; + } else { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_601; + } + break; + case AVCOL_SPC_BT709: + if (avctx->color_range == AVCOL_RANGE_JPEG) { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_709; + } else { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_709; + } + break; + case AVCOL_SPC_BT2020_NCL: + case AVCOL_SPC_BT2020_CL: + if (avctx->color_range == AVCOL_RANGE_JPEG) { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_2020; + } else { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020; + } + break; } + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_COLOR_BIT_DEPTH, color_depth); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PROFILE, color_profile); + /// Color Transfer Characteristics (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_TRANSFER_CHARACTERISTIC, (amf_int64)avctx->color_trc); + /// Color Primaries (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PRIMARIES, (amf_int64)avctx->color_primaries); // autodetect rate control method if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN) { diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 8ab9330730..6c6db6a99a 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -31,9 +31,10 @@ static const AVOption options[] = { { "lowlatency", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY }, 0, 0, VE, "usage" }, { "webcam", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_WEBCAM }, 0, 0, VE, "usage" }, - { "profile", "Set the profile (default main)", OFFSET(profile), AV_OPT_TYPE_INT,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN }, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN, VE, "profile" }, + { "profile", "Set the profile (default main)", OFFSET(profile), AV_OPT_TYPE_INT,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN }, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10, VE, "profile" }, { "main", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN }, 0, 0, VE, "profile" }, - + { "main10", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10 }, 0, 0, VE, "profile" }, + { "profile_tier", "Set the profile tier (default main)", OFFSET(tier), AV_OPT_TYPE_INT,{ .i64 = AMF_VIDEO_ENCODER_HEVC_TIER_MAIN }, AMF_VIDEO_ENCODER_HEVC_TIER_MAIN, AMF_VIDEO_ENCODER_HEVC_TIER_HIGH, VE, "tier" }, { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_TIER_MAIN }, 0, 0, VE, "tier" }, { "high", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_TIER_HIGH }, 0, 0, VE, "tier" }, @@ -105,6 +106,9 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) AMFRate framerate; AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); int deblocking_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0; + amf_int64 color_depth; + amf_int64 color_profile; + enum AVPixelFormat pix_fmt; if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); @@ -122,10 +126,14 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_FRAMERATE, framerate); + color_depth = AMF_COLOR_BIT_DEPTH_8; switch (avctx->profile) { case FF_PROFILE_HEVC_MAIN: profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN; break; + case FF_PROFILE_HEVC_MAIN_10: + profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10; + break; default: break; } @@ -154,6 +162,51 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ratio); } + // Color Metadata + /// Color Range (Support for older Drivers) + if (avctx->color_range == AVCOL_RANGE_JPEG) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE, 1); + } else { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE, 0); + } + /// Color Space & Depth + pix_fmt = avctx->hw_frames_ctx ? ((AVHWFramesContext*)avctx->hw_frames_ctx->data)->sw_format + : avctx->pix_fmt; + if (pix_fmt == AV_PIX_FMT_P010) { + color_depth = AMF_COLOR_BIT_DEPTH_10; + } + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; + switch (avctx->colorspace) { + case AVCOL_SPC_SMPTE170M: + if (avctx->color_range == AVCOL_RANGE_JPEG) { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_601; + } else { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_601; + } + break; + case AVCOL_SPC_BT709: + if (avctx->color_range == AVCOL_RANGE_JPEG) { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_709; + } else { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_709; + } + break; + case AVCOL_SPC_BT2020_NCL: + case AVCOL_SPC_BT2020_CL: + if (avctx->color_range == AVCOL_RANGE_JPEG) { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_2020; + } else { + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020; + } + break; + } + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_COLOR_BIT_DEPTH, color_depth); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PROFILE, color_profile); + /// Color Transfer Characteristics (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, (amf_int64)avctx->color_trc); + /// Color Primaries (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, (amf_int64)avctx->color_primaries); + // Picture control properties AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, ctx->gops_per_idr); AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, avctx->gop_size); From patchwork Wed Jul 6 04:23:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 36689 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3927864pzh; Tue, 5 Jul 2022 21:23:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v8znnNlhqz+6riiPufdSZPQF9aWbeR3/UFVAOaOLPGoO+FBXgLAXZkMNNpFrzunMS7Yn7X X-Received: by 2002:a17:907:75ee:b0:72a:a01c:b33e with SMTP id jz14-20020a17090775ee00b0072aa01cb33emr21682651ejc.357.1657081436118; Tue, 05 Jul 2022 21:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657081436; cv=none; d=google.com; s=arc-20160816; b=G7+0Oq08x3hM4uz59VThS0gIp9O4OIGvlP9nUekTft1cbk1EZca23bjvSSq8mNQm5V d9lvRD93ym8W9L13ZzhwN6KNCNOb+INm+8S668E8SzT5ZH2sA21JLDUcrRoFwuBGRk9l PcYdpZfIWEVw8ntQQM80f2AjIN+W1hyLWAhlxwGRYxATd6xkL6yh/gRqPCzWZ2EQGzYc 5uW0vmxhY1lzhhd38BO11c+WIzIcS4HZHb6wvYkdKqRAgLyZfnHj0oY6SUNJH/HYBV3k 27WBZ8lwp/RiXMayiUe+X6OYpApH2RW8Iq1TZddZ552DT+fJdachmHq0TYCgqkUnXIyt GyUQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=GF3FlqxofcHek7a2hyjqEVEZ38CxWyR2tEuCAc6NBuU=; b=nClUQLIjq1XVFs++p+6fW3hEvOXySBuymFdr+dlR/0dMkiqLMtEZSHpu7ess+GkMST Yl00Wmp7SOiRBniC+6Z3OUXCj8th1JZF6jBDNvIGwCJoeVeLzyc51QG7J8iQUtN+ZijU VHuGj0PW8RF4CnkJwV195Z1t4KwJToG7KaEc+J/iuipIjOWWfU5lczP8312HYuacFz2i Zp7UilGJy8t4gltoIYtbDW+cNnmJkU0S0tMSzgTO1jtE8xLGDNwwHS2A6xb65oitkB9l z8yNUcFaS+kWnrYqRRvGifuRYtJF6eRWLaOdN5L/vLwUUtpIdi+HWXdxMnhvOpQSIcZy qIfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=byYNSr1s; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s12-20020a1709064d8c00b00726dbafec2asi11950728eju.446.2022.07.05.21.23.55; Tue, 05 Jul 2022 21:23:56 -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=@gmail.com header.s=20210112 header.b=byYNSr1s; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D66BF68BA46; Wed, 6 Jul 2022 07:23:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1799868B7DD for ; Wed, 6 Jul 2022 07:23:31 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id ay16so24954699ejb.6 for ; Tue, 05 Jul 2022 21:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dubx/SDsXuiFlM8V2+Ax0R4hFA5ORvEoM3eYLtRu5yc=; b=byYNSr1s666upeSa1QUUkScCydgDhE1hXLQg6pA4D1T8Vc7zYzV2lSikylJzAeauBD HWdtJNMY9rRk+WJUhJoBvJIK4n/m2oh1n/Otx8h/wT8iBcQCzAooxwt56wARp4ETBvyJ DyGsdvJMewueyckHNfAyobpHgt/jSdNfmXWIqNZlvEEJsKU9HhpeKyMb8WY1twyUnvuM vtojWrs1MRtkHbVEocxNnOtV6Uyl7FflTvNPg230Ea+QO13vExKpeY+EDnQmYAiKC5Eu jpqyYzJohhWkhbgNFNtQl49GZToec9KQy8DJ8sLPwod6RxipbVSQCDmw77Vn4W2EuDdK 8/kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dubx/SDsXuiFlM8V2+Ax0R4hFA5ORvEoM3eYLtRu5yc=; b=kyRjf1Sf451NHcLmiJduCOQ/DggwKhlky4q7yhoj23MOd0jkFBOiUm8v6dqj4eVyks mB80tykv25pBL7hbbbdoZGUpuVSuOhsnqwpLwnn6Z9e2V2ZiygDN40pZUSmOs41a2HI3 bteP40pK1bpxaBBETLU83ThH1ih6hofiY6EhUfOFFSyKIY689zpqrkWoZHw8oxujeq+q UeXY4uzadRdi6otOmxfYWvrs4ZunFWo3ryZphV+kKDXpci+UIZUeVaigYUJzpno64ntc fS1FDCnUsrkzhD/VbIdFVsH9Y2tdxOHAhxY/TZMs+auEC2xq34Bs0bu15ddF5n2Tor8f cJrw== X-Gm-Message-State: AJIora94yubcvc7e1Ne3rRqMOkADi0s/TeQWNMA7VZpYNS0a8JV2VDGk T1SiOFdI7iS1W5HWZ0dqnlID6cI2j3w= X-Received: by 2002:a17:907:2cd7:b0:72a:f3e1:246f with SMTP id hg23-20020a1709072cd700b0072af3e1246fmr2294002ejc.538.1657081410225; Tue, 05 Jul 2022 21:23:30 -0700 (PDT) Received: from localhost.localdomain (178-223-19-154.dynamic.isp.telekom.rs. [178.223.19.154]) by smtp.gmail.com with ESMTPSA id y14-20020a170906448e00b0072737733f9asm10145594ejo.106.2022.07.05.21.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 21:23:29 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jul 2022 06:23:14 +0200 Message-Id: <20220706042314.1099-3-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20220706042314.1099-1-ovchinnikov.dmitrii@gmail.com> References: <20220706042314.1099-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [avcodec/amfenc: 10 bit support 3/3] avcodec/amfenc: HDR metadata. 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: nyanmisaka Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iW/wN7ziJWan From: nyanmisaka --- libavcodec/amfenc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 5c38a29df1..d3edbb04b6 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -36,6 +36,57 @@ #include "amfenc.h" #include "encode.h" #include "internal.h" +#include "libavutil/mastering_display_metadata.h" + +static int amf_save_hdr_metadata(AVCodecContext *avctx, const AVFrame *frame, AMFHDRMetadata *hdrmeta) +{ + AVFrameSideData *sd_display; + AVFrameSideData *sd_light; + AVMasteringDisplayMetadata *display_meta; + AVContentLightMetadata *light_meta; + + sd_display = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + if (sd_display) { + display_meta = (AVMasteringDisplayMetadata *)sd_display->data; + if (display_meta->has_luminance) { + const unsigned int luma_den = 10000; + hdrmeta->maxMasteringLuminance = + (amf_uint32)(luma_den * av_q2d(display_meta->max_luminance)); + hdrmeta->minMasteringLuminance = + FFMIN((amf_uint32)(luma_den * av_q2d(display_meta->min_luminance)), hdrmeta->maxMasteringLuminance); + } + if (display_meta->has_primaries) { + const unsigned int chroma_den = 50000; + hdrmeta->redPrimary[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[0][0])), chroma_den); + hdrmeta->redPrimary[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[0][1])), chroma_den); + hdrmeta->greenPrimary[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[1][0])), chroma_den); + hdrmeta->greenPrimary[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[1][1])), chroma_den); + hdrmeta->bluePrimary[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[2][0])), chroma_den); + hdrmeta->bluePrimary[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[2][1])), chroma_den); + hdrmeta->whitePoint[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->white_point[0])), chroma_den); + hdrmeta->whitePoint[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->white_point[1])), chroma_den); + } + + sd_light = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + if (sd_light) { + light_meta = (AVContentLightMetadata *)sd_light->data; + if (light_meta) { + hdrmeta->maxContentLightLevel = (amf_uint16)light_meta->MaxCLL; + hdrmeta->maxFrameAverageLightLevel = (amf_uint16)light_meta->MaxFALL; + } + } + return 0; + } + return 1; +} #if CONFIG_D3D11VA #include @@ -672,6 +723,26 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) frame_ref_storage_buffer->pVtbl->Release(frame_ref_storage_buffer); } + // HDR10 metadata + if (frame->color_trc == AVCOL_TRC_SMPTE2084) { + AMFBuffer * hdrmeta_buffer = NULL; + res = ctx->context->pVtbl->AllocBuffer(ctx->context, AMF_MEMORY_HOST, sizeof(AMFHDRMetadata), &hdrmeta_buffer); + if (res == AMF_OK) { + AMFHDRMetadata * hdrmeta = (AMFHDRMetadata*)hdrmeta_buffer->pVtbl->GetNative(hdrmeta_buffer); + if (amf_save_hdr_metadata(avctx, frame, hdrmeta) == 0) { + switch (avctx->codec->id) { + case AV_CODEC_ID_H264: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_INPUT_HDR_METADATA, hdrmeta_buffer); break; + case AV_CODEC_ID_HEVC: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_INPUT_HDR_METADATA, hdrmeta_buffer); break; + } + res = amf_set_property_buffer(surface, L"av_frame_hdrmeta", hdrmeta_buffer); + AMF_RETURN_IF_FALSE(avctx, res == AMF_OK, AVERROR_UNKNOWN, "SetProperty failed for \"av_frame_hdrmeta\" with error %d\n", res); + } + hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); + } + } + surface->pVtbl->SetPts(surface, frame->pts); AMF_ASSIGN_PROPERTY_INT64(res, surface, PTS_PROP, frame->pts); @@ -730,6 +801,18 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) AMF_RETURN_IF_FALSE(ctx, ret >= 0, ret, "amf_copy_buffer() failed with error %d\n", ret); if (ctx->delayed_surface != NULL) { // try to resubmit frame + if (ctx->delayed_surface->pVtbl->HasProperty(ctx->delayed_surface, L"av_frame_hdrmeta")) { + AMFBuffer * hdrmeta_buffer = NULL; + res = amf_get_property_buffer((AMFData *)ctx->delayed_surface, L"av_frame_hdrmeta", &hdrmeta_buffer); + AMF_RETURN_IF_FALSE(avctx, res == AMF_OK, AVERROR_UNKNOWN, "GetProperty failed for \"av_frame_hdrmeta\" with error %d\n", res); + switch (avctx->codec->id) { + case AV_CODEC_ID_H264: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_INPUT_HDR_METADATA, hdrmeta_buffer); break; + case AV_CODEC_ID_HEVC: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_INPUT_HDR_METADATA, hdrmeta_buffer); break; + } + hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); + } res = ctx->encoder->pVtbl->SubmitInput(ctx->encoder, (AMFData*)ctx->delayed_surface); if (res != AMF_INPUT_FULL) { int64_t pts = ctx->delayed_surface->pVtbl->GetPts(ctx->delayed_surface);