From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 6A6C447C98
for <ffmpegdev@gitmailbox.com>; Mon, 16 Oct 2023 21:41:40 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8478868C9D4;
Tue, 17 Oct 2023 00:41:38 +0300 (EEST)
Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com
[209.85.128.46])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BC2568B70F
for <ffmpeg-devel@ffmpeg.org>; Tue, 17 Oct 2023 00:41:32 +0300 (EEST)
Received: by mail-wm1-f46.google.com with SMTP id
5b1f17b1804b1-40684f53bfcso46399005e9.0
for <ffmpeg-devel@ffmpeg.org>; Mon, 16 Oct 2023 14:41:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1697492491; x=1698097291;
darn=ffmpeg.org;
h=content-transfer-encoding:in-reply-to:from:references:to
:content-language:subject:user-agent:mime-version:date:message-id
:from:to:cc:subject:date:message-id:reply-to;
bh=PNJP3ikikiqLxDJRBIcdUDbMZJt0nW4s70mJgjtas/g=;
b=VnADCgARKMf2stZty4w01PzjKQVUw+/s+/p29d8yM9ASmjcSBLiMmk7jXrm+BF/yE6
N0vg6jVQG49RBlo0A3P5QUXRVkBNAQzH1OsWPCqcTvpSTLRL7obYG1d1DW0uBW4qrgOO
2KcHM/lS2DqDfvxQHo8CPdabXuqTKSTABko65doVNz8kBcLNJ9zd15pzT7981rWH6OqT
Bb3ElL2VK8PnE4PnmOC11FPakACEbm205qTOAg6W9pNVjAhP51DNb5unB1fYC7OgClIn
fHAaMLqVWuNLH4P0FzSgkofda78Oh0zH81zm+mk7tGBNF1tDpJmLAc5zxpGNnjKUkRfX
9GWA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1697492491; x=1698097291;
h=content-transfer-encoding:in-reply-to:from:references:to
:content-language:subject:user-agent:mime-version:date:message-id
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=PNJP3ikikiqLxDJRBIcdUDbMZJt0nW4s70mJgjtas/g=;
b=iZRtXosdB7lkHEtqcIKaqoz4ic1V6R+YH1iXn56jHMlQOhhOE2PHadcyp3ViYJJYdb
GzjSK6bstZpfhJb0lzxwH41E101HZiNc1RbLUu29xKvO4sQcxw78oswW+vQ2P8gsoof9
DE5Vc8UwRnqorAQjDdecJOlBK4YV6l3nqZIQUWZ4ZnnqAZt1l0ACkGYX+Lt0HJOvI0Hx
mSswq5siWei8OXGFVOHu5ebyHtu14fJiu/BsBEDpKX3ZqmLW0Py6t4uGR0BM0u22IijD
ZhaeDcb7HEB25ffZPlWNmEcaPPxGKfaK0RlZMIqXPNY/hM6yVJmgdBxFAJAf3eCiOfeC
eQgQ==
X-Gm-Message-State: AOJu0Yxes3umo34ezE0MDX6YAD4Ak1R88CSnLo4L6Pp6rTNgo322JFAi
PB3iCngUKzYGaxTBX82oskxiXvvZyzTviCXuDBc=
X-Google-Smtp-Source: AGHT+IG5DV9WY3ga7UzWowVO0QYjudJ9BmiAvuAROVQg0b0lrpO9r/Kn/NsDMBFDLW/PTL1HWbAEBQ==
X-Received: by 2002:a05:600c:3b05:b0:401:b6f6:d8fd with SMTP id
m5-20020a05600c3b0500b00401b6f6d8fdmr283161wms.6.1697492490691;
Mon, 16 Oct 2023 14:41:30 -0700 (PDT)
Received: from [192.168.0.15]
(cpc92320-cmbg19-2-0-cust383.5-4.cable.virginm.net. [82.13.65.128])
by smtp.gmail.com with ESMTPSA id
n23-20020a7bcbd7000000b0040536dcec17sm8037145wmi.27.2023.10.16.14.41.30
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Mon, 16 Oct 2023 14:41:30 -0700 (PDT)
Message-ID: <d0ed9ea8-120d-4509-8603-62aa6e0cf851@jkqxz.net>
Date: Mon, 16 Oct 2023 22:41:43 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
To: ffmpeg-devel@ffmpeg.org
References: <20230726113943.1140-1-lucenticus@gmail.com>
<20231009095340.41807-1-lucenticus@gmail.com>
From: Mark Thompson <sw@jkqxz.net>
In-Reply-To: <20231009095340.41807-1-lucenticus@gmail.com>
Subject: Re: [FFmpeg-devel] [PATCH avcodec/amfenc: 10 bit support, v4,
1/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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/d0ed9ea8-120d-4509-8603-62aa6e0cf851@jkqxz.net/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
On 09/10/2023 10:52, Evgeny Pavlov wrote:
> From: Michael Fabian 'Xaymar' Dirks <michael.dirks@xaymar.com>
>
> 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
>
> Co-authored-by: Evgeny Pavlov <lucenticus@gmail.com>
> ---
> libavcodec/amfenc.c | 37 +++++++++++++++++++++++++++++++++++++
> libavcodec/amfenc.h | 3 +++
> libavcodec/amfenc_h264.c | 24 ++++++++++++++++++++----
> libavcodec/amfenc_hevc.c | 26 +++++++++++++++++++++++++-
> 4 files changed, 85 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;
Can you explain what this CONVERTER_COLOR_PROFILE option is actually doing?
You've passed the primaries and transfer function to AMF options later on, but this seems to then only consider a subset of possible matrices rather than just passing that through as well to write into the VUI metadata. Why?
(If this isn't supported by AMF then a more correct solution might be to insert a metadata BSF to edit the correct values into the output stream after it has been encoded.)
> + 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 <AMF/core/Factory.h>
>
> +#include <AMF/components/ColorSpace.h>
> #include <AMF/components/VideoEncoderVCE.h>
> #include <AMF/components/VideoEncoderHEVC.h>
> #include <AMF/components/VideoEncoderAV1.h>
> @@ -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 bd544d12df..f785e091c9 100644
> --- a/libavcodec/amfenc_h264.c
> +++ b/libavcodec/amfenc_h264.c
> @@ -199,6 +199,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);
> @@ -262,10 +264,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 352564a301..7800695648 100644
> --- a/libavcodec/amfenc_hevc.c
> +++ b/libavcodec/amfenc_hevc.c
> @@ -34,8 +34,9 @@ static const AVOption options[] = {
> { "high_quality", "high quality trancoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_HIGH_QUALITY }, 0, 0, VE, "usage" },
> { "lowlatency_high_quality","low latency yet high quality trancoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY_HIGH_QUALITY }, 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" },
> @@ -160,6 +161,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);
> @@ -183,10 +187,14 @@ FF_ENABLE_DEPRECATION_WARNINGS
>
> AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_FRAMERATE, framerate);
>
> + color_depth = AMF_COLOR_BIT_DEPTH_8;
> switch (avctx->profile) {
> case AV_PROFILE_HEVC_MAIN:
> profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN;
> break;
> + case FF_PROFILE_HEVC_MAIN_10:
Mixed FF_/AV_PROFILE enums looks a bit odd.
> + profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10;
> + break;
> default:
> break;
> }
> @@ -215,6 +223,22 @@ 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
Move the first setting of color_depth here? The setting above in unrelated code is easy to miss.
> + 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);
Is this the input bit depth or the codec bit depth? (Can they be different?)
> + /// 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);
Thanks,
- Mark
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".