From patchwork Thu Jul 20 15:33:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42859 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b813:b0:130:ccc6:6c4b with SMTP id fi19csp1999395pzb; Thu, 20 Jul 2023 09:12:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlH2gnlSlAOvopw1k07t4c6QgLGot056J9Vbl1xnCSg3GcatKcH+XwSJGQEZulWbcaZYRbU5 X-Received: by 2002:a17:906:6b12:b0:991:d2a8:658a with SMTP id q18-20020a1709066b1200b00991d2a8658amr2796443ejr.34.1689869527379; Thu, 20 Jul 2023 09:12:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689869527; cv=none; d=google.com; s=arc-20160816; b=zMOxSE2B64gpDjLJOKVTQpylhALYwhH/THxXoQlgwDy2qYRzZNvdQ7YjTrOrx49iM8 76YcX8Csxq/zIGpFiDwR7EYZnHbfLMgEYW05npv6jiYJSK2sPIVyglCcjiUw8zTSa5o3 zzCHIH1NS5Iylfhe7aoj1c9H/CU0FXsEwgMos4TvtG5sR1+gudi8XtCuQNi6RI9HtRPv g6MtnGqEe5dLFcuBoenic+pD7A+CfDlGhTOC6ZX7vcGDUSbqXa/hYOl36ITI75QaIMmq aV8EFYHT4KpA/XgIWl3p21j5pXL+sA7iPxVh4tRxUrvg3Cw1a/+gxBNy78HicqipwZ48 4znw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=VrUycF/SWab7Sn3fDCbNOV3oT4nzN8wcTWoCe1ipEKw=; fh=Ndx/gRzOmdOyvgGXHQQArUxv5ev+C0gUgbsopzrG/lI=; b=vSQUDTyq0FhEVODnI23bH6x8jZROYs4Ieeo5jXDgakTXI+6K2ENDmgzU+JZg9SMGxS kdRcL8TNtVFbEN60IzhzGVv7ofyXCp0qcyPY4S5WRbVdTkuwtogpRGFTEm1MWzluAG7D 6Aj8Sc6dmro/8yJckfqODhFqgmd+3ZoNb9+zKfIHZNaGhaOFQM3MgrFfBI8Pg9DT1UoB /sJBJk1odzOy0iZ7rD3duJEQxIWKlcCANhGz/uEAEtsNOqatdsCef2lza4U2ZtpWKZch /kklghi63bDAQkQuyAhWyVbNlfUYu7ONGQWuIh55cYT9ORncd+FnPww0DTvDMPghQtX7 5TKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Tmim1FFm; 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 qp25-20020a170907207900b00988698d7c35si806167ejb.944.2023.07.20.09.12.06; Thu, 20 Jul 2023 09:12:07 -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=Tmim1FFm; 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 510A768C33E; Thu, 20 Jul 2023 19:12:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB27968C16B for ; Thu, 20 Jul 2023 19:11:55 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-3fd18b1d924so7888255e9.1 for ; Thu, 20 Jul 2023 09:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689869514; x=1690474314; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6ZoDQ5Lvfup9s52qUGu7vkorv5SdTDrDFNuVL98GpMs=; b=Tmim1FFmOUv+0OHuILKxL9wZ6Fvp9qY5w72GnzD/yUNYgAE7rjp1bdWtQzlffCcq9x o6MqEqrGspquxOrguq9XoUF/IlOlj1TDqAgm36NZ4viqKrIbAp9FlcFmJ/2fPh7uISwl VktfQo6uGVpmHScl0QOHxBhLfI+IjuEzgSdoxgdh25TcmHWSJYEf6YB4Qavp/NR9cArk Q8j6SaNQMaDIo/mf5aa/FyfdCGYzJHZVDrugDa1dIVIgNaKtOINAjSeLsTWInmwLMq6s Yx+tCmSHz0fZKHfdHIUx/rKWGj+cmlOG6WyBPCdkZkFBz2pruCIpGfWGvdtLkywAOD9Q Fl9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689869514; x=1690474314; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6ZoDQ5Lvfup9s52qUGu7vkorv5SdTDrDFNuVL98GpMs=; b=ZQu6Te2AjeZTsfVlEuxMES1Cx/W+MsTnR+qH9aE2srOVyP80lfCC01W6TfLbCyBzgg TSr+sVt64utYK+/fO5UmpLGNT2hf83Dkgu7vpn+BNw4+5L1PsL/Xj4bJzLIyyvt2n72o S70IGZj0Jk+JtU7DUb4LECqYQtZ0C/xEbP4A/HTjMIaNOdWxns2MXzNbPOGq11cuE3TV je+GiWT+JPECjdcqmiKVQU/IKurgspemJl/eAziEEyp63yT0FtlnS3pcsXmxRKMmkglr 3Y2vL/gfFEcVppfcVyuk6tEQniydlKo33kcRa9rxbu0gmrvp34J06jK3p/3to6o+MlPz YA0A== X-Gm-Message-State: ABy/qLaao9gqDDjpNiGenW9IIDfXKa07E2h9AMrM9BBU7pXg0auldFDW LmgB6xWjGx2jWMPIAHJlCngyxIMivhY5T8MdEjw= X-Received: by 2002:a7b:c390:0:b0:3fc:62c:8447 with SMTP id s16-20020a7bc390000000b003fc062c8447mr2226695wmj.9.1689869513920; Thu, 20 Jul 2023 09:11:53 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (109-93-182-113.dynamic.isp.telekom.rs. [109.93.182.113]) by smtp.gmail.com with ESMTPSA id n3-20020a05600c294300b003fc01f7a42dsm1541452wmd.8.2023.07.20.09.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 09:11:53 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:33:25 +0200 Message-ID: <20230720153351.25796-2-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/amfenc: add smart access video option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lhwZNVG5MkLh This commit adds option for enabling SmartAccess Video (SAV) in AMF encoders. SmartAccess video - AMD hardware-specific feature which enables the parallelization of encode and decode streams across multiple Video Codec Engine (VCN) hardware instances. Signed-off-by: Evgeny Pavlov --- libavcodec/amfenc.h | 1 + libavcodec/amfenc_av1.c | 4 ++++ libavcodec/amfenc_h264.c | 4 ++++ libavcodec/amfenc_hevc.c | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index 2dbd378ef8..e8d66164ed 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -89,6 +89,7 @@ typedef struct AmfContext { int quality; int b_frame_delta_qp; int ref_b_frame_delta_qp; + int smart_access_video; // Dynamic options, can be set after Init() call diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 30c0a9fad2..c2c6f75266 100644 --- a/libavcodec/amfenc_av1.c +++ b/libavcodec/amfenc_av1.c @@ -104,6 +104,8 @@ static const AVOption options[] = { { "log_to_dbg", "Enable AMF logging to debug output", OFFSET(log_to_dbg), AV_OPT_TYPE_BOOL,{.i64 = 0 }, 0, 1, VE }, + { "smart_access_video", "Enable Smart Access Video", OFFSET(smart_access_video), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, VE}, + //Pre Analysis options { "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, @@ -241,6 +243,8 @@ FF_ENABLE_DEPRECATION_WARNINGS } } + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video); + // Pre-Pass, Pre-Analysis, Two-Pass if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CONSTANT_QP) { AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_PREENCODE, 0); diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 2380aa4e90..c0836b4ec2 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -136,6 +136,8 @@ static const AVOption options[] = { { "log_to_dbg", "Enable AMF logging to debug output", OFFSET(log_to_dbg) , AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "smart_access_video", "Enable Smart Access Video", OFFSET(smart_access_video), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, VE}, + //Pre Analysis options { "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, @@ -353,6 +355,8 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(ctx, AV_LOG_WARNING, "rate control mode is PEAK_CONSTRAINED_VBR but rc_max_rate is not set\n"); } + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video); + if (ctx->preanalysis != -1) { AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_PRE_ANALYSIS_ENABLE, !!((ctx->preanalysis == 0) ? false : true)); } diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index dd232cc8ac..5436583403 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -99,6 +99,8 @@ static const AVOption options[] = { { "log_to_dbg", "Enable AMF logging to debug output", OFFSET(log_to_dbg), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, + { "smart_access_video", "Enable Smart Access Video", OFFSET(smart_access_video), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, VE}, + //Pre Analysis options { "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, @@ -241,6 +243,8 @@ FF_ENABLE_DEPRECATION_WARNINGS } } + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video); + // Pre-Pass, Pre-Analysis, Two-Pass if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP) { AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_PREENCODE_ENABLE, 0);