From patchwork Thu Aug 1 11:13:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Araz X-Patchwork-Id: 50853 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp1085948vqs; Thu, 1 Aug 2024 04:51:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdceic8FJ9NVzySuc34e8AZf65ISScNX1kBghjxAu0etBhy3db7j6YcqdwLthoWOOOndKuxxBJy0xsZdlfpMOq/vFEzzAC+2A/KA== X-Google-Smtp-Source: AGHT+IFj5r4YzkAFzITdeWpmU5Oh1K2SAD5cjN4UgOnKGlaG1LZBkGiUoQh29ECFMY/Btxvp+Mij X-Received: by 2002:a17:907:8e07:b0:a7a:8586:d36b with SMTP id a640c23a62f3a-a7daf4feeacmr162422666b.3.1722513119393; Thu, 01 Aug 2024 04:51:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722513119; cv=none; d=google.com; s=arc-20160816; b=JIQ2b1Pn2pgyFqchdqiSx3/JTlaJhqz2Au7XKDs4R/j1T5pHJjSnLIvya71ZM+T8GQ JT32MpbBr3jmeitc6hGytisknJyLVZ/HerTeRH7tPxBwFFt8j7KLLZYV6BSYOpHJFL+x q/dcAGDLx9TptP+jFrm8UERGkDDCPCh4Mup8zB1D44Ylu77XyCzBN5T3PheJOlznmXOV WQm970IE+g6ZYlTLr6pKE/TP+02mSo5IjnwT4Mq23SDZxQl+StcgABJlMN48shcoABs2 1JKtdXp3rgjmx9xCdvU5Y/ubfQeyYbKzPlYEzVU6b/g+fwBHBVJgZc7qKNZgegz+sfMz gvGg== 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=U1yu+ywxhY2vGIPzZT0X+v0N2LCIFhaSSIxFy80Zgss=; fh=zB0rU6xSa7LGWTgt/l7Iil94icazssUcZE74d2AuqUk=; b=AP0795XDCrmw7z3kWxA9Rx3JK7aekMnaXviBduEEOHF89tbCqSdiPexgNY90oV8ze2 GSbe6y1hOGGAFZVXyiVkhx4/7kkf6GJJ+7JBZXJjliUnkECC25EcRDwmLZ3z0P+wz5h/ slFHLUlAR2Gvwoc/Vqx0WJBGFWV42f/FrUEkRn4i0HAF6MKNQOYLBq6mnlFqFTIlQcwW 780w2RNnJ+TmB7o0uFjSv76SdugcxbFkCEFmUbUCs4orciDtGxGwteuAZuxOc42BQD9E B0NGvpDt9Gd4jhtU81C08Dv2bAtWVxiR01B2Cuv4p4nIeK8w1FCdFb4EGpo4PZSFNx6O ureA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=TWDB8aL3; 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; dara=fail header.i=@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 a640c23a62f3a-a7aca7b84e5si1013549966b.111.2024.08.01.04.51.58; Thu, 01 Aug 2024 04:51:59 -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=TWDB8aL3; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCDC268D840; Thu, 1 Aug 2024 14:13:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BAF868CF7C for ; Thu, 1 Aug 2024 14:13:45 +0300 (EEST) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a7ab5fc975dso615300266b.1 for ; Thu, 01 Aug 2024 04:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722510824; x=1723115624; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BzymcyqljBJzaViFrv+kplPlqUv13qIk+LW5lY2wHjs=; b=TWDB8aL3qcB0CshRf3b2a73N3lcQVRIdwHfJVCda0Vzxz9+T89yYMsOmxyiQjPq0rE rpN9NsAC9jKgmBJRY42JD9sAiiSJ7Q+bEv9EYU54XgVKfD9dFJnVioAAP4LppykE4cPq iRzi8N8Wtuiav+oHRcWVqXwuCucF060+9IFBm17vIWOomNks4IRseTPtIMd0bMQHS6sL rLM7mz6oXh4mVke7gIvWZDcgLhGTBQ/zIxkAZHyVC89irs2tXH8/H3FHxehGRvnIXhbF y4eOTTxkpKsitjMUhHEVNpx1qBgy5qXM2GjRvSNMWg4fEbeCSIV42VErcU3lJ8wfxNnM 8Bkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722510824; x=1723115624; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BzymcyqljBJzaViFrv+kplPlqUv13qIk+LW5lY2wHjs=; b=tp+I+lXGHCeyLLY0vfGOcC2sGz37hqXMT9tPuq9ppe4JPrJ5Y/qcAL7F33jnpt7NUo F0yhF29TkdWufJD/Jtwli04VqgDdeVJB4tuCLlsSVx5DwJj4b0pyWkT1XuxYf/dSvNto YykJOQqLFbiEivCNHoXTF1kn2WseqBkAa+N2zMtEerBkMf77Pgc/lXyG/ihJjXczx+tT NVfRer5O4/MeCX47qYVDH/6ZXq42sEQisw6hEciBntYzzaeD1B8OpG4VaxcyNIYpS5k8 R1ieKK+P14ZYtJf0rdLNKqANimz1pc1cIOM1rdf7DKrvvPCAWveVJJYy1qmxYwt/gmaV jX1Q== X-Gm-Message-State: AOJu0YxrFoLVnt4OxRb3yTeD4xkaZHnkuyR9D/EuK7PBTuIAlU26wmBP qCdZ66+niPQsO9ESQc7YR8Sq9y3uFGv18SIFlUiTxmpL2i0LoiFAR8IkC1sW30dpoA== X-Received: by 2002:a17:907:3e8f:b0:a7a:c256:3c5 with SMTP id a640c23a62f3a-a7daf65b96cmr166577966b.46.1722510823475; Thu, 01 Aug 2024 04:13:43 -0700 (PDT) Received: from aiusubov.amd.com ([87.116.132.31]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acada2b1asm887691766b.158.2024.08.01.04.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 04:13:42 -0700 (PDT) From: Araz Iusubov X-Google-Original-From: Araz Iusubov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2024 13:13:35 +0200 Message-ID: <20240801111338.1683-1-Primeadvice@gmail.com> X-Mailer: git-send-email 2.45.2.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4, v2] 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: Evgeny Pavlov , Michael Fabian 'Xaymar' Dirks , Araz Iusubov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jOzMOLruW3Fe 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 - 10-bit input video is not supported by AMF H264 encoder 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 v2 - lost line returned in ff_amf_pix_fmts v3 - fixes after review v4 - extract duplicated code, fix incorrect processing of 10-bit input for h264 v5 - non-functional changes after review Co-authored-by: Evgeny Pavlov Co-authored-by: Araz Iusubov --- libavcodec/amfenc.c | 37 +++++++++++++++++++++++++++++++++++++ libavcodec/amfenc.h | 3 +++ libavcodec/amfenc_h264.c | 24 ++++++++++++++++++++---- libavcodec/amfenc_hevc.c | 31 ++++++++++++++++++++++++++++++- 4 files changed, 90 insertions(+), 5 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 061859f85c..0bd15dd812 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -60,6 +60,7 @@ const enum AVPixelFormat ff_amf_pix_fmts[] = { #if CONFIG_DXVA2 AV_PIX_FMT_DXVA2_VLD, #endif + AV_PIX_FMT_P010, AV_PIX_FMT_NONE }; @@ -72,6 +73,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 }, @@ -785,6 +787,41 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) return ret; } +int ff_amf_get_color_profile(AVCodecContext *avctx) +{ + amf_int64 color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; + if (avctx->color_range == AVCOL_RANGE_JPEG) { + /// Color Space for Full (JPEG) Range + switch (avctx->colorspace) { + case AVCOL_SPC_SMPTE170M: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_601; + break; + case AVCOL_SPC_BT709: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_709; + break; + case AVCOL_SPC_BT2020_NCL: + case AVCOL_SPC_BT2020_CL: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_2020; + break; + } + } else { + /// Color Space for Limited (MPEG) range + switch (avctx->colorspace) { + case AVCOL_SPC_SMPTE170M: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_601; + break; + case AVCOL_SPC_BT709: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_709; + break; + case AVCOL_SPC_BT2020_NCL: + case AVCOL_SPC_BT2020_CL: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020; + break; + } + } + return color_profile; +} + const AVCodecHWConfigInternal *const ff_amfenc_hw_configs[] = { #if CONFIG_D3D11VA HW_CONFIG_ENCODER_FRAMES(D3D11, D3D11VA), diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index 2dbd378ef8..62736ef579 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -21,6 +21,7 @@ #include +#include #include #include #include @@ -170,6 +171,8 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt); */ extern const enum AVPixelFormat ff_amf_pix_fmts[]; +int ff_amf_get_color_profile(AVCodecContext *avctx); + /** * Error handling helper */ diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 32baa8e91a..7caeca748d 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -200,6 +200,8 @@ 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_profile; + enum AVPixelFormat pix_fmt; if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); @@ -270,10 +272,24 @@ FF_ENABLE_DEPRECATION_WARNINGS AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_ASPECT_RATIO, ratio); } - /// Color Range (Partial/TV/MPEG or Full/PC/JPEG) - if (avctx->color_range == AVCOL_RANGE_JPEG) { - AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, 1); - } + color_profile = ff_amf_get_color_profile(avctx); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PROFILE, color_profile); + + /// Color Range (Support for older Drivers) + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, !!(avctx->color_range == AVCOL_RANGE_JPEG)); + + /// Color Depth + pix_fmt = avctx->hw_frames_ctx ? ((AVHWFramesContext*)avctx->hw_frames_ctx->data)->sw_format + : avctx->pix_fmt; + + // 10 bit input video is not supported by AMF H264 encoder + AMF_RETURN_IF_FALSE(ctx, pix_fmt != AV_PIX_FMT_P010, AVERROR_INVALIDDATA, "10-bit input video is not supported by AMF H264 encoder\n"); + + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_COLOR_BIT_DEPTH, AMF_COLOR_BIT_DEPTH_8); + /// 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 2915a83677..5422835100 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -35,8 +35,9 @@ static const AVOption options[] = { { "high_quality", "High quality usecase", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" }, { "lowlatency_high_quality", "Low latency yet high quality usecase", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" }, + { "profile", "Set the profile", OFFSET(profile), AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10, VE, .unit = "profile" }, { "main", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN }, 0, 0, VE, .unit = "profile" }, - { "profile", "Set the profile", OFFSET(profile), AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN, VE, .unit = "profile" }, + { "main10", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10 }, 0, 0, VE, .unit = "profile" }, { "profile_tier", "Set the profile tier (default main)", OFFSET(tier), AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, AMF_VIDEO_ENCODER_HEVC_TIER_HIGH, VE, .unit = "tier" }, { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_TIER_MAIN }, 0, 0, VE, .unit = "tier" }, @@ -163,6 +164,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); @@ -192,6 +196,9 @@ FF_ENABLE_DEPRECATION_WARNINGS case AV_PROFILE_HEVC_MAIN: profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN; break; + case AV_PROFILE_HEVC_MAIN_10: + profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10; + break; default: break; } @@ -232,6 +239,28 @@ FF_ENABLE_DEPRECATION_WARNINGS AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ratio); } + color_profile = ff_amf_get_color_profile(avctx); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PROFILE, color_profile); + /// Color Range (Support for older Drivers) + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE, !!(avctx->color_range == AVCOL_RANGE_JPEG)); + /// Color Depth + color_depth = AMF_COLOR_BIT_DEPTH_8; + 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; + } + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_COLOR_BIT_DEPTH, color_depth); + if (color_depth == AMF_COLOR_BIT_DEPTH_8) { + /// Color Transfer Characteristics (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709); + /// Color Primaries (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT709); + } else { + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT2020); + } + // 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 Thu Aug 1 11:13:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Araz X-Patchwork-Id: 50850 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp1065617vqs; Thu, 1 Aug 2024 04:14:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVtSoApDUNmYATUDURCFoKMDUjZLn2RHOwxkl7DXYTjuZGjTDyHEZhX6yevMPcDglODG6BZ2W/7527BTMK/VUOqcvnHSa2mhCUMDA== X-Google-Smtp-Source: AGHT+IHUsiiLYeLuK4oCy7RHu+YrqJ7iqqgMXNksmPCHBSjCFvPQmVeYXR5EyRWrCKE9Ao/2HhX6 X-Received: by 2002:ac2:5e3c:0:b0:52c:cca8:a9fb with SMTP id 2adb3069b0e04-530b61e7f0cmr1346685e87.42.1722510848651; Thu, 01 Aug 2024 04:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722510848; cv=none; d=google.com; s=arc-20160816; b=bvLsDG9s7ETH0px1p1lyj+hE09WlsGFalD4Ajm5+Va6AB9tNMq+ncio41TEmyN+vtI s0eQGOxmAtlTHURNMuYlzDWQH0pAQbgDNiuQV4auC1Q6JCKfSZgBX3c/JBA7aBoQcnOy SROqKqsO9QqZyYFvnTCoOc+11PSMgCaQfZggRU2+b0PlEut4CDm2cB7R36bN5S7d4xJf C1sh0q+oaJtYxeUqU8u40EnNAZ9op5yDHAIdlnDpRzwIR413KQJXbIawd8N9fnv89m6v Kagsuezyd+FiaEZo5g1NB144BToTn6zIlocJ8bZa3kVCfHzc+Z/xyH7ZTpXPRbRqnoEh jM/A== 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=+oJDESPHf+XgcGX7L5g/QRsqM685yDrpdHkfza0EyIU=; fh=s4NEqlgyeQvuJ9M2FER/qIrd96lZ1v/frktaqQpFGmg=; b=F7xC3HImOsYQQvuCxjVmj5hdGgMSqYtb/ADOJPNwatD384G6QI39/sGnIk53b+r1ji qAYq6zhO9S47XdUw8AUVNBsZ69wbxv+iDvkXfOxRDAzcfYFDhsVSX7b3/PwI9yW1URqC f5Uyut9e20aVDIQ3q3nRUsGI5jEMOFw0RYVjzC/MXOIPt4kgNilUoqkufr7gYoXr0CLV 4eI28QdaA/iFqI73YTMxoHy2nlqmzM8uw3nH3QMgcm45PGlISMCEGz7Iq/9OOIORt7NG vkbSSQOIj44SK9Tpf5xC7oGQqE8vnnnHRcrlFakzbrOLcMKnKht/tZF9k73ogZpGgZt7 S/Mg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=K+AvKZtu; 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; dara=fail header.i=@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 2adb3069b0e04-52fd5c05d2esi4932781e87.525.2024.08.01.04.14.08; Thu, 01 Aug 2024 04:14:08 -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=K+AvKZtu; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2E2668D957; Thu, 1 Aug 2024 14:13:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8635C68D7AA for ; Thu, 1 Aug 2024 14:13:46 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5a10bb7bcd0so10412660a12.3 for ; Thu, 01 Aug 2024 04:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722510825; x=1723115625; 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=/yZfVfdvyXoEHL3L13XbM1exE0lV781Ey6XCqA4E2Cg=; b=K+AvKZtuOh40+Ul/nijztEw/9v2/1Ua38RIibM9ECkP+Gxfyqt18pTDwthfpRUlZMY GR1r5HjJDia2IthNXzRMLzR/WM8AGIAe+9fCmwVdzsaQIgJnIkayThwCS2vXIYF0eMfW Nhyfu4i6hlJP5E++aRDCk79jyZnZDH0ZfPfbgqpvz4JgurRnc4fToNkwVR3z9GPp1FnX QeQ/+9tfhyIeKC7tTxivHB4QBD3MZZWWH32Puqet4YWKNdztxDOKAtC7UbrvNC5mrv2C OaPZCDjWyI0PtzuakzqKmhr3O9wXAYucvxgx+BVaQIZmBzSRCb2On9/oyUvklhGIXPX8 ZD3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722510825; x=1723115625; 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=/yZfVfdvyXoEHL3L13XbM1exE0lV781Ey6XCqA4E2Cg=; b=fW7d5mI8WKLarDu58+wj7eIDbjtwLlTk1tiWvXQvSqF8Kge6xXirE4ncesq3zGKfgo PnlvPXK5pXZ9NHQzTJVvrZsjTq8kbX4irJY1fuk4M0ddXrzaTWri3an7HbTwNtUbHIQa QkQa+NbRMVMmsCeXLlNXEjitn2kfwerB0O4LjgXHrWTyGeGZ7Dd5fe5D0xjXjmJlWfvD 8Ra6j5zKpqazcCAoiWRYDLubuZDpq4Q6lEgVm80GiejPkIVZ798IUqIkyFtp1I+oxoQM HpFfddR2TF/W+pBFtpbBeJ4+IiKKFg0yPOzu+K06C+ZKERZIOC/Dmeb0vAQ+JFClkCXk keQg== X-Gm-Message-State: AOJu0YzyueGgMQeAJVzwpKfgOnjLHWOyl5A2/gmn+rzsuEzW50SmlOn2 hljALTcilLu7c1+rwZ6ITzU1Ta8CEU0EX3XTOhBgpbz/sRew3QLPGbN1zcx4fWI= X-Received: by 2002:a17:906:7952:b0:a77:e2e3:3557 with SMTP id a640c23a62f3a-a7daf607064mr146160966b.57.1722510825267; Thu, 01 Aug 2024 04:13:45 -0700 (PDT) Received: from aiusubov.amd.com ([87.116.132.31]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acada2b1asm887691766b.158.2024.08.01.04.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 04:13:44 -0700 (PDT) From: Araz Iusubov X-Google-Original-From: Araz Iusubov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2024 13:13:36 +0200 Message-ID: <20240801111338.1683-2-Primeadvice@gmail.com> X-Mailer: git-send-email 2.45.2.windows.1 In-Reply-To: <20240801111338.1683-1-Primeadvice@gmail.com> References: <20240801111338.1683-1-Primeadvice@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4,v2] 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: DRyVCFO+Amul From: nyanmisaka v2: fixes for indentation --- libavcodec/amfenc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 0bd15dd812..068bb53002 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 @@ -683,6 +734,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); @@ -746,6 +817,18 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) } res_resubmit = AMF_OK; 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_resubmit = ctx->encoder->pVtbl->SubmitInput(ctx->encoder, (AMFData*)ctx->delayed_surface); if (res_resubmit != AMF_INPUT_FULL) { int64_t pts = ctx->delayed_surface->pVtbl->GetPts(ctx->delayed_surface); From patchwork Thu Aug 1 11:13:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Araz X-Patchwork-Id: 50851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp1065692vqs; Thu, 1 Aug 2024 04:14:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXC3bqOxShN49QrmlKLtfYVV8zR1BNgwW6RT0pgJsv/9tf12lH5l7tnqf0RJCOxeyufg7wCOa9zl3M5UmxX0YOomImy9ga0B/AsGw== X-Google-Smtp-Source: AGHT+IEPvJdDXCfLaBru80MAz11XIC88vZNY0+uDIkI6YmsMG3nGhnO3g8/k4DSv+izhA2iTPDK9 X-Received: by 2002:a05:651c:306:b0:2f0:25dc:1886 with SMTP id 38308e7fff4ca-2f1530e86a8mr16339861fa.10.1722510856863; Thu, 01 Aug 2024 04:14:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722510856; cv=none; d=google.com; s=arc-20160816; b=D+aBfNoNcrEKzJcN5i9hfZDXyQart0gZIkhNyRgxqjbXogKuhuakpmyrqQ91HXFtCt Y2YmaUu9nSkWBMjHeDxsQReIobhgzq9hr1FFtSrPMpnxDTCQl2Ll/ZzHY6QdlWt2eifB My63fLkxk2VEPtRO5a+Ffw1VJYdjkFi2LONRfjXoHK3QHFDaARNbQFBKg0Tf9ZWOL1JF GwVDMSFqOkOG1A7Qa/kEFVFklJTmIW8UccOX/z5mLJ2hTpop9Zqj0gsyqu7VaSfJZv9t n9FGmuScuPx23ntwtrfohXUCcRyygO3/xWQJyZVM10YdHVI0K/bMTAAgW8jwqcPD4j4o 90xg== 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=3nGglh155NWgC9gVAnECrTT0zXs6qus/eiir4LDPraU=; fh=RrSXaicI7x5SHa2/4czRw6L1sHZRrTfKYm+J2vOmY7E=; b=UMp8zdZnldRNuz1l1h5zZ1kuBj5EDC0E0hCHSzxTwU0sUOxLTSEfkdTCTDcd0n8IO8 mxo9HOuRQUTpnx4c8rcZE0v3pH/sMdKR1mzdJocKUCWqCz+XLwBvlM1I68FiXz4bThr+ YrUmw7ksm6UgShfy+Nr/Lk2cNvVGmyWIsXIQhxZofI4W/VHgEPwUEHZ9SGZ0Z1+pozf2 L3R68unuSfFkhM6NRD2Y3pwSN43fcPfrT1zI2YaxmoeZ0JVkVoA4HagD09AxA/1SnGCD wesQm/POAsoGC7nvw1jC33gQvZXDZVZFdznhxc/ajjGxVmWLhyMZA8EyMgZ8n4JSUdnE 3PXA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=im8OUf99; 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; dara=fail header.i=@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 38308e7fff4ca-2f03d187980si42031261fa.593.2024.08.01.04.14.16; Thu, 01 Aug 2024 04:14:16 -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=im8OUf99; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 225AA68D960; Thu, 1 Aug 2024 14:13:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D55F68D92E for ; Thu, 1 Aug 2024 14:13:48 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a7aa086b077so611516066b.0 for ; Thu, 01 Aug 2024 04:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722510827; x=1723115627; 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=980hQQ6Y8HrqZfKMvEdwwl26AXkiKOvLzNm357frBws=; b=im8OUf99FmUBT8UN4E1rcDHWAeXYVZ9W77b9DBUdY/c14QYv1jhauqmyM7odQgju1n 16o5reXVFAPnt1bS70fgh+zR4xCsc3HnFKoaVvVnqZpyscxYqVzyY2lKDkP9T8xZe2ef HI3G3HLKWd1Okyyt1OGYTRMR/je7WMqcRF993ZydUHCgYnZ4A+7e8EN3HlRvoR17U7fk lh7cPsFwcdjXePqOjHjdsqZ0lLd4zpRYH03ZbANKhz2hbvAjhGZeJhcJunySvCnr7HTr HYEa5IQk8s954ibV2LxQls7oQXVNVy9LJKVgZ53uejrdAxr7fyR36kgbnsDlBn1ZiVZV dGTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722510827; x=1723115627; 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=980hQQ6Y8HrqZfKMvEdwwl26AXkiKOvLzNm357frBws=; b=B48PLIZwpv7ZI5aTFhdtgdDSiRflaUXabpvd1OMmVmMIcSewogKrvUm89vIAPbtlky eyPStV6h87+hZ+XMYiGixgagU+o4XW3mG4jT8zWmpeobPVfUJ4cZzU12Y1DGUFtMxivA zekU+MYI52SH0iGZQLTt0SGCbtMLqDGDYbWqduHSDh5asarBKMaHgyNoQ74L6BfoPNaM xtu054lsvuaIhF+lAndv4wrUBWeBV4A4fHj0E/A9trXaiLp+ODVqowTugPfetxRCEA1u 3shOPVJ3LuH56WEP+XqXlUROr+B8zvWKbcc8+QxmUpSb+dfdI3MynZHEWfUPeOlRzh42 WHtw== X-Gm-Message-State: AOJu0YwwVfuslAB3E14j/WR9vUKRuvxxYeAIveoyCTFqjdOehfFjuhJE Xeqs5EfyT6IyyupsiPvxVblP5MkyPumj+maEDRmJwgNPW0u8HA8MUkqVTLuvY9hpCA== X-Received: by 2002:a17:907:dac:b0:a7a:a892:8e07 with SMTP id a640c23a62f3a-a7daf50c8edmr211822266b.31.1722510826954; Thu, 01 Aug 2024 04:13:46 -0700 (PDT) Received: from aiusubov.amd.com ([87.116.132.31]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acada2b1asm887691766b.158.2024.08.01.04.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 04:13:46 -0700 (PDT) From: Araz Iusubov X-Google-Original-From: Araz Iusubov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2024 13:13:37 +0200 Message-ID: <20240801111338.1683-3-Primeadvice@gmail.com> X-Mailer: git-send-email 2.45.2.windows.1 In-Reply-To: <20240801111338.1683-1-Primeadvice@gmail.com> References: <20240801111338.1683-1-Primeadvice@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4, v2] 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 , Araz Iusubov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SzBcJW/L/Q+u From: Evgeny Pavlov v2: refactored after review Signed-off-by: Evgeny Pavlov Co-authored-by: Dmitrii Ovchinnikov Co-authored-by: Araz Iusubov --- libavcodec/amfenc.c | 2 ++ libavcodec/amfenc_av1.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 068bb53002..49dd91c4e0 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -746,6 +746,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; } 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); diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 62b9af9da0..e960e5ec81 100644 --- a/libavcodec/amfenc_av1.c +++ b/libavcodec/amfenc_av1.c @@ -170,7 +170,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; //for av1 alignment and crop uint32_t crop_right = 0; @@ -220,6 +222,30 @@ 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); + if (color_depth == AMF_COLOR_BIT_DEPTH_8) { + /// Color Transfer Characteristics (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709); + /// Color Primaries (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT709); + } else { + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT2020); + } + profile_level = avctx->level; if (profile_level == AV_LEVEL_UNKNOWN) { profile_level = ctx->level; From patchwork Thu Aug 1 11:13:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Araz X-Patchwork-Id: 50852 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp1075585vqs; Thu, 1 Aug 2024 04:32:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6nbZnx45paQYYIwjkTkLuud8VCJDerUiKR2ipRwjVrlER7oM0zogFxh36dsqUMGah/vuIBB5FUiQfmQaPkskMwUgat5FLXzLK+A== X-Google-Smtp-Source: AGHT+IFJq35sBZY/zgaoA4KJ7SqcLPMzenQ2nFI1+b7oQuinEkyfoCABCH+0NOva4r2OVFgWYPaF X-Received: by 2002:a17:906:dc8b:b0:a6f:5150:b807 with SMTP id a640c23a62f3a-a7daf50c41cmr208627066b.35.1722511920023; Thu, 01 Aug 2024 04:32:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722511920; cv=none; d=google.com; s=arc-20160816; b=zvgSAK8g6uRcJgdwxh8IEQHAGuuWilEMuxt7yxLongYIkC8trrkWBBBFErbhvQ/UAc OXavewGCBqOFZmGFgU8AF2CNy8xpYyQT5TUdiiBGwfFm0GphySPv5A+oNRr0/1GVOsNo 0fNZQSUdUy9Oauhq29GNIkbRzWgVQu3o3Gjai3OIRUsko8xFJ1zqqV5OMmUN3FwxZ4Hk eFF9JwiWNXOm+nYu77/eypoBL18ZwoHcc3ovTFicWOXi+XMR6CRLb+xl4SCfWjVaX8v9 1LCu0ZpGbrnHHSe/XU3DHF2S9eOvAbboaKMBv4XPkvl4yMbvTx34t0MKj1/ZBoeielFz 5Zqw== 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=LuLAQObUXrBzfRFOQ+CUwGAFOw943z4IwEpKdDskti8=; fh=OWLPUf18s9dlUQuxhl6xLimy4NybloePU6lVbhxT1Ck=; b=isfHz1s+VxAmGerpWl8FKSJFZJcCy8JZiU9HMTbDkcWfb7CNpU3vVUGGa4B/tTMJRH hCWAVQuX5MHrV8HNiAVwJRimcnQyd+v4wXTzNmJjqUogf+7j2ihaJNGSUAFE4P7SoWM9 0XC5s74kn/BJYUNfZRX4ye9aGrrteVnAgYLaAmBE6Kzr4Fa6b5mA45urnjN1qwSRtTgA PHBzdVs3lKdrfApBS6TXqzU++02JMNXWG5LCtIkaY+9dMoirCy4ZlAtedBaiGf89nOks lovwxpB7OzSAXzwC/iVRakP6PVwuV9OFa4WcNf9iJ15gsRMrujBEWGzHOnwmJiqaZuRZ K5qQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=J88rHwG1; 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; dara=fail header.i=@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 a640c23a62f3a-a7acacc1d35si998399366b.984.2024.08.01.04.31.59; Thu, 01 Aug 2024 04:32:00 -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=J88rHwG1; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71FCA68D96B; Thu, 1 Aug 2024 14:13:56 +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 A1A0268D8B2 for ; Thu, 1 Aug 2024 14:13:49 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a7a9a369055so753842566b.3 for ; Thu, 01 Aug 2024 04:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722510829; x=1723115629; 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=YKZd84/H9LBGaG9u9jI3JMrVybsIXwycBFgwehHJU70=; b=J88rHwG11PS6AU6Efi8yrCtYV4Ae6057d1goir5FJuT+CHjCVvscHg4I3SeHmDyOXU hTRO412/372PccanL6T3691N2M8emZn/58UxZV6KHKbuburT14jdY1FdQaF6n09kN9Dt QmA0Fj+8x3GAcpkDiYMcdSqp39oAEAToCg8AWbo/Xib3Fv0OyJsVuTRi782hMHS5u0GM lj70fsZZHSswP7R/IbFVjJdghRRkgVEbCtGejz44eU2HNz05bZl4Y+C44U0cuj/MG28v +gdnYGOXNTaMicL56046q/RGmc/w6CneaVFJXvO79cR40Toe7Dhv5ZVtusB55a/2psAW vktQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722510829; x=1723115629; 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=YKZd84/H9LBGaG9u9jI3JMrVybsIXwycBFgwehHJU70=; b=q5ArZfEiul0LsA8LVyyLkr/rxVt8kti90sj2evzKjT1S8MrtQW8nATECMNVRIJO+zr f4MQD+jed2hi66W4ffhsOqJzeTpc7//KksmT7551KbFcuHL9OScftdhcuYeQFxu+26Zf HkjKYb2zEDt0zurKK2EU2nuek9GxZlpzCSs2zoPhJ+WrE8rbzlmdXYge9ErhijTVN7DH jCOOdauj88vLTS1z9eLJtu26eGL5WmfcXFxobF1qn9rAgr5C/tRTpQ9ZQVhiYePSPnjJ nlH0ONlxs9cxSHBW4G+xiO1qhbKyNc5iRqQQw3D5mV4LMKtwdXdaOPkL21ncuj44Yvit FXxw== X-Gm-Message-State: AOJu0YwKkHA4Q/E9h7kNgmcb5bYGkmajb3nWaF6o6ZfV1n/1mtc02BA8 IPUNdfMfGnhY9fzwwQ5vRJ4nOx7+j+1u1z3AcZ7emPm04nc0RBiJmeYfELtDSNRMbw== X-Received: by 2002:a17:907:9706:b0:a77:c314:d621 with SMTP id a640c23a62f3a-a7daf288bf6mr181182266b.13.1722510828601; Thu, 01 Aug 2024 04:13:48 -0700 (PDT) Received: from aiusubov.amd.com ([87.116.132.31]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acada2b1asm887691766b.158.2024.08.01.04.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 04:13:48 -0700 (PDT) From: Araz Iusubov X-Google-Original-From: Araz Iusubov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2024 13:13:38 +0200 Message-ID: <20240801111338.1683-4-Primeadvice@gmail.com> X-Mailer: git-send-email 2.45.2.windows.1 In-Reply-To: <20240801111338.1683-1-Primeadvice@gmail.com> References: <20240801111338.1683-1-Primeadvice@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4, v2] avcodec/amfenc: GPU driver version check 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: Araz Iusubov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VVLINlrzrplm Implemented gpu driver check. 10-bit patch works incorrectly on driver version lower than 23.30. --- libavcodec/amfenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 49dd91c4e0..41eaef9758 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -415,6 +415,10 @@ static int amf_init_encoder(AVCodecContext *avctx) else pix_fmt = avctx->pix_fmt; + if (pix_fmt == AV_PIX_FMT_P010) { + AMF_RETURN_IF_FALSE(ctx, ctx->version >= AMF_MAKE_FULL_VERSION(1, 4, 32, 0), AVERROR_UNKNOWN, "10-bit encoder is not supported by AMD GPU drivers versions lower than 23.30.\n"); + } + ctx->format = amf_av_to_amf_format(pix_fmt); AMF_RETURN_IF_FALSE(ctx, ctx->format != AMF_SURFACE_UNKNOWN, AVERROR(EINVAL), "Format %s is not supported\n", av_get_pix_fmt_name(pix_fmt));