From patchwork Thu Jul 20 16:17:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42860 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c512:b0:130:ccc6:6c4b with SMTP id gm18csp12860pzb; Thu, 20 Jul 2023 09:59:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlHwUihb3iqirFPNYWSIHllEfCUpWVptaYptE8ZNvVnpwVTCH0yplXzPY5mrmlFhdUFLfjPR X-Received: by 2002:a17:906:74c6:b0:993:eee4:e704 with SMTP id z6-20020a17090674c600b00993eee4e704mr5658341ejl.38.1689872372467; Thu, 20 Jul 2023 09:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689872372; cv=none; d=google.com; s=arc-20160816; b=Q5k3NgdoAhjiDF/s4WdAeYHpyPjqVIibTpliP+9K4b9P7mzM2L2ug31vay0VE19glR jqYxNZoGNm0BJLToajk06XjxYaIoSiasnbmuQOmEg1yfm2W2SUqL64a94bxXnTakf2ok RoqxGvYcRCtgIbTYU8wizIFQKXfjb/KhMXUOimjPWgQKJqLcdtJxA+bApVGa6x0YHJBl sXs8uSLgKSMnTakgV/Nm1qyMIXzsp6mV6G6NA24OTwVYp/aXlX6fO3L612W8+QtWBTFg WVpgpq1tSvOCY4lwaGVGEqdNcitYpAGPWfayLWKYYpq/XcG3w8a7N7QFkGCfq9yTTxrR b5Qg== 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=KrzizfJZQbLNyi4nzayLAP9m1GvXP/j63KY9BCPbI44=; fh=Ndx/gRzOmdOyvgGXHQQArUxv5ev+C0gUgbsopzrG/lI=; b=HHMG1O/51xChVbTM46HdCQwC5tjuI6JLllaYe341NVCP3knbuR1uZL55yI8e2niT6G VIJIi6dikvzAt2CXy2uTqF1DBLn2CmnM7+zPpTDVc0vDVqrvz7qT4uqVeuyR24XuYIRT 1TuqjZ3zLgiA/MRcsZ3/RbgezKkfyOqWVJxIAKqNVRO+OVZy0qa9og1cJnZ9sFjJj/A+ MjyZf+Q//UoVQJVH7y6BTtaa7a+9926CW71THQNBXzDRIgzZoIDuunLT6YKIG4VOwwkF vhpNqI2pIDJVrkTt2XqfLS9XD+VXqDyjyq4f+ogT5Nryj7/lsfbMFuBGS4+geyvcPi27 KAoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=CELlkS5U; 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 e15-20020a170906374f00b0098cda9c19f0si740155ejc.762.2023.07.20.09.59.31; Thu, 20 Jul 2023 09:59:32 -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=CELlkS5U; 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 C0F5168C385; Thu, 20 Jul 2023 19:59:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D46068BF90 for ; Thu, 20 Jul 2023 19:59:21 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3fbab0d0b88so14058555e9.0 for ; Thu, 20 Jul 2023 09:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689872360; x=1690477160; 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=8amCU90cw608/vHktAFraFsy6uWoCuJAdRlHWKdAS88=; b=CELlkS5Uhpm803JehQz1ODo0kusft+pHrn8tbDlQqZGL9ZVyxFZars9pUtuOdqYEHM kMpDX8Vwc1cnDREV0zmtIJImZw3/MABtQwo4zZLZF8tIIZACxJpM+Q0U43CrrV9QcqW8 ml+jDA5GYwzmZx924w8A+yck/BEiZHTzEqa1fVccfzxM+ZKi0FC29Nnj4Xato360lDu/ URrrRdnYBrahjGMBhPq7EjsqyE5trHqZNMthEpqpQEeWXV8wM6nYlVvuBYO1t79NM2Zu EaEkxVl4T+yM3tQUCU6Ip6CSgdH1xx1lXPBXhQ7rmI7G50RoXVH0PRfdnahv+gd6SM/R sa0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689872360; x=1690477160; 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=8amCU90cw608/vHktAFraFsy6uWoCuJAdRlHWKdAS88=; b=ELXpyl2z9HKI8kKwVnyvPdQJMxlBK5AKjb98+M3Go9am41p2rWXRcCLUvOMxLcqUkV LJKEUrbCibillyIjHI2KbI2PE71wpZqKCK4qv9hkqdYlfqlLWDibOWZA1PO88k9rwvkO qgJKT2nQog4F9PAuqiBfY7Pem4qHRAkX4Zo34oNvBAya+Gw2V/5VunTal2ylq9faq0uC m/kTsapiUgH9HtPo6TGmNr3RzH5hXwVc42eJ+FyT4SvCc1nKPS35dNorDSBTze8UXr5i 4eXigp1RsoRg7j3zADqjUWdRvKXCHOYrzWcjdOqHLj9ja/5qFhKdnXjWQK901B+FK/B/ lW5Q== X-Gm-Message-State: ABy/qLaTXJJR900ZFsqNjei9VTjohXjO1cKstWjCEmrqRksPTrCjQVzy nLZfRLlSodQlaaqu7rqWcu6WW2rNUkEolZittNI= X-Received: by 2002:a1c:7c03:0:b0:3fb:acbe:da5d with SMTP id x3-20020a1c7c03000000b003fbacbeda5dmr4949773wmc.4.1689872359767; Thu, 20 Jul 2023 09:59:19 -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 y13-20020a05600c364d00b003fbb25da65bsm1589486wmq.30.2023.07.20.09.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 09:59:19 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 18:17:00 +0200 Message-ID: <20230720161720.25851-1-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720153351.25796-2-lucenticus@gmail.com> References: <20230720153351.25796-2-lucenticus@gmail.com> 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: IIrVlu8/Jenc This commit adds option for enabling SmartAccess Video (SAV) in AMF encoders. SAV is an 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);