har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/avf_showfreqs: properly handle pts

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-01-31 21:38:49 +01:00
parent 58313f2dda
commit 4ab4793c15
1 changed files with 17 additions and 2 deletions

19
libavfilter/avf_showfreqs.c

@ -154,6 +154,15 @@ static int query_formats(AVFilterContext *ctx)
return 0; return 0;
} }
static av_cold int init(AVFilterContext *ctx)
{
ShowFreqsContext *s = ctx->priv;
s->pts = AV_NOPTS_VALUE;
return 0;
}
static int config_output(AVFilterLink *outlink) static int config_output(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
@ -423,8 +432,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
ShowFreqsContext *s = ctx->priv; ShowFreqsContext *s = ctx->priv;
AVFrame *fin = NULL; AVFrame *fin = NULL;
int consumed = 0;
int ret = 0; int ret = 0;
if (s->pts == AV_NOPTS_VALUE)
s->pts = in->pts - av_audio_fifo_size(s->fifo);
av_audio_fifo_write(s->fifo, (void **)in->extended_data, in->nb_samples); av_audio_fifo_write(s->fifo, (void **)in->extended_data, in->nb_samples);
while (av_audio_fifo_size(s->fifo) >= s->win_size) { while (av_audio_fifo_size(s->fifo) >= s->win_size) {
fin = ff_get_audio_buffer(inlink, s->win_size); fin = ff_get_audio_buffer(inlink, s->win_size);
@ -433,8 +446,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
goto fail; goto fail;
} }
fin->pts = s->pts; fin->pts = s->pts + consumed;
s->pts += s->hop_size; consumed += s->hop_size;
ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size); ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
@ -447,6 +460,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
fail: fail:
s->pts = AV_NOPTS_VALUE;
av_frame_free(&fin); av_frame_free(&fin);
av_frame_free(&in); av_frame_free(&in);
return ret; return ret;
@ -491,6 +505,7 @@ static const AVFilterPad showfreqs_outputs[] = {
AVFilter ff_avf_showfreqs = { AVFilter ff_avf_showfreqs = {
.name = "showfreqs", .name = "showfreqs",
.description = NULL_IF_CONFIG_SMALL("Convert input audio to a frequencies video output."), .description = NULL_IF_CONFIG_SMALL("Convert input audio to a frequencies video output."),
.init = init,
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.priv_size = sizeof(ShowFreqsContext), .priv_size = sizeof(ShowFreqsContext),