| Message ID | 20230724112240.6999-2-lucenticus@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v2] avcodec/amfenc: add smart access video option | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Mon, Jul 24, 2023 at 1:25 PM Evgeny Pavlov <lucenticus@gmail.com> wrote: > 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 <lucenticus@gmail.com> > --- > Changes in v2: > - Enable low latency mode when smart access video explicitly enabled > - Set default value for SAV to -1 (auto) > > libavcodec/amfenc.h | 1 + > libavcodec/amfenc_av1.c | 17 +++++++++++++++++ > libavcodec/amfenc_h264.c | 17 +++++++++++++++++ > libavcodec/amfenc_hevc.c | 17 +++++++++++++++++ > 4 files changed, 52 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..d22d86ccd7 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 = -1 }, > -1, 1, VE}, > + > //Pre Analysis options > { "preanalysis", "Enable preanalysis", > OFFSET(preanalysis), > AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, > > @@ -241,6 +243,21 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > + if (ctx->smart_access_video != -1) { > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, > AMF_VIDEO_ENCODER_AV1_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video != > 0); > + if (res != AMF_OK) { > + av_log(avctx, AV_LOG_ERROR, "The Smart Access Video is not > supported by AMF.\n"); > + return AVERROR(EINVAL); > + } else { > + av_log(avctx, AV_LOG_INFO, "The Smart Access Video (%d) is > set.\n", ctx->smart_access_video); > + // Set low latency mode if Smart Access Video is enabled > + if (ctx->smart_access_video != 0) { > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, > AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE, > AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_LOWEST_LATENCY); > + av_log(avctx, AV_LOG_INFO, "The Smart Access Video set > low latency mode.\n"); > + } > + } > + } > + > // 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..de08d9a7cc 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 = -1 }, -1, 1, VE}, > + > //Pre Analysis options > { "preanalysis", "Enable preanalysis", > OFFSET(preanalysis), > AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, > > @@ -353,6 +355,21 @@ 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"); > } > > + if (ctx->smart_access_video != -1) { > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, > AMF_VIDEO_ENCODER_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video != 0); > + if (res != AMF_OK) { > + av_log(avctx, AV_LOG_ERROR, "The Smart Access Video is not > supported by AMF.\n"); > + return AVERROR(EINVAL); > + }else { > + av_log(avctx, AV_LOG_INFO, "The Smart Access Video (%d) is > set.\n", ctx->smart_access_video); > + // Set low latency mode if Smart Access Video is enabled > + if (ctx->smart_access_video != 0) { > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, > AMF_VIDEO_ENCODER_LOWLATENCY_MODE, true); > + av_log(avctx, AV_LOG_INFO, "The Smart Access Video set > low latency mode.\n"); > + } > + } > + } > + > 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..19e22923be 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 = -1 }, -1, 1, VE}, > + > //Pre Analysis options > { "preanalysis", "Enable preanalysis", > OFFSET(preanalysis), > AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, > > @@ -241,6 +243,21 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > + if (ctx->smart_access_video != -1) { > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, > AMF_VIDEO_ENCODER_HEVC_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video > != 0); > + if (res != AMF_OK) { > + av_log(avctx, AV_LOG_ERROR, "The Smart Access Video is not > supported by AMF.\n"); > + return AVERROR(EINVAL); > + } else { > + av_log(avctx, AV_LOG_INFO, "The Smart Access Video (%d) is > set.\n", ctx->smart_access_video); > + // Set low latency mode if Smart Access Video is enabled > + if (ctx->smart_access_video != 0) { > + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, > AMF_VIDEO_ENCODER_HEVC_LOWLATENCY_MODE, true); > + av_log(avctx, AV_LOG_INFO, "The Smart Access Video set > low latency mode.\n"); > + } > + } > + } > + > // 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); > -- > 2.41.0 > > Can anyone take a look at this patch please? This patch enabled Smart Access Video option, which helps to improve performance of encoding with supported AMD APU + dGPU. You can find more details about smart access video in AMF documentation: https://github.com/GPUOpen-LibrariesAndSDKs/AMF/blob/master/amf/doc/AMF_Video_Encode_API.md#229-smartaccess-video
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..d22d86ccd7 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 = -1 }, -1, 1, VE}, + //Pre Analysis options { "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, @@ -241,6 +243,21 @@ FF_ENABLE_DEPRECATION_WARNINGS } } + if (ctx->smart_access_video != -1) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video != 0); + if (res != AMF_OK) { + av_log(avctx, AV_LOG_ERROR, "The Smart Access Video is not supported by AMF.\n"); + return AVERROR(EINVAL); + } else { + av_log(avctx, AV_LOG_INFO, "The Smart Access Video (%d) is set.\n", ctx->smart_access_video); + // Set low latency mode if Smart Access Video is enabled + if (ctx->smart_access_video != 0) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE, AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_LOWEST_LATENCY); + av_log(avctx, AV_LOG_INFO, "The Smart Access Video set low latency mode.\n"); + } + } + } + // 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..de08d9a7cc 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 = -1 }, -1, 1, VE}, + //Pre Analysis options { "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, @@ -353,6 +355,21 @@ 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"); } + if (ctx->smart_access_video != -1) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video != 0); + if (res != AMF_OK) { + av_log(avctx, AV_LOG_ERROR, "The Smart Access Video is not supported by AMF.\n"); + return AVERROR(EINVAL); + }else { + av_log(avctx, AV_LOG_INFO, "The Smart Access Video (%d) is set.\n", ctx->smart_access_video); + // Set low latency mode if Smart Access Video is enabled + if (ctx->smart_access_video != 0) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_LOWLATENCY_MODE, true); + av_log(avctx, AV_LOG_INFO, "The Smart Access Video set low latency mode.\n"); + } + } + } + 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..19e22923be 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 = -1 }, -1, 1, VE}, + //Pre Analysis options { "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE }, @@ -241,6 +243,21 @@ FF_ENABLE_DEPRECATION_WARNINGS } } + if (ctx->smart_access_video != -1) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ENABLE_SMART_ACCESS_VIDEO, ctx->smart_access_video != 0); + if (res != AMF_OK) { + av_log(avctx, AV_LOG_ERROR, "The Smart Access Video is not supported by AMF.\n"); + return AVERROR(EINVAL); + } else { + av_log(avctx, AV_LOG_INFO, "The Smart Access Video (%d) is set.\n", ctx->smart_access_video); + // Set low latency mode if Smart Access Video is enabled + if (ctx->smart_access_video != 0) { + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_LOWLATENCY_MODE, true); + av_log(avctx, AV_LOG_INFO, "The Smart Access Video set low latency mode.\n"); + } + } + } + // 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);
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 <lucenticus@gmail.com> --- Changes in v2: - Enable low latency mode when smart access video explicitly enabled - Set default value for SAV to -1 (auto) libavcodec/amfenc.h | 1 + libavcodec/amfenc_av1.c | 17 +++++++++++++++++ libavcodec/amfenc_h264.c | 17 +++++++++++++++++ libavcodec/amfenc_hevc.c | 17 +++++++++++++++++ 4 files changed, 52 insertions(+)