From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 32B604A583 for ; Thu, 1 Aug 2024 13:17:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6509268D8B7; Thu, 1 Aug 2024 16:17:43 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2026.outbound.protection.outlook.com [40.92.58.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0113868D7D1 for ; Thu, 1 Aug 2024 16:17:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=itHEyHIjLQk+GO1Vzcl1iDCpk7c0grSkoUuZrBKX+Bu9L+K1X7CSekZsv14DuByJlHXXxzCHnUrdHZfdV7f0cX9KhaNyE5Cn1UbLer+1UvWZ9oWr6qFGNGBR3JkCZk0yZja3gdUf2KGnwUTsd5gFklNtwVCx3yHoMThknhiEFrC8hAHhp0vujvPnVVX2v0nevgzQ/T9ezX+0UYqten2jpiFn4yoSjwxP65vSXSJ+FpoABUT0iiTOoe20ic4+74ToZhCJJmETfxNbnUugr3cvFh6kiDYXceSMZi3Vyu9Thq3A5c3GV7qZQexqbQTlWbXprJVTZgJPSwjAo/A2z9hgvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ztstC+A9ccb2CFIkXywphz5EhBk4HPnnIBIfuPsyZ9Y=; b=GE9IHelIFQPNR/s9xSHsAcjh+SB5BGh2Zh89qwTOxj9hZxmKxDSDwFfdOLCHkvEN4giJ/GJNsDXPMfalfP91dyCzvONxxXz4gAmiHB5qk9Cdy8BXXZSfobFY7bxlNFAumqwB1Tbou5bt4LPkydqFtvyNXzy8CGSYGV28gUY4kfxo1NK+t/yyTj4ViabD3LxjIM8DDmYUobz/+VjkgBg+4RuUHAXunJc8fHDjPccZjEvN6sxT/XTeNgxlB2+w5JAcZnxeQ4lcCD4nOIdo9HzwiEvHgke/d8sqvNvcawgm8PTLOVNe5hl4xh2utQGeTYeW20S3C2LGyEQ500UbZAvq3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ztstC+A9ccb2CFIkXywphz5EhBk4HPnnIBIfuPsyZ9Y=; b=CA2Z6kZhV9tnS9ujCUmANcTInKzBdti19P/dSFBHbGVT+0GZrPnK6CWsniZZGEdlNpjy/NrBQzhfcH55fZyDDhzrmOoEA6XFHBpixw9LUXZYrP2aaOCIXSPVpvuKXISrMBHQbyUv9bhUkhj8kh0/MhKknkjtI/MC41Q1dAPqvJWs154+ypV5YRW8BGChSSq+4SJEEWaaH5hqVB2A+bn+S/IQ/DRbm9Gj/13Szi0egSAuHDJx0qoB5FU+p2eRAvXQlTAq3df9UpRbLTpZ17jDxf7mOqXdCXc27NsijfaUor/sdmuaUJmtVPxL1u0gGIb9VyWp3oG501CYQD6fz3USdA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0213.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.33; Thu, 1 Aug 2024 13:17:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%3]) with mapi id 15.20.7828.016; Thu, 1 Aug 2024 13:17:31 +0000 Message-ID: Date: Thu, 1 Aug 2024 15:17:27 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240801111338.1683-1-Primeadvice@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240801111338.1683-1-Primeadvice@gmail.com> X-TMN: [CZSUn+JncpAFa2j0VNpbv3wIo30QH+Gd1ARCO1Nmzd4=] X-ClientProxiedBy: ZR0P278CA0206.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0213:EE_ X-MS-Office365-Filtering-Correlation-Id: 199cbf68-2c0d-4a6d-50e6-08dcb22c4c43 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|19110799003|5072599009|8060799006|3412199025|440099028; X-Microsoft-Antispam-Message-Info: MqRml/zNAOrs4zO6XBIOkXJS6uylSAa5POgqCYqOFik64R5EfFHzrBplq0zf0XItBRRrCtUv4J0yugrEbP++T5Q5OCepFgNiJwLfFqOA3DBEzOyCkZrpULWc7SgUgeRrvN1lQTCU2zDA+N9HxVNR0UuYhsZpNk7BPhJKfU1PuXXD9E0hhjMP/oBohuepG7HXQX82PSjwTVmMDUFO/0BcQKWKOXUqsgRJG019tKLZpz/sjpokEMbE9Z2W30ZaF59ixZGUCEUrQ7AIHWCkhAnC4P5xToPA/L7dyL/RWV/ByfuZUlVNCxTZTSLUj2GYO2FRElA9nw8qhT5ANRJdo0cUNPMhfio+69Kdpqe7byFQPfkH4hHAN348lB5RAshh8zkWj+USsvZchjhVlGedmnQIl9z81qiSIEpPEa2qaIwoZ1q40zLxWMeEqol7OfdzVO2ZQFs5oXqfFWV2f5j4pslmIRZxJ6LprbzD92Aj9CsTJXBYm5dIgh/lOAqltuBaSwAiqTYfVQtbm+Yq68sy5joilpulQnSFAbtFiYBH+UQ7JQKhWcqdIzOEjjKeCEXsQLQ01nngb/vR5hJ72Wq7+oHAJa2mbJVxHV36Lk4G3eaouvEt8cEa+oAOoOcUqwmZfHnPZIkiuoeZvZpXKv56bZTfGph+JGai0yRHiwymH4ykautMhzRaejHFdzqICQJEFWGi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MU1NY2Y0d1hwRlErSmhhekVONEpqaEgxVnduMmpGM1p4S2YwaHBOVlArS2ZK?= =?utf-8?B?VElJMTBkVnR2VnQ2MjNZVUk4RENVNHhPU1M1azFKZmNKTnV5TXY0SGIrbXhh?= =?utf-8?B?WUJ5ZnhJa3A4bExiU2lRb1htR1dCTDNsTG0yZUdmVE5wNWNkd2JrV0Jsb0Ni?= =?utf-8?B?SFdYK1NScXNVTFA3aVVyOFU1b29OcTFhdDZ2SlViNFk0dE1GVCtoc3cxamt3?= =?utf-8?B?dUpmbGZ2SjZRM1FMb3Nqem5qdS9Vb040SlhGM3VRSDBwTEVnUFk3YVZRM3Vu?= =?utf-8?B?SXlrOXgzSVVTVEFTNENsN0hmSlNqZ1N5MXJSRWdyWGlsekFDSHZ0SlBEQVlw?= =?utf-8?B?a1pwQVpJYStyTnVubnEyaFdvaGllRDY0T3NLQWt3dThNWU81a2ZPT3dJMmds?= =?utf-8?B?VHkwK0tLZ2pqZHhuUnU4bGIxMXpmeEE4L1VDYzRZTURlRXdLTXU5bDBKc0dm?= =?utf-8?B?SlowREdBcU1Wbm1nWlZsUGRTeld2ekVRQUVkbnhWVmpLYlZCZzNDT0NlaDNN?= =?utf-8?B?alJ0d1lWSUdLOXdvSFFETUhVWnJlRVFRbmpyczVWOGxsbzdiSWlibXdqSm5r?= =?utf-8?B?L25nR1ZDVXUyR2c3Q3lsV2IxRm9oT2l5OXpVdE1zOXY4WlpSTHFIZFFyUUo3?= =?utf-8?B?aVp0V0VuU2U4RnFJVWlVdlY4UTA5L1d5WTA5bjFYZTU1ajQxbGpMYXowVFY3?= =?utf-8?B?RGs2bDhLOTQ4UUhhVVhkTzNwNDZEYlNTeWFtb2VlcE8wRHJFNUtOVlBOWHdn?= =?utf-8?B?OGlwZW1wcmYrSFJ0NnFLRG01Nnc3cTBzWmxIM25EeHFIN3FtVW5mMHJvYkJo?= =?utf-8?B?TTIxdXVhaGVSUGZ6eklNeHI4MzdVb084L1htb1djTmNadVdDbXZQTkY1QUxs?= =?utf-8?B?V2JBQUQ5WjFlK1Y1ZHlGTUx2Z0VnUzV2dTlaK2liWUxiV2RndW5QaGdMMUFT?= =?utf-8?B?R3REQVpyWkcwTm1GYWI2SjBIRmNiOUhGZ3dCWjNNcXhaOEd6eWhCeWMweGs3?= =?utf-8?B?ZGtoOFVrK0o2YW95OStFQ210c0RsSkxKUVJyK0Y0UXl0WUYxU3MxRFIyT0xx?= =?utf-8?B?NWhsT1hWb2IyRk5meWlHcFJsOVZkQWw2NzA5RWJJQWp5V0tuVkVrckU3aDdw?= =?utf-8?B?N3daTVE3TkFYeUtUdkhQeEFrZEhuTDFHYjNyNmdVLzMzUTYzamtUWjVKRmti?= =?utf-8?B?dlB2bWZuQjlzaEtvUzArWDdwWGxqQmZPZjlnbmVMdHF3SG8vZUJRa1c3OW1F?= =?utf-8?B?eVN0SEpvVVhIQjc0aEVqOEozR2pNQnRqMFd2ZEQ4dHlGd2JlWjgrMXgxZ1pX?= =?utf-8?B?UStxNjh6Q1VxbEw0RW85dGNlTkhsYzVGdVcxK081NTBITTRaamlLV3RlMWJ2?= =?utf-8?B?R1Vrb1FHSTU5NWJuMFdzcGo5Y3BQTlFPU0FENWlHczA5TU0rKzJDRTJUL0VL?= =?utf-8?B?TlFxLy9SdFBWSU80TUk0WWI0NW1ZNk9CZHRRQ0lGRjhhY3BBQWhad2g5eVB6?= =?utf-8?B?bzQ5U282MC9kMk9TSjZBWmVsdzk3VVJIVDNWM1VnN1RReUlmbnJ5Q2RhNmRN?= =?utf-8?B?V2ZBd012MEErK2FKSGxIcjliUFkrbERoa1RaMW9Eb01hRFhJLzVCRUU2RUtY?= =?utf-8?B?d3M5SS9VRTE1czQ5T0E3MVNZUE4yUStUdE93amV0THZMdmFlK2pwYmI5OHY1?= =?utf-8?B?VjlJY2h3TDlSazdVYWNKZi9PZlhtYkNZODBwTlNnZFR1TmtsakkrT0J3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 199cbf68-2c0d-4a6d-50e6-08dcb22c4c43 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 13:17:31.0337 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0213 Subject: Re: [FFmpeg-devel] [PATCH 1/4, v2] avcodec/amfenc: Fixes the color information in the output. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Araz Iusubov: > From: Michael Fabian 'Xaymar' Dirks > > added 10 bit support for amf hevc. > > before: > > command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file.mkv -an -c:v h264_amf res.dx11_hw_h264.mkv > output - Format of input frames context (p010le) is not supported by AMF. > command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file -an -c:v hevc_amf res.dx11_hw_hevc.mkv > output - Format of input frames context (p010le) is not supported by AMF. > > after: > > command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file -an -c:v h264_amf res.dx11_hw_h264.mkv > output - 10-bit input video is not supported by AMF H264 encoder > command - ffmpeg.exe -hide_banner -y -hwaccel d3d11va -hwaccel_output_format d3d11 -i test_10bit_file -an -c:v hevc_amf res.dx11_hw_hevc.mkv > output - 10bit file > > v2 - lost line returned in ff_amf_pix_fmts > v3 - fixes after review > v4 - extract duplicated code, fix incorrect processing of 10-bit input for h264 > v5 - non-functional changes after review > > Co-authored-by: Evgeny Pavlov > Co-authored-by: Araz Iusubov > --- > libavcodec/amfenc.c | 37 +++++++++++++++++++++++++++++++++++++ > libavcodec/amfenc.h | 3 +++ > libavcodec/amfenc_h264.c | 24 ++++++++++++++++++++---- > libavcodec/amfenc_hevc.c | 31 ++++++++++++++++++++++++++++++- > 4 files changed, 90 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c > index 061859f85c..0bd15dd812 100644 > --- a/libavcodec/amfenc.c > +++ b/libavcodec/amfenc.c > @@ -60,6 +60,7 @@ const enum AVPixelFormat ff_amf_pix_fmts[] = { > #if CONFIG_DXVA2 > AV_PIX_FMT_DXVA2_VLD, > #endif > + AV_PIX_FMT_P010, > AV_PIX_FMT_NONE > }; > > @@ -72,6 +73,7 @@ static const FormatMap format_map[] = > { > { AV_PIX_FMT_NONE, AMF_SURFACE_UNKNOWN }, > { AV_PIX_FMT_NV12, AMF_SURFACE_NV12 }, > + { AV_PIX_FMT_P010, AMF_SURFACE_P010 }, Why is this in this commit? > { AV_PIX_FMT_BGR0, AMF_SURFACE_BGRA }, > { AV_PIX_FMT_RGB0, AMF_SURFACE_RGBA }, > { AV_PIX_FMT_GRAY8, AMF_SURFACE_GRAY8 }, > @@ -785,6 +787,41 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) > return ret; > } > > +int ff_amf_get_color_profile(AVCodecContext *avctx) > +{ > + amf_int64 color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; > + if (avctx->color_range == AVCOL_RANGE_JPEG) { > + /// Color Space for Full (JPEG) Range > + switch (avctx->colorspace) { > + case AVCOL_SPC_SMPTE170M: > + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_601; > + break; > + case AVCOL_SPC_BT709: > + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_709; > + break; > + case AVCOL_SPC_BT2020_NCL: > + case AVCOL_SPC_BT2020_CL: > + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_2020; > + break; > + } > + } else { > + /// Color Space for Limited (MPEG) range > + switch (avctx->colorspace) { > + case AVCOL_SPC_SMPTE170M: > + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_601; > + break; > + case AVCOL_SPC_BT709: > + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_709; > + break; > + case AVCOL_SPC_BT2020_NCL: > + case AVCOL_SPC_BT2020_CL: > + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020; > + break; > + } > + } > + return color_profile; > +} > + > const AVCodecHWConfigInternal *const ff_amfenc_hw_configs[] = { > #if CONFIG_D3D11VA > HW_CONFIG_ENCODER_FRAMES(D3D11, D3D11VA), > diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h > index 2dbd378ef8..62736ef579 100644 > --- a/libavcodec/amfenc.h > +++ b/libavcodec/amfenc.h > @@ -21,6 +21,7 @@ > > #include > > +#include > #include > #include > #include > @@ -170,6 +171,8 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt); > */ > extern const enum AVPixelFormat ff_amf_pix_fmts[]; > > +int ff_amf_get_color_profile(AVCodecContext *avctx); > + > /** > * Error handling helper > */ > diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c > index 32baa8e91a..7caeca748d 100644 > --- a/libavcodec/amfenc_h264.c > +++ b/libavcodec/amfenc_h264.c > @@ -200,6 +200,8 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx) > AMFRate framerate; > AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); > int deblocking_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0; > + amf_int64 color_profile; > + enum AVPixelFormat pix_fmt; > > if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { > framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); > @@ -270,10 +272,24 @@ FF_ENABLE_DEPRECATION_WARNINGS > AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_ASPECT_RATIO, ratio); > } > > - /// Color Range (Partial/TV/MPEG or Full/PC/JPEG) > - if (avctx->color_range == AVCOL_RANGE_JPEG) { > - AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, 1); > - } > + color_profile = ff_amf_get_color_profile(avctx); > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PROFILE, color_profile); > + > + /// Color Range (Support for older Drivers) > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, !!(avctx->color_range == AVCOL_RANGE_JPEG)); > + > + /// Color Depth > + pix_fmt = avctx->hw_frames_ctx ? ((AVHWFramesContext*)avctx->hw_frames_ctx->data)->sw_format > + : avctx->pix_fmt; > + > + // 10 bit input video is not supported by AMF H264 encoder > + AMF_RETURN_IF_FALSE(ctx, pix_fmt != AV_PIX_FMT_P010, AVERROR_INVALIDDATA, "10-bit input video is not supported by AMF H264 encoder\n"); > + > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_COLOR_BIT_DEPTH, AMF_COLOR_BIT_DEPTH_8); > + /// Color Transfer Characteristics (AMF matches ISO/IEC) > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_TRANSFER_CHARACTERISTIC, (amf_int64)avctx->color_trc); > + /// Color Primaries (AMF matches ISO/IEC) > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PRIMARIES, (amf_int64)avctx->color_primaries); > > // autodetect rate control method > if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN) { > diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c > index 2915a83677..5422835100 100644 > --- a/libavcodec/amfenc_hevc.c > +++ b/libavcodec/amfenc_hevc.c > @@ -35,8 +35,9 @@ static const AVOption options[] = { > { "high_quality", "High quality usecase", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" }, > { "lowlatency_high_quality", "Low latency yet high quality usecase", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" }, > > + { "profile", "Set the profile", OFFSET(profile), AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10, VE, .unit = "profile" }, > { "main", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN }, 0, 0, VE, .unit = "profile" }, > - { "profile", "Set the profile", OFFSET(profile), AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN, VE, .unit = "profile" }, > + { "main10", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10 }, 0, 0, VE, .unit = "profile" }, > > { "profile_tier", "Set the profile tier (default main)", OFFSET(tier), AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, AMF_VIDEO_ENCODER_HEVC_TIER_HIGH, VE, .unit = "tier" }, > { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_TIER_MAIN }, 0, 0, VE, .unit = "tier" }, > @@ -163,6 +164,9 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) > AMFRate framerate; > AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); > int deblocking_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0; > + amf_int64 color_depth; > + amf_int64 color_profile; > + enum AVPixelFormat pix_fmt; > > if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { > framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); > @@ -192,6 +196,9 @@ FF_ENABLE_DEPRECATION_WARNINGS > case AV_PROFILE_HEVC_MAIN: > profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN; > break; > + case AV_PROFILE_HEVC_MAIN_10: > + profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10; > + break; > default: > break; > } > @@ -232,6 +239,28 @@ FF_ENABLE_DEPRECATION_WARNINGS > AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ratio); > } > > + color_profile = ff_amf_get_color_profile(avctx); > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PROFILE, color_profile); > + /// Color Range (Support for older Drivers) > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE, !!(avctx->color_range == AVCOL_RANGE_JPEG)); > + /// Color Depth > + color_depth = AMF_COLOR_BIT_DEPTH_8; > + pix_fmt = avctx->hw_frames_ctx ? ((AVHWFramesContext*)avctx->hw_frames_ctx->data)->sw_format > + : avctx->pix_fmt; > + if (pix_fmt == AV_PIX_FMT_P010) { > + color_depth = AMF_COLOR_BIT_DEPTH_10; > + } > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_COLOR_BIT_DEPTH, color_depth); > + if (color_depth == AMF_COLOR_BIT_DEPTH_8) { > + /// Color Transfer Characteristics (AMF matches ISO/IEC) > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709); > + /// Color Primaries (AMF matches ISO/IEC) > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT709); > + } else { > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084); > + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT2020); > + } > + > // Picture control properties > AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, ctx->gops_per_idr); > AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, avctx->gop_size); _______________________________________________ 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".