virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avfilter/af_ladspa: compensate output pts if latency compensation is on

Browse Source
This commit is contained in:
Paul B Mahol 2022-04-06 16:54:03 +02:00
parent fb88809063
commit 4fbf3c828b
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavfilter/af_ladspa.c
View File

@ -62,6 +62,8 @@ typedef struct LADSPAContext {
int sample_rate; int sample_rate;
int nb_samples; int nb_samples;
int64_t next_in_pts;
int64_t next_out_pts;
int64_t pts; int64_t pts;
int64_t duration; int64_t duration;
int in_trim; int in_trim;
@ -164,6 +166,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
LADSPAContext *s = ctx->priv; LADSPAContext *s = ctx->priv;
AVFrame *out; AVFrame *out;
int i, h, p, new_out_samples; int i, h, p, new_out_samples;
int64_t out_duration;
int64_t in_duration;
int64_t in_pts;
av_assert0(in->ch_layout.nb_channels == (s->nb_inputs * s->nb_handles)); av_assert0(in->ch_layout.nb_channels == (s->nb_inputs * s->nb_handles));
@ -205,6 +210,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
for (i = 0; i < s->nb_outputcontrols; i++) for (i = 0; i < s->nb_outputcontrols; i++)
print_ctl_info(ctx, AV_LOG_VERBOSE, s, i, s->ocmap, s->octlv, 1); print_ctl_info(ctx, AV_LOG_VERBOSE, s, i, s->ocmap, s->octlv, 1);
in_duration = av_rescale_q(in->nb_samples, inlink->time_base, av_make_q(1, in->sample_rate));
in_pts = in->pts;
if (out != in) if (out != in)
av_frame_free(&in); av_frame_free(&in);
@ -214,6 +221,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
new_out_samples -= trim; new_out_samples -= trim;
s->in_trim -= trim; s->in_trim -= trim;
out->nb_samples = new_out_samples;
} }
if (new_out_samples <= 0) { if (new_out_samples <= 0) {
@ -227,6 +235,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
out->nb_samples = new_out_samples; out->nb_samples = new_out_samples;
} }
out_duration = av_rescale_q(out->nb_samples, inlink->time_base, av_make_q(1, out->sample_rate));
if (s->next_out_pts != AV_NOPTS_VALUE && out->pts != s->next_out_pts &&
s->next_in_pts != AV_NOPTS_VALUE && out->pts == s->next_in_pts) {
out->pts = s->next_out_pts;
} else {
out->pts = in_pts;
}
s->next_in_pts = in_pts + in_duration;
s->next_out_pts = out->pts + out_duration;
return ff_filter_frame(ctx->outputs[0], out); return ff_filter_frame(ctx->outputs[0], out);
} }
@ -247,6 +265,7 @@ static int request_frame(AVFilterLink *outlink)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->out_pad -= frame->nb_samples; s->out_pad -= frame->nb_samples;
frame->pts = s->next_in_pts;
return filter_frame(ctx->inputs[0], frame); return filter_frame(ctx->inputs[0], frame);
} }
return ret; return ret;
@ -654,6 +673,9 @@ static av_cold int init(AVFilterContext *ctx)
av_log(ctx, AV_LOG_DEBUG, "input controls: %lu output controls: %lu\n", av_log(ctx, AV_LOG_DEBUG, "input controls: %lu output controls: %lu\n",
s->nb_inputcontrols, s->nb_outputcontrols); s->nb_inputcontrols, s->nb_outputcontrols);
s->next_out_pts = AV_NOPTS_VALUE;
s->next_in_pts = AV_NOPTS_VALUE;
return 0; return 0;
} }