diff options
| -rw-r--r-- | DOCS/man/en/af.rst | 9 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libaf/af.c | 4 | ||||
| -rw-r--r-- | libaf/af_comp.c | 168 | ||||
| -rw-r--r-- | libaf/af_gate.c | 164 |
5 files changed, 0 insertions, 347 deletions
diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst index 0f1f10d9b8..dc0450241f 100644 --- a/DOCS/man/en/af.rst +++ b/DOCS/man/en/af.rst @@ -465,15 +465,6 @@ ladspa=file:label[:controls...] available controls and their valid ranges are printed. This eliminates the use of 'analyseplugin' from the LADSPA SDK. -comp - Compressor/expander filter usable for microphone input. Prevents artifacts - on very loud sound and raises the volume on very low sound. This filter is - untested, maybe even unusable. - -gate - Noise gate filter similar to the comp audio filter. This filter is - untested, maybe even unusable. - karaoke Simple voice removal filter exploiting the fact that voice is usually recorded with mono gear and later 'center' mixed onto the final audio @@ -208,13 +208,11 @@ SRCS_COMMON = asxparser.c \ libaf/af.c \ libaf/af_center.c \ libaf/af_channels.c \ - libaf/af_comp.c \ libaf/af_delay.c \ libaf/af_dummy.c \ libaf/af_equalizer.c \ libaf/af_extrastereo.c \ libaf/af_format.c \ - libaf/af_gate.c \ libaf/af_hrtf.c \ libaf/af_karaoke.c \ libaf/af_lavcac3enc.c \ diff --git a/libaf/af.c b/libaf/af.c index e4015727ac..0bc783e49c 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -32,8 +32,6 @@ extern af_info_t af_info_format; extern af_info_t af_info_resample; extern af_info_t af_info_volume; extern af_info_t af_info_equalizer; -extern af_info_t af_info_gate; -extern af_info_t af_info_comp; extern af_info_t af_info_pan; extern af_info_t af_info_surround; extern af_info_t af_info_sub; @@ -60,8 +58,6 @@ static af_info_t* filter_list[]={ &af_info_resample, &af_info_volume, &af_info_equalizer, - &af_info_gate, - &af_info_comp, &af_info_pan, &af_info_surround, &af_info_sub, diff --git a/libaf/af_comp.c b/libaf/af_comp.c deleted file mode 100644 index db88dade5a..0000000000 --- a/libaf/af_comp.c +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (C) 2002 Anders Johansson ajh@atri.curtin.edu.au - * - * This file is part of MPlayer. - * - * MPlayer 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. - * - * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include <inttypes.h> -#include <math.h> -#include <limits.h> - -#include "af.h" - -// Data for specific instances of this filter -typedef struct af_comp_s -{ - int enable[AF_NCH]; // Enable/disable / channel - float time[AF_NCH]; // Forgetting factor for power estimate - float pow[AF_NCH]; // Estimated power level [dB] - float tresh[AF_NCH]; // Threshold [dB] - int attack[AF_NCH]; // Attack time [ms] - int release[AF_NCH]; // Release time [ms] - float ratio[AF_NCH]; // Compression ratio -}af_comp_t; - -// Initialization and runtime control -static int control(struct af_instance_s* af, int cmd, void* arg) -{ - af_comp_t* s = (af_comp_t*)af->setup; - int i; - - switch(cmd){ - case AF_CONTROL_REINIT: - // Sanity check - if(!arg) return AF_ERROR; - - af->data->rate = ((af_data_t*)arg)->rate; - af->data->nch = ((af_data_t*)arg)->nch; - af->data->format = AF_FORMAT_FLOAT_NE; - af->data->bps = 4; - - // Time constant set to 0.1s - // s->alpha = (1.0/0.2)/(2.0*M_PI*(float)((af_data_t*)arg)->rate); - return af_test_output(af,(af_data_t*)arg); - case AF_CONTROL_COMMAND_LINE:{ -/* float v=-10.0; */ -/* float vol[AF_NCH]; */ -/* float s=0.0; */ -/* float clipp[AF_NCH]; */ -/* int i; */ -/* sscanf((char*)arg,"%f:%f", &v, &s); */ -/* for(i=0;i<AF_NCH;i++){ */ -/* vol[i]=v; */ -/* clipp[i]=s; */ -/* } */ -/* if(AF_OK != control(af,AF_CONTROL_VOLUME_SOFTCLIP | AF_CONTROL_SET, clipp)) */ -/* return AF_ERROR; */ -/* return control(af,AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, vol); */ - } - case AF_CONTROL_COMP_ON_OFF | AF_CONTROL_SET: - memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int)); - return AF_OK; - case AF_CONTROL_COMP_ON_OFF | AF_CONTROL_GET: - memcpy((int*)arg,s->enable,AF_NCH*sizeof(int)); - return AF_OK; - case AF_CONTROL_COMP_THRESH | AF_CONTROL_SET: - return af_from_dB(AF_NCH,(float*)arg,s->tresh,20.0,-60.0,-1.0); - case AF_CONTROL_COMP_THRESH | AF_CONTROL_GET: - return af_to_dB(AF_NCH,s->tresh,(float*)arg,10.0); - case AF_CONTROL_COMP_ATTACK | AF_CONTROL_SET: - return af_from_ms(AF_NCH,(float*)arg,s->attack,af->data->rate,500.0,0.1); - case AF_CONTROL_COMP_ATTACK | AF_CONTROL_GET: - return af_to_ms(AF_NCH,s->attack,(float*)arg,af->data->rate); - case AF_CONTROL_COMP_RELEASE | AF_CONTROL_SET: - return af_from_ms(AF_NCH,(float*)arg,s->release,af->data->rate,3000.0,10.0); - case AF_CONTROL_COMP_RELEASE | AF_CONTROL_GET: - return af_to_ms(AF_NCH,s->release,(float*)arg,af->data->rate); - case AF_CONTROL_COMP_RATIO | AF_CONTROL_SET: - for(i=0;i<AF_NCH;i++) - s->ratio[i] = clamp(((float*)arg)[i],1.0,10.0); - return AF_OK; - case AF_CONTROL_COMP_RATIO | AF_CONTROL_GET: - for(i=0;i<AF_NCH;i++) - ((float*)arg)[i] = s->ratio[i]; - return AF_OK; - } - return AF_UNKNOWN; -} - -// Deallocate memory -static void uninit(struct af_instance_s* af) -{ - free(af->data); - free(af->setup); -} - -// Filter data through filter -static af_data_t* play(struct af_instance_s* af, af_data_t* data) -{ - af_data_t* c = data; // Current working data - af_comp_t* s = (af_comp_t*)af->setup; // Setup for this instance - float* a = (float*)c->audio; // Audio data - int len = c->len/4; // Number of samples - int ch = 0; // Channel counter - register int nch = c->nch; // Number of channels - register int i = 0; - - // Compress/expand - for(ch = 0; ch < nch ; ch++){ - if(s->enable[ch]){ - float t = 1.0 - s->time[ch]; - for(i=ch;i<len;i+=nch){ - register float x = a[i]; - register float pow = x*x; - s->pow[ch] = t*s->pow[ch] + - pow*s->time[ch]; // LP filter - if(pow < s->pow[ch]){ - ; - } - else{ - ; - } - a[i] = x; - } - } - } - return c; -} - -// Allocate memory and set function pointers -static int af_open(af_instance_t* af){ - af->control=control; - af->uninit=uninit; - af->play=play; - af->mul=1; - af->data=calloc(1,sizeof(af_data_t)); - af->setup=calloc(1,sizeof(af_comp_t)); - if(af->data == NULL || af->setup == NULL) - return AF_ERROR; - return AF_OK; -} - -// Description of this filter -af_info_t af_info_comp = { - "Compressor/expander audio filter", - "comp", - "Anders", - "", - AF_FLAGS_NOT_REENTRANT, - af_open -}; diff --git a/libaf/af_gate.c b/libaf/af_gate.c deleted file mode 100644 index 30ed20a1be..0000000000 --- a/libaf/af_gate.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (C) 2002 Anders Johansson ajh@atri.curtin.edu.au - * - * This file is part of MPlayer. - * - * MPlayer 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. - * - * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include <inttypes.h> -#include <math.h> -#include <limits.h> - -#include "af.h" - -// Data for specific instances of this filter -typedef struct af_gate_s -{ - int enable[AF_NCH]; // Enable/disable / channel - float time[AF_NCH]; // Forgetting factor for power estimate - float pow[AF_NCH]; // Estimated power level [dB] - float tresh[AF_NCH]; // Threshold [dB] - int attack[AF_NCH]; // Attack time [ms] - int release[AF_NCH]; // Release time [ms] - float range[AF_NCH]; // Range level [dB] -}af_gate_t; - -// Initialization and runtime control -static int control(struct af_instance_s* af, int cmd, void* arg) -{ - af_gate_t* s = (af_gate_t*)af->setup; - switch(cmd){ - case AF_CONTROL_REINIT: - // Sanity check - if(!arg) return AF_ERROR; - - af->data->rate = ((af_data_t*)arg)->rate; - af->data->nch = ((af_data_t*)arg)->nch; - af->data->format = AF_FORMAT_FLOAT_NE; - af->data->bps = 4; - - // Time constant set to 0.1s - // s->alpha = (1.0/0.2)/(2.0*M_PI*(float)((af_data_t*)arg)->rate); - return af_test_output(af,(af_data_t*)arg); - case AF_CONTROL_COMMAND_LINE:{ -/* float v=-10.0; */ -/* float vol[AF_NCH]; */ -/* float s=0.0; */ -/* float clipp[AF_NCH]; */ -/* int i; */ -/* sscanf((char*)arg,"%f:%f", &v, &s); */ -/* for(i=0;i<AF_NCH;i++){ */ -/* vol[i]=v; */ -/* clipp[i]=s; */ -/* } */ -/* if(AF_OK != control(af,AF_CONTROL_VOLUME_SOFTCLIP | AF_CONTROL_SET, clipp)) */ -/* return AF_ERROR; */ -/* return control(af,AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, vol); */ - } - - case AF_CONTROL_GATE_ON_OFF | AF_CONTROL_SET: - memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int)); - return AF_OK; - case AF_CONTROL_GATE_ON_OFF | AF_CONTROL_GET: - memcpy((int*)arg,s->enable,AF_NCH*sizeof(int)); - return AF_OK; - case AF_CONTROL_GATE_THRESH | AF_CONTROL_SET: - return af_from_dB(AF_NCH,(float*)arg,s->tresh,20.0,-60.0,-1.0); - case AF_CONTROL_GATE_THRESH | AF_CONTROL_GET: - return af_to_dB(AF_NCH,s->tresh,(float*)arg,10.0); - case AF_CONTROL_GATE_ATTACK | AF_CONTROL_SET: - return af_from_ms(AF_NCH,(float*)arg,s->attack,af->data->rate,500.0,0.1); - case AF_CONTROL_GATE_ATTACK | AF_CONTROL_GET: - return af_to_ms(AF_NCH,s->attack,(float*)arg,af->data->rate); - case AF_CONTROL_GATE_RELEASE | AF_CONTROL_SET: - return af_from_ms(AF_NCH,(float*)arg,s->release,af->data->rate,3000.0,10.0); - case AF_CONTROL_GATE_RELEASE | AF_CONTROL_GET: - return af_to_ms(AF_NCH,s->release,(float*)arg,af->data->rate); - case AF_CONTROL_GATE_RANGE | AF_CONTROL_SET: - return af_from_dB(AF_NCH,(float*)arg,s->range,20.0,100.0,0.0); - case AF_CONTROL_GATE_RANGE | AF_CONTROL_GET: - return af_to_dB(AF_NCH,s->range,(float*)arg,10.0); - } - return AF_UNKNOWN; -} - -// Deallocate memory -static void uninit(struct af_instance_s* af) -{ - free(af->data); - free(af->setup); -} - -// Filter data through filter -static af_data_t* play(struct af_instance_s* af, af_data_t* data) -{ - af_data_t* c = data; // Current working data - af_gate_t* s = (af_gate_t*)af->setup; // Setup for this instance - float* a = (float*)c->audio; // Audio data - int len = c->len/4; // Number of samples - int ch = 0; // Channel counter - register int nch = c->nch; // Number of channels - register int i = 0; - - - // Noise gate - for(ch = 0; ch < nch ; ch++){ - if(s->enable[ch]){ - float t = 1.0 - s->time[ch]; - for(i=ch;i<len;i+=nch){ - register float x = a[i]; - register float pow = x*x; - s->pow[ch] = t*s->pow[ch] + - pow*s->time[ch]; // LP filter - if(pow < s->pow[ch]){ - ; - } - else{ - ; - } - a[i] = x; - } - } - } - return c; -} - -// Allocate memory and set function pointers -static int af_open(af_instance_t* af){ - af->control=control; - af->uninit=uninit; - af->play=play; - af->mul=1; - af->data=calloc(1,sizeof(af_data_t)); - af->setup=calloc(1,sizeof(af_gate_t)); - if(af->data == NULL || af->setup == NULL) - return AF_ERROR; - return AF_OK; -} - -// Description of this filter -af_info_t af_info_gate = { - "Noise gate audio filter", - "gate", - "Anders", - "", - AF_FLAGS_NOT_REENTRANT, - af_open -}; |