[FFmpeg-devel] [avcodec/amfenc: 10 bit support v2 2/3] avcodec/amfenc: Fixes the color information in the output.
Michael Niedermayer
michael at niedermayer.cc
Thu Jan 19 23:11:02 EET 2023
On Wed, Sep 07, 2022 at 03:41:21PM +0200, OvchinnikovDmitrii wrote:
> From: Michael Fabian 'Xaymar' Dirks <michael.dirks at 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 - 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
>
> v2 - lost line returned in ff_amf_pix_fmts
>
> ---
> libavcodec/amfenc.c | 2 ++
> libavcodec/amfenc.h | 1 +
> libavcodec/amfenc_h264.c | 46 ++++++++++++++++++++++++++++++++-
> libavcodec/amfenc_hevc.c | 55 +++++++++++++++++++++++++++++++++++++++-
> 4 files changed, 102 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
> index a033e1220e..efff9b5ae8 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
mismatching indention
> };
>
> @@ -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 },
> 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 <AMF/core/Factory.h>
>
> +#include <AMF/components/ColorSpace.h>
> #include <AMF/components/VideoEncoderVCE.h>
> #include <AMF/components/VideoEncoderHEVC.h>
>
> diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c
> index eaf7f974f3..7a0198e6a8 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;
> + }
the surrounding code all used if A=X else A=Y and this does A=X if A=Y
later the same code is repeated and both parts split up
> + 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);
[...]
> + 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);
code duplication
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
I am the wisest man alive, for I know one thing, and that is that I know
nothing. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20230119/b3b030c4/attachment.sig>
More information about the ffmpeg-devel
mailing list