Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2016-01-18 21:38:14 +0300
committerPaul B Mahol <onemda@gmail.com>2016-01-18 21:38:14 +0300
commit4e17efd852bd3d83d1b6465614fc2d44be8e3e3d (patch)
tree85ad2ef58b06787390b1a04d823aa44c7b7652f8 /libavfilter/avf_showspectrum.c
parent0f88b3f82fafd536979993aeaafcb11a22266dbd (diff)
avfilter/avf_showfreqs/showspectrum: rename skip_samples to hop_size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/avf_showspectrum.c')
-rw-r--r--libavfilter/avf_showspectrum.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
index 424d1f2f55..3efd00052e 100644
--- a/libavfilter/avf_showspectrum.c
+++ b/libavfilter/avf_showspectrum.c
@@ -74,7 +74,7 @@ typedef struct {
double win_scale;
float overlap;
float gain;
- int skip_samples;
+ int hop_size;
float *combine_buffer; ///< color combining buffer (3 * h items)
AVAudioFifo *fifo;
int64_t pts;
@@ -367,8 +367,8 @@ static int config_output(AVFilterLink *outlink)
ff_generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap);
if (s->overlap == 1)
s->overlap = overlap;
- s->skip_samples = (1. - s->overlap) * s->win_size;
- if (s->skip_samples < 1) {
+ s->hop_size = (1. - s->overlap) * s->win_size;
+ if (s->hop_size < 1) {
av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap);
return AVERROR(EINVAL);
}
@@ -805,7 +805,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
}
fin->pts = s->pts;
- s->pts += s->skip_samples;
+ s->pts += s->hop_size;
ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size);
if (ret < 0)
goto fail;
@@ -820,7 +820,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
ret = plot_spectrum_column(inlink, fin);
av_frame_free(&fin);
- av_audio_fifo_drain(s->fifo, s->skip_samples);
+ av_audio_fifo_drain(s->fifo, s->hop_size);
if (ret < 0)
goto fail;
}