Unified · Split
| @@ -561,11 +561,6 @@ static void flush(SilenceRemoveContext *s, · 560 unmodified lines | |||
| 561 | if (*nb_samples_written) { | 561 | if (*nb_samples_written) { |
| 562 | out->nb_samples = *nb_samples_written; | 562 | out->nb_samples = *nb_samples_written; |
| 563 | 563 | ||
| 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 | |||
| 569 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); | 564 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); |
| 570 | *nb_samples_written = 0; | 565 | *nb_samples_written = 0; |
| 571 | } | 566 | } |
| @@ -596,11 +591,6 @@ static void flush(SilenceRemoveContext *s, · 24 unmodified lines | |||
| 596 | s->stop_silence_offset = 0; | 591 | s->stop_silence_offset = 0; |
| 597 | s->stop_silence_end = 0; | 592 | s->stop_silence_end = 0; |
| 598 | 593 | ||
| 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 | |||
| 604 | av_audio_fifo_write(s->fifo, (void **)silence->extended_data, silence->nb_samples); | 594 | av_audio_fifo_write(s->fifo, (void **)silence->extended_data, silence->nb_samples); |
| 605 | av_frame_free(&silence); | 595 | av_frame_free(&silence); |
| 606 | } | 596 | } |
| @@ -724,11 +714,6 @@ silence_trim_flush: · 117 unmodified lines | |||
| 724 | s->start_holdoff_offset, nbs, | 714 | s->start_holdoff_offset, nbs, |
| 725 | outlink->channels, outlink->format); | 715 | outlink->channels, outlink->format); |
| 726 | 716 | ||
| 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 | |||
| 732 | s->start_holdoff_offset += nbs; | 717 | s->start_holdoff_offset += nbs; |
| 733 | 718 | ||
| 734 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); | 719 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); |
| @@ -848,11 +833,6 @@ silence_copy: · 113 unmodified lines | |||
| 848 | nb_samples_read, nbs, | 833 | nb_samples_read, nbs, |
| 849 | outlink->channels, outlink->format); | 834 | outlink->channels, outlink->format); |
| 850 | 835 | ||
| 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 | |||
| 856 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); | 836 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); |
| 857 | av_frame_free(&out); | 837 | av_frame_free(&out); |
| 858 | } | 838 | } |
| @@ -876,11 +856,6 @@ silence_copy_flush: · 17 unmodified lines | |||
| 876 | 856 | ||
| 877 | s->stop_holdoff_offset += nbs; | 857 | s->stop_holdoff_offset += nbs; |
| 878 | 858 | ||
| 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 | |||
| 884 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); | 859 | av_audio_fifo_write(s->fifo, (void **)out->extended_data, out->nb_samples); |
| 885 | av_frame_free(&out); | 860 | av_frame_free(&out); |
| 886 | 861 | ||
| @@ -909,6 +884,10 @@ silence_stop: · 22 unmodified lines | |||
| 909 | 884 | ||
| 910 | av_audio_fifo_read(s->fifo, (void **)out->extended_data, out->nb_samples); | 885 | av_audio_fifo_read(s->fifo, (void **)out->extended_data, out->nb_samples); |
| 911 | out->pts = s->next_pts; | 886 | 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 | |||
| 912 | ret = ff_filter_frame(outlink, out); | 891 | ret = ff_filter_frame(outlink, out); |
| 913 | } | 892 | } |
| 914 | 893 | ||