generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/avf_showspectrum: improve pts handling

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-02-12 17:14:30 +01:00
parent 817bf8483e
commit 13ea7c9780
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/avf_showspectrum.c
View File

@ -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)
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)
} }
fail: fail:
s->pts = AV_NOPTS_VALUE;
av_frame_free(&fin); av_frame_free(&fin);
return ret; return ret;
} }