highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/af_silenceremove: prefer outlink instead of inlink

Browse Source
This commit is contained in:
Paul B Mahol 2018-10-15 16:09:24 +02:00
parent 346b23237b
commit a853623681
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libavfilter/af_silenceremove.c
View File

@ -321,31 +321,31 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
switch (s->mode) { switch (s->mode) {
case SILENCE_TRIM: case SILENCE_TRIM:
silence_trim: silence_trim:
nbs = in->nb_samples - nb_samples_read / inlink->channels; nbs = in->nb_samples - nb_samples_read / outlink->channels;
if (!nbs) if (!nbs)
break; break;
for (i = 0; i < nbs; i++) { for (i = 0; i < nbs; i++) {
if (s->start_mode) { if (s->start_mode) {
threshold = 0; threshold = 0;
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
threshold |= s->compute(s, ibuf[j]) > s->start_threshold; threshold |= s->compute(s, ibuf[j]) > s->start_threshold;
} }
} else { } else {
threshold = 1; threshold = 1;
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
threshold &= s->compute(s, ibuf[j]) > s->start_threshold; threshold &= s->compute(s, ibuf[j]) > s->start_threshold;
} }
} }
if (threshold) { if (threshold) {
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
s->update(s, *ibuf); s->update(s, *ibuf);
s->start_holdoff[s->start_holdoff_end++] = *ibuf++; s->start_holdoff[s->start_holdoff_end++] = *ibuf++;
} }
nb_samples_read += inlink->channels; nb_samples_read += outlink->channels;
if (s->start_holdoff_end >= s->start_duration * inlink->channels) { if (s->start_holdoff_end >= s->start_duration * outlink->channels) {
if (++s->start_found_periods >= s->start_periods) { if (++s->start_found_periods >= s->start_periods) {
s->mode = SILENCE_TRIM_FLUSH; s->mode = SILENCE_TRIM_FLUSH;
goto silence_trim_flush; goto silence_trim_flush;
@ -359,19 +359,19 @@ silence_trim:
} else { } else {
s->start_holdoff_end = 0; s->start_holdoff_end = 0;
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
s->update(s, ibuf[j]); s->update(s, ibuf[j]);
if (s->start_silence) { if (s->start_silence) {
s->start_silence_hold[s->start_silence_offset++] = ibuf[j]; s->start_silence_hold[s->start_silence_offset++] = ibuf[j];
s->start_silence_end = FFMIN(s->start_silence_end + 1, inlink->channels * s->start_silence); s->start_silence_end = FFMIN(s->start_silence_end + 1, outlink->channels * s->start_silence);
if (s->start_silence_offset >= inlink->channels * s->start_silence) { if (s->start_silence_offset >= outlink->channels * s->start_silence) {
s->start_silence_offset = 0; s->start_silence_offset = 0;
} }
} }
} }
ibuf += inlink->channels; ibuf += outlink->channels;
nb_samples_read += inlink->channels; nb_samples_read += outlink->channels;
} }
} }
break; break;
@ -379,11 +379,11 @@ silence_trim:
case SILENCE_TRIM_FLUSH: case SILENCE_TRIM_FLUSH:
silence_trim_flush: silence_trim_flush:
nbs = s->start_holdoff_end - s->start_holdoff_offset; nbs = s->start_holdoff_end - s->start_holdoff_offset;
nbs -= nbs % inlink->channels; nbs -= nbs % outlink->channels;
if (!nbs) if (!nbs)
break; break;
out = ff_get_audio_buffer(inlink, nbs / inlink->channels + s->start_silence_end / inlink->channels); out = ff_get_audio_buffer(outlink, nbs / outlink->channels + s->start_silence_end / outlink->channels);
if (!out) { if (!out) {
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -428,11 +428,11 @@ silence_trim_flush:
case SILENCE_COPY: case SILENCE_COPY:
silence_copy: silence_copy:
nbs = in->nb_samples - nb_samples_read / inlink->channels; nbs = in->nb_samples - nb_samples_read / outlink->channels;
if (!nbs) if (!nbs)
break; break;
out = ff_get_audio_buffer(inlink, nbs); out = ff_get_audio_buffer(outlink, nbs);
if (!out) { if (!out) {
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -443,12 +443,12 @@ silence_copy:
for (i = 0; i < nbs; i++) { for (i = 0; i < nbs; i++) {
if (s->stop_mode) { if (s->stop_mode) {
threshold = 0; threshold = 0;
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
threshold |= s->compute(s, ibuf[j]) > s->stop_threshold; threshold |= s->compute(s, ibuf[j]) > s->stop_threshold;
} }
} else { } else {
threshold = 1; threshold = 1;
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
threshold &= s->compute(s, ibuf[j]) > s->stop_threshold; threshold &= s->compute(s, ibuf[j]) > s->stop_threshold;
} }
} }
@ -458,28 +458,28 @@ silence_copy:
flush(s, out, outlink, &nb_samples_written, &ret, 0); flush(s, out, outlink, &nb_samples_written, &ret, 0);
goto silence_copy_flush; goto silence_copy_flush;
} else if (threshold) { } else if (threshold) {
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
s->update(s, *ibuf); s->update(s, *ibuf);
*obuf++ = *ibuf++; *obuf++ = *ibuf++;
} }
nb_samples_read += inlink->channels; nb_samples_read += outlink->channels;
nb_samples_written += inlink->channels; nb_samples_written += outlink->channels;
} else if (!threshold) { } else if (!threshold) {
for (j = 0; j < inlink->channels; j++) { for (j = 0; j < outlink->channels; j++) {
s->update(s, *ibuf); s->update(s, *ibuf);
if (s->stop_silence) { if (s->stop_silence) {
s->stop_silence_hold[s->stop_silence_offset++] = *ibuf; s->stop_silence_hold[s->stop_silence_offset++] = *ibuf;
s->stop_silence_end = FFMIN(s->stop_silence_end + 1, inlink->channels * s->stop_silence); s->stop_silence_end = FFMIN(s->stop_silence_end + 1, outlink->channels * s->stop_silence);
if (s->stop_silence_offset >= inlink->channels * s->stop_silence) { if (s->stop_silence_offset >= outlink->channels * s->stop_silence) {
s->stop_silence_offset = 0; s->stop_silence_offset = 0;
} }
} }
s->stop_holdoff[s->stop_holdoff_end++] = *ibuf++; s->stop_holdoff[s->stop_holdoff_end++] = *ibuf++;
} }
nb_samples_read += inlink->channels; nb_samples_read += outlink->channels;
if (s->stop_holdoff_end >= s->stop_duration * inlink->channels) { if (s->stop_holdoff_end >= s->stop_duration * outlink->channels) {
if (++s->stop_found_periods >= s->stop_periods) { if (++s->stop_found_periods >= s->stop_periods) {
s->stop_holdoff_offset = 0; s->stop_holdoff_offset = 0;
s->stop_holdoff_end = 0; s->stop_holdoff_end = 0;
@ -509,7 +509,7 @@ silence_copy:
} }
flush(s, out, outlink, &nb_samples_written, &ret, 0); flush(s, out, outlink, &nb_samples_written, &ret, 0);
} else { } else {
memcpy(obuf, ibuf, sizeof(double) * nbs * inlink->channels); memcpy(obuf, ibuf, sizeof(double) * nbs * outlink->channels);
out->pts = s->next_pts; out->pts = s->next_pts;
s->next_pts += av_rescale_q(out->nb_samples, s->next_pts += av_rescale_q(out->nb_samples,
@ -523,11 +523,11 @@ silence_copy:
case SILENCE_COPY_FLUSH: case SILENCE_COPY_FLUSH:
silence_copy_flush: silence_copy_flush:
nbs = s->stop_holdoff_end - s->stop_holdoff_offset; nbs = s->stop_holdoff_end - s->stop_holdoff_offset;
nbs -= nbs % inlink->channels; nbs -= nbs % outlink->channels;
if (!nbs) if (!nbs)
break; break;
out = ff_get_audio_buffer(inlink, nbs / inlink->channels); out = ff_get_audio_buffer(outlink, nbs / outlink->channels);
if (!out) { if (!out) {
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);