History

avfilter/af_silenceremove: fix regression in output frame pts

Paul B Mahol committed 5 years ago

Commit abd24ea1 parent 3bbe0c21 file · +4 −25Browse files

Unified · Split

libavfilter/af_silenceremove.c+4−25
@@ -561,11 +561,6 @@ static void flush(SilenceRemoveContext *s, · 560 unmodified lines
561561 if (*nb_samples_written) {
562562 out->nb_samples = *nb_samples_written;
563563
564− out->pts = s->next_pts;
565− s->next_pts += av_rescale_q(out->nb_samples,
566− (AVRational){1, outlink->sample_rate},
567− outlink->time_base);
568−
569564 av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
570565 *nb_samples_written = 0;
571566 }
@@ -596,11 +591,6 @@ static void flush(SilenceRemoveContext *s, · 24 unmodified lines
596591 s->stop_silence_offset = 0;
597592 s->stop_silence_end = 0;
598593
599− silence->pts = s->next_pts;
600− s->next_pts += av_rescale_q(silence->nb_samples,
601− (AVRational){1, outlink->sample_rate},
602− outlink->time_base);
603−
604594 av_audio_fifo_write(s->fifo, (void **)silence->extended_data, silence->nb_samples);
605595 av_frame_free(&silence);
606596 }
@@ -724,11 +714,6 @@ silence_trim_flush: · 117 unmodified lines
724714 s->start_holdoff_offset, nbs,
725715 outlink->channels, outlink->format);
726716
727− out->pts = s->next_pts;
728− s->next_pts += av_rescale_q(out->nb_samples,
729− (AVRational){1, outlink->sample_rate},
730− outlink->time_base);
731−
732717 s->start_holdoff_offset += nbs;
733718
734719 av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
@@ -848,11 +833,6 @@ silence_copy: · 113 unmodified lines
848833 nb_samples_read, nbs,
849834 outlink->channels, outlink->format);
850835
851− out->pts = s->next_pts;
852− s->next_pts += av_rescale_q(out->nb_samples,
853− (AVRational){1, outlink->sample_rate},
854− outlink->time_base);
855−
856836 av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
857837 av_frame_free(&out);
858838 }
@@ -876,11 +856,6 @@ silence_copy_flush: · 17 unmodified lines
876856
877857 s->stop_holdoff_offset += nbs;
878858
879− out->pts = s->next_pts;
880− s->next_pts += av_rescale_q(out->nb_samples,
881− (AVRational){1, outlink->sample_rate},
882− outlink->time_base);
883−
884859 av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples);
885860 av_frame_free(&out);
886861
@@ -909,6 +884,10 @@ silence_stop: · 22 unmodified lines
909884
910885 av_audio_fifo_read(s->fifo, (void **)out->extended_data, out->nb_samples);
911886 out->pts = s->next_pts;
887+ s->next_pts += av_rescale_q(out->nb_samples,
888+ (AVRational){1, outlink->sample_rate},
889+ outlink->time_base);
890+
912891 ret = ff_filter_frame(outlink, out);
913892 }
914893

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t