eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-07 07:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/amfenc: avoid unnecessary output delay in low delay mode

Browse Source 
The code optimizes throughput by letting the encoder work on frame N
until frame N+1 is ready for submission, but this hurts low-delay uses
by delaying output by one frame. Don't delay output beyond what is
necessary when AV_CODEC_FLAG_LOW_DELAY is used.

Signed-off-by: Cameron Gutman <aicommander@gmail.com>
This commit is contained in:
Cameron Gutman
2025-09-08 23:41:43 -05:00
committed by Dmitrii Ovchinnikov
parent f1d5114103
commit df4587789f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/amfenc.c
View File

@@ -497,7 +497,7 @@ static int amf_submit_frame(AVCodecContext *avctx, AVFrame *frame, AMFSurface
AMF_RESULT res; AMF_RESULT res;
int ret; int ret;
int hw_surface = 0; int hw_surface = 0;
int max_b_frames = ctx->max_b_frames < 0 ? 0 : ctx->max_b_frames; int output_delay = FFMAX(ctx->max_b_frames, 0) + ((avctx->flags & AV_CODEC_FLAG_LOW_DELAY) ? 0 : 1);
// prepare surface from frame // prepare surface from frame
switch (frame->format) { switch (frame->format) {
@@ -634,8 +634,8 @@ static int amf_submit_frame(AVCodecContext *avctx, AVFrame *frame, AMFSurface
ret = av_fifo_write(ctx->timestamp_list, &frame->pts, 1); ret = av_fifo_write(ctx->timestamp_list, &frame->pts, 1);
if (ret < 0) if (ret < 0)
return ret; return ret;
if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1) if(ctx->submitted_frame <= ctx->encoded_frame + output_delay)
return AVERROR(EAGAIN); // if frame just submiited - don't poll or wait return AVERROR(EAGAIN); // too soon to poll or wait
} }
return 0; return 0;
} }
@@ -681,7 +681,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
AVFrame *frame = av_frame_alloc(); AVFrame *frame = av_frame_alloc();
int block_and_wait; int block_and_wait;
int64_t pts = 0; int64_t pts = 0;
int max_b_frames = ctx->max_b_frames < 0 ? 0 : ctx->max_b_frames; int output_delay = FFMAX(ctx->max_b_frames, 0) + ((avctx->flags & AV_CODEC_FLAG_LOW_DELAY) ? 0 : 1);
if (!ctx->encoder){ if (!ctx->encoder){
av_frame_free(&frame); av_frame_free(&frame);
@@ -700,7 +700,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
if(ret != AVERROR_EOF){ if(ret != AVERROR_EOF){
av_frame_free(&frame); av_frame_free(&frame);
if(ret == AVERROR(EAGAIN)){ if(ret == AVERROR(EAGAIN)){
if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1) // too soon to poll if(ctx->submitted_frame <= ctx->encoded_frame + output_delay) // too soon to poll
return ret; return ret;
} }
} }