RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-03 11:07:41 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/avf_showfreqs/showspectrum: rename skip_samples to hop_size

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-01-18 19:38:14 +01:00
parent 0f88b3f82f
commit 4e17efd852
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/avf_showfreqs.c
View File

@ -53,7 +53,7 @@ typedef struct ShowFreqsContext {
float **avg_data; float **avg_data;
float *window_func_lut; float *window_func_lut;
float overlap; float overlap;
int skip_samples; int hop_size;
int nb_channels; int nb_channels;
int nb_freq; int nb_freq;
int win_size; int win_size;
@ -205,8 +205,8 @@ static int config_output(AVFilterLink *outlink)
ff_generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap); ff_generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap);
if (s->overlap == 1.) if (s->overlap == 1.)
s->overlap = overlap; s->overlap = overlap;
s->skip_samples = (1. - s->overlap) * s->win_size; s->hop_size = (1. - s->overlap) * s->win_size;
if (s->skip_samples < 1) { if (s->hop_size < 1) {
av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap); av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -434,14 +434,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
fin->pts = s->pts; 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); ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
ret = plot_freqs(inlink, fin); ret = plot_freqs(inlink, fin);
av_frame_free(&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) if (ret < 0)
goto fail; goto fail;
} }

10
libavfilter/avf_showspectrum.c
View File

@ -74,7 +74,7 @@ typedef struct {
double win_scale; double win_scale;
float overlap; float overlap;
float gain; float gain;
int skip_samples; int hop_size;
float *combine_buffer; ///< color combining buffer (3 * h items) float *combine_buffer; ///< color combining buffer (3 * h items)
AVAudioFifo *fifo; AVAudioFifo *fifo;
int64_t pts; 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); ff_generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap);
if (s->overlap == 1) if (s->overlap == 1)
s->overlap = overlap; s->overlap = overlap;
s->skip_samples = (1. - s->overlap) * s->win_size; s->hop_size = (1. - s->overlap) * s->win_size;
if (s->skip_samples < 1) { if (s->hop_size < 1) {
av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap); av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -805,7 +805,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
} }
fin->pts = s->pts; 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); ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
@ -820,7 +820,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
ret = plot_spectrum_column(inlink, fin); ret = plot_spectrum_column(inlink, fin);
av_frame_free(&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) if (ret < 0)
goto fail; goto fail;
} }