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

avfilter/af_silenceremove: fix regression in output frame pts

Browse Source
This commit is contained in:
Paul B Mahol 2021-09-09 20:20:13 +02:00
parent 3bbe0c210b
commit abd24eaf68
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavfilter/af_silenceremove.c
View File

@ -561,11 +561,6 @@ static void flush(SilenceRemoveContext *s,
if (*nb_samples_written) { if (*nb_samples_written) {
out->nb_samples = *nb_samples_written; out->nb_samples = *nb_samples_written;
out->pts = s->next_pts;
s->next_pts += av_rescale_q(out->nb_samples,
(AVRational){1, outlink->sample_rate},
outlink->time_base);
av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
*nb_samples_written = 0; *nb_samples_written = 0;
} }
@ -596,11 +591,6 @@ static void flush(SilenceRemoveContext *s,
s->stop_silence_offset = 0; s->stop_silence_offset = 0;
s->stop_silence_end = 0; s->stop_silence_end = 0;
silence->pts = s->next_pts;
s->next_pts += av_rescale_q(silence->nb_samples,
(AVRational){1, outlink->sample_rate},
outlink->time_base);
av_audio_fifo_write(s->fifo, (void **)silence->extended_data, silence->nb_samples); av_audio_fifo_write(s->fifo, (void **)silence->extended_data, silence->nb_samples);
av_frame_free(&silence); av_frame_free(&silence);
} }
@ -724,11 +714,6 @@ silence_trim_flush:
s->start_holdoff_offset, nbs, s->start_holdoff_offset, nbs,
outlink->channels, outlink->format); outlink->channels, outlink->format);
out->pts = s->next_pts;
s->next_pts += av_rescale_q(out->nb_samples,
(AVRational){1, outlink->sample_rate},
outlink->time_base);
s->start_holdoff_offset += nbs; s->start_holdoff_offset += nbs;
av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
@ -848,11 +833,6 @@ silence_copy:
nb_samples_read, nbs, nb_samples_read, nbs,
outlink->channels, outlink->format); outlink->channels, outlink->format);
out->pts = s->next_pts;
s->next_pts += av_rescale_q(out->nb_samples,
(AVRational){1, outlink->sample_rate},
outlink->time_base);
av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
av_frame_free(&out); av_frame_free(&out);
} }
@ -876,11 +856,6 @@ silence_copy_flush:
s->stop_holdoff_offset += nbs; s->stop_holdoff_offset += nbs;
out->pts = s->next_pts;
s->next_pts += av_rescale_q(out->nb_samples,
(AVRational){1, outlink->sample_rate},
outlink->time_base);
av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
av_frame_free(&out); av_frame_free(&out);
@ -909,6 +884,10 @@ silence_stop:
av_audio_fifo_read(s->fifo, (void **)out->extended_data, out->nb_samples); av_audio_fifo_read(s->fifo, (void **)out->extended_data, out->nb_samples);
out->pts = s->next_pts; out->pts = s->next_pts;
s->next_pts += av_rescale_q(out->nb_samples,
(AVRational){1, outlink->sample_rate},
outlink->time_base);
ret = ff_filter_frame(outlink, out); ret = ff_filter_frame(outlink, out);
} }