Commit 13ea7c97 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/avf_showspectrum: improve pts handling

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 817bf848
...@@ -793,7 +793,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) ...@@ -793,7 +793,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
ShowSpectrumContext *s = ctx->priv; ShowSpectrumContext *s = ctx->priv;
AVFrame *fin = NULL; AVFrame *fin = NULL;
int ret = 0; int ret = 0, consumed = 0;
if (s->pts == AV_NOPTS_VALUE)
s->pts = insamples->pts - av_audio_fifo_size(s->fifo);
av_audio_fifo_write(s->fifo, (void **)insamples->extended_data, insamples->nb_samples); av_audio_fifo_write(s->fifo, (void **)insamples->extended_data, insamples->nb_samples);
av_frame_free(&insamples); av_frame_free(&insamples);
...@@ -804,8 +807,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) ...@@ -804,8 +807,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
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;
...@@ -826,6 +829,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) ...@@ -826,6 +829,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
} }
fail: fail:
s->pts = AV_NOPTS_VALUE;
av_frame_free(&fin); av_frame_free(&fin);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment