diff options
author | wm4 <wm4@nowhere> | 2018-01-18 14:44:20 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-01-30 03:10:27 -0800 |
commit | b9f804b566c4c528714e4ec5e63675ad7ba5fefd (patch) | |
tree | 49d6fcd42ce6597a67aa2af59b7f20beb21a2e14 /audio/filter/tools.c | |
parent | 76276c92104c31ee936ba5c76a76072f09978c5f (diff) | |
download | mpv-b9f804b566c4c528714e4ec5e63675ad7ba5fefd.tar.bz2 mpv-b9f804b566c4c528714e4ec5e63675ad7ba5fefd.tar.xz |
audio: rewrite filtering glue code
Use the new filtering code for audio too.
Diffstat (limited to 'audio/filter/tools.c')
-rw-r--r-- | audio/filter/tools.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/audio/filter/tools.c b/audio/filter/tools.c deleted file mode 100644 index 4ebea64d4a..0000000000 --- a/audio/filter/tools.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <math.h> -#include <string.h> - -#include "common/common.h" -#include "af.h" - -/* Convert from ms to sample time */ -int af_from_ms(int n, float* in, int* out, int rate, float mi, float ma) -{ - int i = 0; - // Sanity check - if(!in || !out) - return AF_ERROR; - - for(i=0;i<n;i++) - out[i]=(int)((float)rate * MPCLAMP(in[i],mi,ma)/1000.0); - - return AF_OK; -} - -/* - * test if output format matches - * af: audio filter - * out: needed format, will be overwritten by available - * format if they do not match - * returns: AF_FALSE if formats do not match, AF_OK if they match - * - * compares the format, rate and nch values of af->data with out - * Note: logically, *out=*af->data always happens, because out contains the - * format only, no actual audio data or memory allocations. *out always - * contains the parameters from af->data after the function returns. - */ -int af_test_output(struct af_instance* af, struct mp_audio* out) -{ - if((af->data->format != out->format) || - (af->data->bps != out->bps) || - (af->data->rate != out->rate) || - !mp_chmap_equals(&af->data->channels, &out->channels)){ - *out = *af->data; - return AF_FALSE; - } - return AF_OK; -} - -/* Soft clipping, the sound of a dream, thanks to Jon Wattes - post to Musicdsp.org */ -float af_softclip(float a) -{ - if (a >= M_PI/2) - return 1.0; - else if (a <= -M_PI/2) - return -1.0; - else - return sin(a); -} |