diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-01-05 10:05:14 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-01-05 10:07:59 +0100 |
| commit | c31fa1d7b44c55d8491b7e6ebe8615289aadec69 (patch) | |
| tree | b2afd4ec26792bd046096b7638aaec66442db74d /libavfilter/avf_showspectrum.c | |
| parent | 0d3b31ae898f7bb8fbadd339ceda72cab1d75900 (diff) | |
avfilter/avf_showspectrum: use av_clip/lrintf
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/avf_showspectrum.c')
| -rw-r--r-- | libavfilter/avf_showspectrum.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 02f6fadb81..0604f29bef 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -595,7 +595,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) a = pow(a, 0.20); break; case LOG: - a = 1 + log10(FFMAX(FFMIN(1, a * w), 1e-6)) / 6; // zero = -120dBFS + a = 1 + log10(av_clipd(a * w, 1e-6, 1)) / 6; // zero = -120dBFS break; default: av_assert0(0); @@ -632,7 +632,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) (outlink->h - 1) * outpicref->linesize[plane] + s->xpos; for (y = 0; y < outlink->h; y++) { - *p = lrint(FFMAX(0, FFMIN(s->combine_buffer[3 * y + plane], 255))); + *p = lrintf(av_clipf(s->combine_buffer[3 * y + plane], 0, 255)); p -= outpicref->linesize[plane]; } } @@ -660,7 +660,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) uint8_t *p = outpicref->data[plane] + s->xpos * outpicref->linesize[plane]; for (x = 0; x < outlink->w; x++) { - *p = lrint(FFMAX(0, FFMIN(s->combine_buffer[3 * x + plane], 255))); + *p = lrintf(av_clipf(s->combine_buffer[3 * x + plane], 0, 255)); p++; } } |