From patchwork Mon Oct 23 13:46:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 44332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp1422712pzb; Mon, 23 Oct 2023 06:54:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzm1xYleUbNcV1+NVmPaitahieSOLf1Luhmc/Fkbl0g8BSb6oaZwmzOtSucBAYkxn+iatx X-Received: by 2002:ac2:522c:0:b0:503:3278:3225 with SMTP id i12-20020ac2522c000000b0050332783225mr5695999lfl.63.1698069289112; Mon, 23 Oct 2023 06:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698069289; cv=none; d=google.com; s=arc-20160816; b=blO7wFk3r/Mr4gTk8jM8Kc7LNdmTwNm2EOxoW6//iaNfq+dXAnBxqHqA9r0JVqrAhD gEXSo1hjAvH9nFVBw4LH3hGymHUegD0Xq4yChKE1DynIERvOvEPtedwiWg1pSETyef6d KWTQPphEooCgEfzuRmWTWZdn2UEu69pFdZGkCkLnG4e1SE92/GZc2ms3Qw+raQEQ0Gyy eCZ2NK9/wU8cyH2TEJ7+oruhtf70c3IMlFzjRr+T1+YbyOaN6Rg7CvNGsIW7PqGt/VET O3UsvbkSy8/hFrnvhECp6iT8uDl9eRPi3iLFGGXBwC7B0xnZU0nHI6oRZowkR+S5P8Ao sQLQ== 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=kFaFYgzn3Ty88E+WleG/YrZwu1iVy/caPFRDBfMVescrl6/on+Qb7GZyZ0l3go0BH5 ecrOh+C3yVYjBlET9Ua6FByj8iofPHS0Gd8rsctPgWiOKbSVT82Wa9tCxepMIt4E8yVf qjuRm978oF6/qS9AstkD5k+jYby6jMCmBbleW0KfkQljHV2sby61GDmJY1fvLzRtKtAp En6vGv7LO1C98aiPmuxDaR1LFWLAHYu+sIiCpsRFSxZo5JRYBo1YJZwmE1D2RtTSduCw dhfqW4LNU6sRP5UuM3t+AXtPho8dSiCR086PSesUlR6mxIcm/Kc9di87wIwxfkzuueLI 09fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="Ou7F/lyZ"; 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 nb17-20020a1709071c9100b009ad8a9e0354si3566560ejc.390.2023.10.23.06.54.48; Mon, 23 Oct 2023 06:54:49 -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="Ou7F/lyZ"; 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 9D98268CA58; Mon, 23 Oct 2023 16:54:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 503A368CA0A for ; Mon, 23 Oct 2023 16:54:40 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40859c464daso16663185e9.1 for ; Mon, 23 Oct 2023 06:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698069279; x=1698674079; 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=Ou7F/lyZLn2VxGWjz7BRL79MlnXEWhVCpP5TjjNtU2fRqkzMFvbK2qUSIdYQe+rx5B TSN2YtBxaWyId3ZYHgDS0jWkluAIkzYFXY6WkIjAAQKq7h5mZqADUjnZfsfF/AmSh/eq 1WOlHmGtV1EIsAqwl2tYLh19VxZK5XKkcs6kPxUJskAizUJpvJX242qQZYPkGWXOmUSb cbarnhtYGL6OHVfjuk0eRShUGz62wD4LSMony4hPgZ2thB4IBZSkwhgOKZxlueAOWmCv hv92dbEwW5qqgf4JhBZ0UjzntlifFIrNDhg+ztq301ksr/aM0aJOWI/+yY3q/wO70er1 BH6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698069279; x=1698674079; 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=grVn3p4ouc2f3YhXt9iA5jXUqmFO27B7+92KZNEcOBFM1bNpYShnG+RSNEUnp3Tjfu hCttBtG6ym3Cv3R7LhiiH+8XnUNF9m3buV2321n9ItbOoEXNYj5FWj+2x/64MQHtFQxw r+P49YUlZ8kLPGY2G+z5ttmwoIWKBrF65UVKYDFNTZlXH/dDLUJWBhhm47oMCYyZnExp 6snKaLV6AMhgTwakvA61Q+/pOHT0fxdN2IUfooKS1pbtxeXlGMgvjS8avHtcHBPfTGeD eQgTSKn5DQl/ysFMmJyuvInUdA5MIJRDEldCgp97PglEvjI6UHWvxWapjB4LVyLqT0gE VhGQ== X-Gm-Message-State: AOJu0Yw0oRuj2HMAwKP2MYEfaPIjozNhYvtypWnLiUE6iD5tIKi4onIu 9C9ffEbWutKeunvpEgBTMx5JTvbKNJwVimgn X-Received: by 2002:a05:600c:5489:b0:402:bcac:5773 with SMTP id iv9-20020a05600c548900b00402bcac5773mr7550110wmb.38.1698069279225; Mon, 23 Oct 2023 06:54:39 -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 v3-20020adff683000000b0032d9523de65sm7746997wrp.48.2023.10.23.06.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 06:54:38 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2023 15:46:02 +0200 Message-ID: <20231023134753.17106-7-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009095340.41807-1-lucenticus@gmail.com> References: <20231009095340.41807-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH avcodec/amfenc: 10-bit 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: 2pa4ZRm/Bwph 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;