From patchwork Tue Oct 31 18:57:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 44457 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp511986pzb; Tue, 31 Oct 2023 11:14:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/GQsmLVcwtgSx83Zz+TNlMAVgfm3sLxJibu9RKirjKF5tf8k1hRjUyRyVXpZg1Z4cSo/5 X-Received: by 2002:a17:906:7956:b0:9c3:a3f2:4cec with SMTP id l22-20020a170906795600b009c3a3f24cecmr132148ejo.0.1698776091743; Tue, 31 Oct 2023 11:14:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698776091; cv=none; d=google.com; s=arc-20160816; b=BJIOYk5i+XJtyf5Vkb4F1Ln9nI5Y9kV7hJ/bm761xk1qwQiIc1rs2HD9/jiej+kBMD kkzv8QvshRg6lUubgf1Z/BlFZn1GP3xHUsDpQ3H2QSrhlyUB3dF2Owu+tg9ngtr63wGE 4i0+S54N1f56JWxMUNjdkkfDfUE3EXIYjE/E0aPmpV9/W4a7WZkpuR37A41ygdmspgf3 mr5/wXfN1Sd2Vmn9CvaNbdm+LG0Q99g0gw7c5OTixsKisaeyFY9omated6L6PAFnMq1C NHCmBdkim2rej8IR4ENXAeAjPSH1fTUnlulkYxpGUstl1ceEVTeH9lKMt0rUDsQvxFEe A0tA== 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=VCrj8uuRPFfM4sGWM2PjBYMrmVYJ2PVoevtL2yXB8HI=; fh=GFMLWjWsOMgBmoPKQLjFbTnXINkN4pkSjsZqwDcYLuI=; b=iPdg2p6NCS5XJ0z0I1nEHus36RE14llICCM1OT8SY0+5msl36aB0n7a67HoU+YvnWh YxJyiYqaq9FC3tRHdKQnBVMFZXvnsRVnLjIf/4R3oyQBK9kxEpmepRf884CRkQtLIf89 bJlisw3glLGMi8mxBmeYnxoKG2XkmST69cADgXwetk8uXHGnnA1524x6KZetrk5cZxsn 5tFmWkt3mn90VVB/1q+Cl1+TM2PYpM+Hn/h5OFg7pJVAYbmzaP1GLrrhaoNNMYPIzZ+Z +m5l99L/FrxUCt9Am13CrvB/ngaOxmXL8ZM9wPp9rnQU9abDwi2Rxfc5KsVNUTY4ZS57 eLPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=dRtw0Al7; 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 25-20020a170906101900b009a21f527924si712703ejm.561.2023.10.31.11.14.51; Tue, 31 Oct 2023 11:14:51 -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=20230601 header.b=dRtw0Al7; 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 F3E2268CD8C; Tue, 31 Oct 2023 20:14:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E7DB68CD27 for ; Tue, 31 Oct 2023 20:14:46 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-407da05f05aso44961565e9.3 for ; Tue, 31 Oct 2023 11:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698776086; x=1699380886; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U3ChQMg88tK/c8FFryxr+OB3y/Wvk5x6Ega8fV2XuD0=; b=dRtw0Al7kZfdSCvgQchZ7ISsg2UL64jJN/JBm3H2Vs8+vsjiDCYgBCPBYb7h2luQiy wwsokuonetERjaU2yBRdRC4/VZXFTQpCVqP3ob8PJqR0YP80/xi7QRo5LaqIu/MF/aoH K0zHdaMnlb+5eGwxdp8XSfrftApGaW8NBQxIlvIt+Ps/Kkex1OgkLvorwOvKjTc4PRJk ReiICkzt4IcwyIxQQN3i6aTFW/YtkFlseIYiCNxiWz/yQDF8qUKZLvGaCQKd8gXtKySJ 8piFUxXcvkmUM1aJEDWssQdRK7MMZd3Z0MDZ/sc9A4d0iPHAfOH5jNglLmepzwUUQu+v 0iOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698776086; x=1699380886; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U3ChQMg88tK/c8FFryxr+OB3y/Wvk5x6Ega8fV2XuD0=; b=AYTNIox4WZ+kPe5/T3XsPjpGe96OxqfQwycpfjrNswrbHtB1STBkRMZ0xjy9WKx88a IBYaXXDlyOt7pXkBrn5IbXHGFMzNulVnNd0m+D20eqpPZryREDn+eAFzaAPLAmlMgkxV 1CLicq8N3BdpEG6u4ATr1R3urX1RR+FH+rRo2Nx12xb8vV9P0pwa7K3gEFTAXguusZwN 87JVb8O76BuLeOT7z9+9PSalerHbXUoQjMG7JJ9T8BVUK/RyrS+nzBLJOlD6E1rBKPm8 huiyzREN47Vsp3JZ0U2MzAM+l2TyKUeybGXFuKJ5aDU/17/8rsZrBG4tgvMmcu2doj80 OsEA== X-Gm-Message-State: AOJu0YwjjlGaXC7ntfBNGHD+gTcMrxilWBcEZwVESubfi25OHs0mPYhE Pp3J6WLhV9ke9f8vrGgoK8az6Vi912ogg9jt X-Received: by 2002:a05:600c:46cd:b0:405:4776:735a with SMTP id q13-20020a05600c46cd00b004054776735amr11691682wmo.2.1698776085977; Tue, 31 Oct 2023 11:14:45 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (178-223-50-56.dynamic.isp.telekom.rs. [178.223.50.56]) by smtp.gmail.com with ESMTPSA id z18-20020a05600c079200b0040772934b12sm2364192wmo.7.2023.10.31.11.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 11:14:45 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Oct 2023 19:57:48 +0100 Message-ID: <20231031185817.6779-5-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231031185817.6779-2-lucenticus@gmail.com> References: <20231031185817.6779-2-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10bit support v5 3/3] avcodec/amfenc: add 10 bit encoding in av1_amf 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: Evgeny Pavlov , Dmitrii Ovchinnikov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hdoyta8UpeHI v2: refactored after review Signed-off-by: Evgeny Pavlov Co-authored-by: Dmitrii Ovchinnikov --- libavcodec/amfenc.c | 2 ++ libavcodec/amfenc_av1.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 068bb53002..f1b76bd6aa 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -826,6 +826,8 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) 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; + case AV_CODEC_ID_AV1: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_INPUT_HDR_METADATA, hdrmeta_buffer); break; } hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); } diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 8f13aea29e..634eeea48f 100644 --- a/libavcodec/amfenc_av1.c +++ b/libavcodec/amfenc_av1.c @@ -165,6 +165,9 @@ static av_cold int amf_encode_init_av1(AVCodecContext* avctx) AMFGuid guid; AMFRate framerate; AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); + amf_int64 color_depth; + amf_int64 color_profile; + enum AVPixelFormat pix_fmt; @@ -203,6 +206,25 @@ FF_ENABLE_DEPRECATION_WARNINGS } AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PROFILE, profile); + /// Color profile + color_profile = ff_amf_get_color_profile(avctx); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE, color_profile); + + /// Color 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; + } + + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_COLOR_BIT_DEPTH, color_depth); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE, color_profile); + /// Color Transfer Characteristics (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, (amf_int64)avctx->color_trc); + /// Color Primaries (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, (amf_int64)avctx->color_primaries); + profile_level = avctx->level; if (profile_level == AV_LEVEL_UNKNOWN) { profile_level = ctx->level;