From patchwork Wed Jul 26 11:39:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42993 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp458357pzd; Wed, 26 Jul 2023 04:45:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlGmcnIiMmCsQUCYVf53zJf3HAw42hDI0W7zco1983aMIRpwDaLIY10ByKH3rZRPFCRuFJwU X-Received: by 2002:a17:906:5397:b0:98e:1b9b:aef7 with SMTP id g23-20020a170906539700b0098e1b9baef7mr1678216ejo.64.1690371919275; Wed, 26 Jul 2023 04:45:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690371919; cv=none; d=google.com; s=arc-20160816; b=WXBncqYcTO1Rln0qxpnGJjI9/8hacy2lTBsbO/xwc/QgaOBz7YCxUQQnLZnGkxKBfo DHkXXGfnYD/V1tSz19Nr+1MvzD5nabaE9TtDtywqjMAfkzIvljvkWEJj/5BFEz7EN9qq 6pvzGrCxGzsb7NPx7RXaVtzTM914C50UTn3olA5KRavRlQMwf4foPaunEU6+ob0bydQM T8xDj4P6iU9Qa6qHdKCAO2dK2S92SDQGxJDixzJTjSA9YaOBldSb6Q/12Oy7BqfBcG/1 9Ncd6ruwz3Kvtmg/K+0eDiaHHMVGZcEbwvgnUMHO++64JT4HsWxvBi0rmPYvmr+gFOfN caPQ== 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=aN0btaPijWYDcOzGxqc0bbh2WawYdvXgkJAc6mrQt7g=; fh=ZSV9SHBdg9qEa8hbPo+RHKj2JXuFuiOgqmW8l/SBrSk=; b=nuJIexu2ZCxA3gKcJcJhqc5cPLUsoMhEn9LrDa2RJxa4wmPI+4h3nBolCJgjgTYKfN deYYXQ1Gd2IcYBEPhrXtdEAbEUEsRB43Yn3MEzb7bnQF9ogxnacx/2P/s9XHIpx7i9wU kfb3GtzmE8jvJ2ow4t7QcPQLklAhO3zsVhSmQCvGl5K2klyFj6sEQBMfZGITeQRAoymr 2zTGnMSm4kb7pNapTeZofss9eRwHls5M2z2xKlKLaiitwU1UfMmXL4vSSrc879MgFith JoC86Wi1iYL+aebEBQ/OFBDp9a0cSW/QkQdepjjqt3Q8Bt6TsL4eG3ODBV6FOKSE98Gs G2SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=RNQyRFLp; 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 k17-20020a170906055100b00988c552332fsi8894356eja.300.2023.07.26.04.45.18; Wed, 26 Jul 2023 04:45:19 -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=20221208 header.b=RNQyRFLp; 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 5DF4B68C946; Wed, 26 Jul 2023 14:45:14 +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 3B73768C8DF for ; Wed, 26 Jul 2023 14:45:08 +0300 (EEST) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-992f15c36fcso1114162566b.3 for ; Wed, 26 Jul 2023 04:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690371907; x=1690976707; 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=N++QZnbsBP65DQ8GSqcozyRPfLjgKKHzM89/QqTskRc=; b=RNQyRFLp/aqg0pbXcPf7GfQww+Fbwu6CWyNU0wC5dlq5MkHeP9P8QWqjBFQuIJIQ11 5wleGQU7VnRQIPewNJ26nv29ozNUnFCzXV3bLq5TTlMq8kkrG8YiSmLg96FSZO0pJUoY 7Gvs25J0NNgvTuBqGsjEMaWfmpVmM5G7PnNW+HKqYt1ukKOXn0LmRcNwTvK6KjZ+szaM VMn1IfuSiHp3htXc5JhEXFUPdmuafdVyYrROhIt1pouoDXua7tb/4y5IsaXzTt7EpHuC Xi8YXYz5NroJSLLssUoFPEG3eXgApJXcc9rqKIQWMuEs5zg2P1a9K2OJfj2aMz1VZiNp nLnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690371907; x=1690976707; 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=N++QZnbsBP65DQ8GSqcozyRPfLjgKKHzM89/QqTskRc=; b=f18nJOC0bS9ynKu7weQvytkFHnndY2bclH/2SZP4a+DMlNLJWvNSOV0ShyxKY5S8tn su3MFcYBwynqHdlHA56h4HWZaG8AVuV5+N55JhPceN2gKC1XpRLukL1ZDrqulW1jKKRh wb22KKO8f6kgGt8rYeP7NCUOfyGkr79sorNSh/aF13G4RpVHsQdKJTkuPy8Wc/K9n9T5 MRYCPMLFpMg8tB2fSBpl2UoTugPXFh4VUtRnC+/tuLbvpMLSftJ9esCBuc8E6cehq3HK krhAaq8kBEJ2s6seP1jkvQs4Gui7vZqy+66mQYRDgrXSwBnK1+lK1TsgP6fUK99Gpf9e G7zw== X-Gm-Message-State: ABy/qLZOE+72V/tTZ2W/gGX2oiYgkPm/I+nvzvVJdf0XbO6CRdCKATaO tHv1kH1Qv9HbSHi+2Fc7+QfPi74CN+2bQBV2 X-Received: by 2002:a17:907:75f2:b0:99b:5689:1331 with SMTP id jz18-20020a17090775f200b0099b56891331mr1334959ejc.59.1690371906551; Wed, 26 Jul 2023 04:45:06 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (79-101-179-103.dynamic.isp.telekom.rs. [79.101.179.103]) by smtp.gmail.com with ESMTPSA id j1-20020a170906254100b00992076f4a01sm9411968ejb.190.2023.07.26.04.45.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 04:45:06 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 13:39:27 +0200 Message-ID: <20230726113943.1140-1-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> References: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH avcodec/amfenc:, 10, bit, support, v3, 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: Michael Fabian 'Xaymar' Dirks Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dnLonHUSe75b 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 - 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 v3 - fixes after review --- libavcodec/amfenc.c | 2 ++ libavcodec/amfenc.h | 1 + libavcodec/amfenc_h264.c | 49 ++++++++++++++++++++++++++++++++- libavcodec/amfenc_hevc.c | 58 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index cb48f8c273..1d863afdc4 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 }, diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index 2dbd378ef8..267eb593a2 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -21,6 +21,7 @@ #include +#include #include #include #include diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 2380aa4e90..4b6708ca8f 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -199,6 +199,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); @@ -262,10 +265,54 @@ 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) + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; + // 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); + /// 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 { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, 0); + /// 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; + } } + /// 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_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); // 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 dd232cc8ac..0897c04bed 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 FF_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,54 @@ FF_ENABLE_DEPRECATION_WARNINGS AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ratio); } + // Color Metadata + /// Color Range (Support for older Drivers) + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; + if (avctx->color_range == AVCOL_RANGE_JPEG) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE, 1); + /// 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 { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE, 0); + /// 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; + } + } + /// 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); + 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); + // 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 Wed Jul 26 11:39:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42994 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp458484pzd; Wed, 26 Jul 2023 04:45:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlHnPgv9JllY0DxbmVcHyrrQVWohZ7xzMrKRZfPaI/a7yLEsI2jMDE4BMfA74h6RNusWXkbh X-Received: by 2002:aa7:d74b:0:b0:522:5a89:8518 with SMTP id a11-20020aa7d74b000000b005225a898518mr1287168eds.12.1690371933686; Wed, 26 Jul 2023 04:45:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690371933; cv=none; d=google.com; s=arc-20160816; b=d61vZFMtTQwa255hHOmWGDVYVsfOcjzHYEN/OtOFKFwvhWq48e5daf1fHreFOWOz3n H9Ra1zwpou0PCtf2N1+Bc0E8a7NGn4mvIhcPytAKyDxiANeyMuTmaJLgCvUUpOS3uV2u yh/UAhES1csXT8dStBBG+3ZV3N/37AfJlG+NiCDx+GcreFrg3DR9xuMdZx/9dxhta9QG FwtiIz2dLxWVaQua4LRK0IEgAvOvLqfjWlFZlDSr54gX8HIqm0EDWaAJXArK0z1B2++F tLjZABfz2RP0lZLdCzWWz8uix+6ROzEGlxAQc4Ecuhixkk+Rxc0Tdsv6lsgAgY5GjJBY mapw== 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=qVQux09w2znseaIt8wxh/NSMa68tmLt8+jt1xjdn9K4=; fh=8KOGQe4RXRgu0UN7g3z2nnyp2thAPLMfNg7Ff7UMJ8A=; b=QjQiKh/bNTu4B4j1F+FR23m/V6uQU+hda8Bx/xQ+Z4+H029oiUG1y5t04/kGQwZTUT 88RGnrqlzE0t8yIQs1TJsjbJK2sjis3pI0RUZaeD54dgl/MNs11js93WZvOO+Wf5wcIW /cE9i/lyqmARnrdofuY0+bAB27obqUOSjZBYGhtDuNj6PRN1N2OuWGzyrf0/kQfIUgD+ zqorDGDZVd1+la6igWTq2fwLz/TwfBb7UTdJXOaRQrUtoRr6GTYqqIY196O1IrRxUSfx 6Zc8am6c/eGjuPDnvkG+BtGEvUxSmqjlSeW31UfMhLcUH/GCC8ORChdum1czbsxlBfqk A0AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=oFIU5BsE; 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 k4-20020a05640212c400b0051da4b65e72si9204752edx.360.2023.07.26.04.45.33; Wed, 26 Jul 2023 04:45:33 -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=20221208 header.b=oFIU5BsE; 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 80E9668C951; Wed, 26 Jul 2023 14:45:30 +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 9304068C74F for ; Wed, 26 Jul 2023 14:45:23 +0300 (EEST) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-991c786369cso1027957566b.1 for ; Wed, 26 Jul 2023 04:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690371923; x=1690976723; 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=Cmo/hBpLLrtRRdEDli+BM9FH6pmhW24arY6qhR+YKAI=; b=oFIU5BsEWfBNG/u7l2hxD+I6OagReYOjmMcOrW3Z5Jwg5uYT3PpSQqMB5rUbLUuCZO BAUy507+SX7bn2auqacY3t7nbxsFCUzAvQhohIdqbN6v3JJB7C6Qzz7WvU4iYcq7KAL0 GFHkzPlImayRx+k7XaFqewpVihTMdvDvErm7L3UEvOwBIEItvlFVC91yxfGeTbRSjvki SWQg8XczMj9uxCHn0tdiJ0mGKIHElnOvCslHmajtt7QGnffp4giiogaw/96HtnUBdswO QQhOGhhyynYwU3Froi6RDg7nqbXuFpPaSuTVPD4YzVLpuqB/jv2whQUjLP2jJHvz2F0p ZtbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690371923; x=1690976723; 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=Cmo/hBpLLrtRRdEDli+BM9FH6pmhW24arY6qhR+YKAI=; b=JLO9imaW3avIeDDTtDuSqWYs3qTnPiftUUoD9F7c6/Y7pkx9/C36G+56vfF4Id/N9O Fzl2clYt8O7jfQ20lqh5I+WUs2Gd6p8PHF6zUBPNtkzLMb5YA064tPtsWOCxIE0ueXG3 VYVMcP1KP19HUH6oG4FrLmLCHsY4y7SqFbrfnNZl7dYYjb6DjrzeP8ogvG6Nx7lY7m3m VoTDpxKJCk4c007KJsw1TKtPP9xRW/18yArk6C6cXEvKFs8Tk41Ro1CjAHpBN0Uhxqqx JlaVPcnFJdh2ou/Hrao8cPQXJTsT7hAQatxBTWEzQcgIFZ2g+Pmqi+iNWvkjNJUfTQht L1hg== X-Gm-Message-State: ABy/qLZ4nu7tHnNcOMR5suB4cMbRuSuVxXuzh++GnYEmLYLx95Yh+Mlm lNdro2qFVyt4XyieA9lccsqJxrArZlxbSXzI X-Received: by 2002:a17:906:10cb:b0:994:1844:caec with SMTP id v11-20020a17090610cb00b009941844caecmr1337240ejv.77.1690371922464; Wed, 26 Jul 2023 04:45:22 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (79-101-179-103.dynamic.isp.telekom.rs. [79.101.179.103]) by smtp.gmail.com with ESMTPSA id j1-20020a170906254100b00992076f4a01sm9411968ejb.190.2023.07.26.04.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 04:45:22 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 13:39:28 +0200 Message-ID: <20230726113943.1140-2-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726113943.1140-1-lucenticus@gmail.com> References: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> <20230726113943.1140-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH avcodec/amfenc:, 10, bit, support, v3, 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: hY5ov88ZesDb From: nyanmisaka --- libavcodec/amfenc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 1d863afdc4..ec71f899fe 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 Wed Jul 26 11:39:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp458578pzd; Wed, 26 Jul 2023 04:45:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlH3E2yy6487peP4KcUDiAappewuIIyudhtR/BrgG1ZEqiXKKGv+1wZ3xZoQ/MZXiI6c/+RY X-Received: by 2002:a17:906:74d8:b0:97d:2bcc:47d5 with SMTP id z24-20020a17090674d800b0097d2bcc47d5mr1526685ejl.49.1690371945683; Wed, 26 Jul 2023 04:45:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690371945; cv=none; d=google.com; s=arc-20160816; b=Pn5/Eqfoi42BQJF+vnWV9KWkjy8oUfHuVlNsxUDOhXPboCA3HGjPcDnDPbKLZ/3Wj5 guJ+T4w2dTcy1xHqfiOPLIS3Go/uHSAjyAtMO6PQ0QvMz+50e8ZZfT2YqCdmXdQBEQlQ tKtVzlzqwLUb8DdsSXe3Egy+GapI/ZUflrq+tUcW2do1vIq9znJaZtv4so7ZTUd1/Lsy 9bi9qLgDxsapbyI/Yi/hsyGIfBkl30OryVDn+bDZWVLI3ypVrQtAngdTRrhgJfAKfeNw iYPgUIb5p9bIVe3MXuv80NplMA+6LnYc0dmad8T00Wgufd7h7K9+6/1aRkplotinEmmB Rgmw== 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=TcIEdcudOp7YRfX2dgIHsgA5BoZaMthBIEefxrHp+dM=; fh=LFfhhmQxOykW3KntSZSFVLEF45T3WGpGALUVCHvC0O4=; b=iAO22WFA1/lPAfc5UIs8DhIbK4kGhP0vapQpP4FN7Jb5kNVIGg02LYkA7SgHzsjRRM MtXJvGcO8nVeTHC1gb67x/LHLbzd8An0KorNg7MeGCr7hfzsZnA6XMrwXNMJQpIvX3YG g0rM0v/6dUCvlWYop+8xuMFoZ3N8LK74JC8OwX2QwYCNPL++kl8FtxMc9AK3Ons+Jwsu zRKEl5IPpfEcJn9mlmFbDP8EIpkO85NkKEnuXW6NBJ254zJIk7vVbn2jsm5+C/hgQatw siu4fjC/qv/Zjrkpy1gBLkJhl50LoBIqlCwQ6MBKxZ+5IBNogEYryzhSufZZ9f+pe05T SVew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="U8b/dkhy"; 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 u24-20020a170906409800b009938d70d887si9036229ejj.382.2023.07.26.04.45.42; Wed, 26 Jul 2023 04:45:45 -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=20221208 header.b="U8b/dkhy"; 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 BB1EB68C957; Wed, 26 Jul 2023 14:45:33 +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 2B5FC68C94C for ; Wed, 26 Jul 2023 14:45:27 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-99bc02890c1so113701766b.1 for ; Wed, 26 Jul 2023 04:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690371926; x=1690976726; 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=VMc0a2Xn9d+1dLLKdsz4jD58GaI4PRplT+qKOKPYA0s=; b=U8b/dkhyHsyiRaNXbrjgP6SCNDTDIU6zW2fC5pNy+yL/myXZSdKbVd0kp4eUF5hOqj Gs9+AK6ZEUfokhdHwq7JngmVbCjxkkx+O21tWEgOcIY6jKOlTKKI8+avb0rxl8yE/VRA GrZY/orWnrq/j9OQOGd5bcnWmqtxWxJb7ajCCHaKctc3dTagMWKcdprUvL87qv5OTguB FfNZ/Ztn16FX+Aopk2L1Ao2s/0b0yFcskTRJjiue/7DH4jQqqJrtuqscN6FKqWGUUKPP SDn8NcuiBesa9Qt0GsSXXAdOBPeC4slEiMXVvLRyBQY8zyYd6pEcLpFrGptODsHVlyU9 d8xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690371926; x=1690976726; 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=VMc0a2Xn9d+1dLLKdsz4jD58GaI4PRplT+qKOKPYA0s=; b=Aq2Qzq4iUZyogNCAMLc7fo2kDeB7Ag2twytpMhCWLGC1gLLR4fmdKuea/2Na0UNdOJ 63WK3xjpWS/HstokSO3jp+KEnXyfHI58L/GtNHSM7BzlvHUj+eKp3IQcQOgIC8ZgvRVV LyF4D/R9Mje1hmh8nXkkkVzMW0+pu1Ooo/XP3aLzOGj50/qEJMflurU53t6ofFLyAaoS 4BjvhvSJEtuZPNgR9EBuovb6uv0sWVAJOjguzb5agi5FGl3ObnDeelapgfZEmFPmQPL4 JnAKD+VNkRSgf+dI7clsyo+qbclPhCPNfzaIvVdQurnzCFc6TqEzizbjIp11AlV5j0qf twYw== X-Gm-Message-State: ABy/qLbovC3mevH6hBmzhlUP0oiXRiWGqww5kxJzBTQeiMNqAYuwmmV5 MYC2HT6PlYjWMthbu8t5Mac06YGA9SRjR6uBigA= X-Received: by 2002:a17:906:224e:b0:982:45ca:ac06 with SMTP id 14-20020a170906224e00b0098245caac06mr1708746ejr.60.1690371926093; Wed, 26 Jul 2023 04:45:26 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (79-101-179-103.dynamic.isp.telekom.rs. [79.101.179.103]) by smtp.gmail.com with ESMTPSA id j1-20020a170906254100b00992076f4a01sm9411968ejb.190.2023.07.26.04.45.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 04:45:25 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 13:39:29 +0200 Message-ID: <20230726113943.1140-3-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726113943.1140-1-lucenticus@gmail.com> References: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> <20230726113943.1140-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH avcodec/amfenc:, 10, bit, support, v3, 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: XhnpmcUEWWhR Signed-off-by: Evgeny Pavlov Co-authored-by: Dmitrii Ovchinnikov --- libavcodec/amfenc_av1.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 30c0a9fad2..5c5313001d 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,50 @@ FF_ENABLE_DEPRECATION_WARNINGS } AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PROFILE, profile); + // Color Metadata + /// 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; + } + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; + + if (avctx->color_range == AVCOL_RANGE_JPEG) { + 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 { + 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; + } + } + 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 == FF_LEVEL_UNKNOWN) { profile_level = ctx->level;