From patchwork Mon Oct 9 09:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 44213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp1309946pzb; Mon, 9 Oct 2023 02:56:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1HPGs5Xb6gFavb44DK0ORznNvdv7hk0e56qmwgjZ9AL2yNq21fL+KT1Y75Vq+37/fgT7M X-Received: by 2002:a17:906:2250:b0:9ae:69c4:5b4f with SMTP id 16-20020a170906225000b009ae69c45b4fmr14192545ejr.19.1696845388715; Mon, 09 Oct 2023 02:56:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696845388; cv=none; d=google.com; s=arc-20160816; b=pzC9FqWX0yEwIIAIugIJnV68P/+Pc8x2Oc1Dkr4u9//KARciEFCdYOixnCRdTCyrkx 1HWXO8TienOXGBnTaKpoqeqr4r4prpKZyJ5xQs9sA4Tuc6bK6u3u2/trJyOgqCWp9pXS 1OTN7wlskwxG0X9mVM5boFsCEtVFiSAHccrJUfr5FZSwiaVKXvr2vpTCw5c1FTKCR9kg dkYWtVI1H100ufEOH/+xsCBTN9vngVrvmBj6tSCEnUX3Zq2+B9z5vtEGIcTCuTbYgUWP roWgNvvUfwTWboS+K9xdaWebRzJ5cf3LDMfLvsTgvQ2HhA5mdBaSarUk3JCehB81iiZN HjOA== 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=UB5DGzOQpJ9g/S3/QGOMZLiLkSQh671iUbgAzrnkdIM=; fh=RtB4DVs0FDmf9Hvrn87VH/goAyWr8bjY4Nman67RuSk=; b=Ou/HyKQxXNNHTHIcuyGNlf0Xy+zcuxEVEys92q6ZI3/FTDDkXPktIlUO9aUXf7Pbz1 EArpVG4cnRu2+I6Qt6hJPdkrLEbs3ju/0ddNchceXuCQbnzU/9QXdxcfq0lIhKVTOhpp qNPvW5Zyu3hZAZXDmr4FtbyHaKWtvFaIyqW8hyzrSxXptNMhfh9C3mEvyQvP/eC2heZ9 ZZI/LvAxJtPhtu6rHgvZbx82oFXy4mVd0zjawTpm4ZLbbImvfh3AaX/Yt7j8LmbRKcDX kVsAJhBgq4zJ9xZO2Mh0J/qlrDy4JcvJLWKIdkmZW8YS2j6iOnPRMXhyq40Zll5a2zp6 hmXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gg0jMasj; 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 gu8-20020a170906f28800b009a1bf0afbd7si4367155ejb.81.2023.10.09.02.56.28; Mon, 09 Oct 2023 02:56:28 -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=gg0jMasj; 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 A56D368C9C2; Mon, 9 Oct 2023 12:56:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEDA968C872 for ; Mon, 9 Oct 2023 12:56:17 +0300 (EEST) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-9a9f139cd94so717494066b.2 for ; Mon, 09 Oct 2023 02:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696845377; x=1697450177; 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=mg/FI/1qapxSl+wPBSKxwvIrEGylryDLV21+YpSlWvE=; b=gg0jMasjQr2LiWJgumObrMSY9rP/iDBFy+V4VvaDRUPHF25bfGILgFlaw+Rwj4a+Si A3FhRDtkPRGFDaEHx6S48ZiB0ZygjzPXdoYamlZ8JSSAP1LqyhBpcI0C1Pw5sxKu33tp pd+1HTG4LDTvk0ghjizHR60g+ThRHV/USKaYgaiOR630AtbJOOouomBZ/kJn5HpKrim/ 7K84NXMq1SGIWsGZ4cwuffiheE4LjSvXb4Rlp1LG9BRgMCEdKamMcfijtzMzPTUe3RFh ajUJS/ysz7qoY6v2AGFKoZJHX3Ym8E50GChEBMaWerC2HoNDuBqf3cfpmLKZbi8G20dY hE8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696845377; x=1697450177; 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=mg/FI/1qapxSl+wPBSKxwvIrEGylryDLV21+YpSlWvE=; b=pczhbAL62S8a1zqyNKosXZQLnjp3L8WlaPFI6UxZjmfdAMfItKgSD9wuVCzA8jV+U/ izJxkRxs7Q3vI7veqbCfpM9A61nrQp7KmLnnlgW0/6N74RZtp7SlWymbUxUt9dJncqMI 1IrmBkyGhvIWRT3T/gclJkIXv4tXOaysCbycveNjcSVxPnq77+qDKUfJK99yOpv61Biu mGvirvw0zyeORwZaA9eL+l9tZn3YU7f1rqRHoF0ayai29pGnNtw0U6mP3leCyVu++fmt gvsbGUpHJU+18/8jxaoqSy3yl65eE2c9C03iVTcmvEklxynMQuUTdtxGjdz+CjHKvU3N FGzg== X-Gm-Message-State: AOJu0Yxdk9mkBQIbhC0wUsIUf3v4jzMfqZNtW+ztRDpXRo04PilYBYrH yaEVDjim/Sx13N4kRBOIsm/yGVwCd8Cnlfy4Zlg= X-Received: by 2002:a17:907:75fb:b0:9b2:b2ad:2a8f with SMTP id jz27-20020a17090775fb00b009b2b2ad2a8fmr11816788ejc.11.1696845376612; Mon, 09 Oct 2023 02:56:16 -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 ca9-20020a170906a3c900b009adc743340fsm6547954ejb.197.2023.10.09.02.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 02:56:15 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Oct 2023 11:52:50 +0200 Message-ID: <20231009095340.41807-1-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726113943.1140-1-lucenticus@gmail.com> References: <20230726113943.1140-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Evgeny Pavlov , Michael Fabian 'Xaymar' Dirks Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DfGyAqTAzaLd 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 Co-authored-by: Evgeny Pavlov --- 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; + 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 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: + 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 + 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); + /// 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); From patchwork Mon Oct 9 09:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 44214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp1309996pzb; Mon, 9 Oct 2023 02:56:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEiWklt16Usf8aXbhn4TnMW28UR0uO0tUHHYlizMoyDFMHZmTqel1CmLAHskd6XCY0UiRfz X-Received: by 2002:a17:906:3051:b0:9a5:7759:19c0 with SMTP id d17-20020a170906305100b009a5775919c0mr13212820ejd.64.1696845398702; Mon, 09 Oct 2023 02:56:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696845398; cv=none; d=google.com; s=arc-20160816; b=rlnpORhZR+WjwPlQybiU9vQKiJfnXw03W6jrIm8MLHB6kjY0DC4j8wpSZPgpB7lUlL n/7d/sNcNO3cHWMPYO8eW4QCd/ycSjxlhiVTKREbjvlFjEJutxtvDMB07/BvH/3aLAJl uXP3D5wRx5yvxVs8NH0TjPmsYNuMA2241xYO04I3u9HNAszzpxeYKMMXqLH1GjbfFCLr mHR1b+1Z9P7ReZTm54A/83r/N+fR0dDlPYsNszSm9g/jnRa11ZQZbdd4EYgegBqDbJ1c m1iwSZIFdysvQn0PfV3PAo/t7NAtuz3Xfldrevd+2JVD23qS+RYS6HB4QGvynu7xcWAS O69g== 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=nQXLYHTU+pzuXnAClmiMA38bfEI/TvjQj+sU31BLIk4=; fh=s4NEqlgyeQvuJ9M2FER/qIrd96lZ1v/frktaqQpFGmg=; b=dVudqqHeldfvmDfvn9NHFvVUK0HUXWOo+NozJbxaK9NFhh4w8h158XGFah+58O+U+P t4zH7Os5ubQZe8rGOPpQKwKnspkge7w7mlBCjtligWMp9GF6VLZ7BV9n0RdWckULzSUU GFmsi6BxSCLnlSEFkkl7+2rVGdTdzHT4qDS00iW9B9vraWLfr4Ri+6IYEe7CFsTyQCf2 P7Iw3jFowOdtf0sCo3HOYa5X1UVfV4rk2w9DN4sZ2cv519kETKTuTNqh5TlcnaZttigw 53SXXwgMsrehQ1h4bjslbKq+Frig8wCTplme/1YdL5yxhhd+g4ZfpS7izYVLM5G47Gyu z6IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=bD5DxBPQ; 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 j18-20020a170906051200b0099396547000si4343571eja.767.2023.10.09.02.56.38; Mon, 09 Oct 2023 02:56:38 -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=bD5DxBPQ; 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 D7AF968C9FD; Mon, 9 Oct 2023 12:56:33 +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 1338368C97E for ; Mon, 9 Oct 2023 12:56:27 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-9ada2e6e75fso788775066b.2 for ; Mon, 09 Oct 2023 02:56:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696845386; x=1697450186; 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=JX4G0I9AfulDVPsYmdrP3bDhk9RapAH7Dgp5Ckjk1xY=; b=bD5DxBPQRHpdO8PAQOA31PlVrgmeIzShYyys44GUuMPZj9iX2QdixGAs6qfv1vKEAm 0H/YeUudg30oqh39qs459G3qRjEsbE6ssXDnTOb59Ek+aAGVUtx/v+aEaN96u/E8fp+8 ktuuajPm6NWOxBNZKhgaVqWLhWKXTd8rAV/0jT/wtPiuZOJMkHCXsAwoQBZ9ThDrdMgS cBYyFz1FUMqcN6uNtxPDArCvJ9QMGKYVEyhTi4pz9YEA/+vzgIUbClLDqYYeNeh3iOir 2L/BN9A3Ya1Y3bUsr45C3oRqxiE2Jp1nVDiCaIQaYP8NpkS7xtyaSBcJHne5o5KSKGFB om9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696845386; x=1697450186; 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=JX4G0I9AfulDVPsYmdrP3bDhk9RapAH7Dgp5Ckjk1xY=; b=Kjag0Uc9VACtLyHrsV+k786WUZxTB4Ir+nXJdkqK/Zxeef9N94JAo+NQdPSxBZcQOQ nRlyDvWejXgilM0hmtUYzrmrxpea1PAJ2FHA70aqjSQ+Jtrgf/R3vn0Wf6CG7T0ahc6l bliKPVUYzUfggs38roxlV0Zr8tZqgVsJc1CBptcMR1OcowI0ZVqu3n2S+CHBYGJO7ibo qDD9Ek/xeQ3BBo4S4A6hoJNDIBPG8fK1CEVF2zBP7bm6RY9+6aXqxT1Pfv7VxyeGKz4r DZHu1rg2b2uFfRle741uDVOAxh8L9NQIGaszuZzshFtlh1a3uPy9W6qaXZqqL+UMOCfT 9XMQ== X-Gm-Message-State: AOJu0Yw41xrNiuVJriMyPljyQuulM8GAkrlFOKJrhBz4Yaz9zMDVmtoK w+YJnlqgvaVeBWMNlKULvtgCjnqGXAzq/0MMV/A= X-Received: by 2002:a17:907:75ce:b0:9ae:65e5:497d with SMTP id jl14-20020a17090775ce00b009ae65e5497dmr12130850ejc.59.1696845385972; Mon, 09 Oct 2023 02:56:25 -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 ca9-20020a170906a3c900b009adc743340fsm6547954ejb.197.2023.10.09.02.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 02:56:25 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Oct 2023 11:52:51 +0200 Message-ID: <20231009095340.41807-2-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009095340.41807-1-lucenticus@gmail.com> References: <20230726113943.1140-1-lucenticus@gmail.com> <20231009095340.41807-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10 bit support, v4, 2/3] 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: Cinc5IQ46u+r 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 Mon Oct 9 09:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 44215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp1310035pzb; Mon, 9 Oct 2023 02:56:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVJmRNdIK4LSwH3Zlsb/dxVPF34qQM6LUv4das/W4DWDsUwQ7peHPjnqjbRea4pwTGa+MP X-Received: by 2002:a17:907:778e:b0:9a1:bd82:de24 with SMTP id ky14-20020a170907778e00b009a1bd82de24mr12661492ejc.12.1696845407135; Mon, 09 Oct 2023 02:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696845407; cv=none; d=google.com; s=arc-20160816; b=BLLIWZrscHE6Va8gVyDEOf6kqRMeiDR+dcxACEh26jIH8ftgZ1b4ygySMbHCKNTQvM uRff0BCU64UQG2bSZ9JliXcZMZiEFAGOiUPs0H4BCb9SK2yqCmkBbOIOPAOPZd6e3Hq9 HJodOzoAExysdVdzs4RbVdR4y/3nWc8NJIV8/xULoErxJo6P9dy8qiTG6PFActsUyJS0 ANv6BeUYlskm3SR9wgFzBFKZWGf0xR2D8k6Y8pYe96GehnkwmpLmipxo7Ef2+M4KFx7s yQInssGtJv4A72By3tm5kI7Sqb4sgOqVlTyUBVDht1AfwGmNGMd484+xuslZc2y0XHGs pDZw== 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=O+YH6yFIaQiBxOrtIeffX5F2mdFSkbdhc/rtzo54GeNXpYA0mvvMSEaNTjhxbUUpR+ oPlNxvLPnldn0rwsWPw1lYA43HGXepIkYAmDgvRhxQLqMBaJ2h+Owxof4UiJh18kwgU6 lZ3F/pz7W93hVWPZPz0RH81QMdB5R27iH5m1Xcg4QfhYk01W5+HOLBQ+y5D97H0LmixK JR1I/qPxqUj8GBtgQKAk95PJ95+o0whVQqUs8aJa5M+Q4+wkLEWhFbHsGEhDFkI/2Pem nzSCg4LLI33VCfp/67ctpCJ9qL5U4nQL0aSZQ76Q78RSYQIA0uGUZj1RIpSUjfpNecHQ GIkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=BQ3F1Gbf; 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 e10-20020a170906248a00b009b2dde5027asi4227920ejb.313.2023.10.09.02.56.46; Mon, 09 Oct 2023 02:56:47 -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=BQ3F1Gbf; 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 E96B668CA20; Mon, 9 Oct 2023 12:56:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4EF068C90C for ; Mon, 9 Oct 2023 12:56:34 +0300 (EEST) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-9b98a699f45so729489766b.3 for ; Mon, 09 Oct 2023 02:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696845394; x=1697450194; 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=BQ3F1Gbf7MkiGOm3CmS9L8adFD/EDXz7vOlKE0R9abKR7BOryBd6y47UCTUUsfBu02 ITL0+s4oVvq0m++4sGMhPF0f0VDdnBs+RWalq+I0DtxCsh6PH9A2tLaco+jBo7Ihs/tr 443rXA18syxsacCUuqOARZQU4Mi+fh2wTA8ZGSP1zL5zrvixi31AYdquUNIklZozx95G miLK6ByfFzEfA7C3eHB4AN1D3wY4JCXcSEWfW3r29pdTT38Tx2ouWKj/sRhv4oGEFks1 iIPMMBHqzkjCVZu0en1K7KrY7GhPhro7Uj+uFS6Z0E8g4S62I9YXqyfULSsLHkRzNOVV EGHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696845394; x=1697450194; 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=scCIBkueTaqaRsMUNPmMHUc0a/BjWYth5nj7GSoF1kNsfY4slfeIDImDxUh1uJEPeS mjcinHQzfYRJrxqFRtFcKHxGkkENJNq3Ry9G3FPpkKbeV4DQdWy627bsrXIuL7SAEBg0 rwWtiaO68I2Aeh6/JPbS2Uq8nnhtG3w/i6ZHd0vn/+jfXgv85aIs5GamEfoMJj6t1gKj bGHx4xQJ0Rll9FJ5WIVLXl9WoDXBIuBZcHh1qQ3X2/gxHpnCXP8YVrpb/98dPyjAw+PA SBpgKBkODoc/NoV4N4KjUh7fcRRnuBqL+VYsr0EB2wtcQyd/L6sP/mrnrQn9oWPVm3RL 4LRg== X-Gm-Message-State: AOJu0YxWwJIqUE1Z74wOFS6HlLXLJPqp11C2nTKicwRvPREZDwSlhU2s 7y3GQoSsewUlBeNfeIOTnQXWdjzoC0f7awiew8M= X-Received: by 2002:a17:906:318f:b0:9a1:b05a:c07c with SMTP id 15-20020a170906318f00b009a1b05ac07cmr12221415ejy.55.1696845393499; Mon, 09 Oct 2023 02:56:33 -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 ca9-20020a170906a3c900b009adc743340fsm6547954ejb.197.2023.10.09.02.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 02:56:32 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Oct 2023 11:52:52 +0200 Message-ID: <20231009095340.41807-3-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009095340.41807-1-lucenticus@gmail.com> References: <20230726113943.1140-1-lucenticus@gmail.com> <20231009095340.41807-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10 bit support, v4, 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: oIHuBW2PUcKj 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;