virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/af_asdr: stop recreating output timestamps

Browse Source
This commit is contained in:
Paul B Mahol
2023-08-13 02:21:42 +02:00
parent 9c694804fd
commit 37b4837584
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/af_asdr.c
View File

@@ -27,7 +27,6 @@
typedef struct AudioSDRContext { typedef struct AudioSDRContext {
int channels; int channels;
int64_t pts;
double *sum_u; double *sum_u;
double *sum_uv; double *sum_uv;
@@ -66,8 +65,7 @@ static int activate(AVFilterContext *ctx)
{ {
AudioSDRContext *s = ctx->priv; AudioSDRContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
int ret, status; int ret, status, available;
int available;
int64_t pts; int64_t pts;
FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx); FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx);
@@ -78,9 +76,10 @@ static int activate(AVFilterContext *ctx)
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
ret = ff_inlink_consume_samples(ctx->inputs[i], available, available, &s->cache[i]); ret = ff_inlink_consume_samples(ctx->inputs[i], available, available, &s->cache[i]);
if (ret > 0) { if (ret < 0) {
if (s->pts == AV_NOPTS_VALUE) av_frame_free(&s->cache[0]);
s->pts = s->cache[i]->pts; av_frame_free(&s->cache[1]);
return ret;
} }
} }
@@ -90,10 +89,6 @@ static int activate(AVFilterContext *ctx)
av_frame_free(&s->cache[1]); av_frame_free(&s->cache[1]);
out = s->cache[0]; out = s->cache[0];
out->nb_samples = available;
out->pts = av_rescale_q(s->pts, av_make_q(1, outlink->sample_rate), outlink->time_base);
out->duration = av_rescale_q(out->nb_samples, av_make_q(1, outlink->sample_rate), outlink->time_base);
s->pts += available;
s->cache[0] = NULL; s->cache[0] = NULL;
return ff_filter_frame(outlink, out); return ff_filter_frame(outlink, out);
@@ -101,7 +96,7 @@ static int activate(AVFilterContext *ctx)
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (ff_inlink_acknowledge_status(ctx->inputs[i], &status, &pts)) { if (ff_inlink_acknowledge_status(ctx->inputs[i], &status, &pts)) {
ff_outlink_set_status(outlink, status, s->pts); ff_outlink_set_status(outlink, status, pts);
return 0; return 0;
} }
} }
@@ -124,8 +119,6 @@ static int config_output(AVFilterLink *outlink)
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
AudioSDRContext *s = ctx->priv; AudioSDRContext *s = ctx->priv;
s->pts = AV_NOPTS_VALUE;
s->channels = inlink->ch_layout.nb_channels; s->channels = inlink->ch_layout.nb_channels;
s->sum_u = av_calloc(outlink->ch_layout.nb_channels, sizeof(*s->sum_u)); s->sum_u = av_calloc(outlink->ch_layout.nb_channels, sizeof(*s->sum_u));