summaryrefslogtreecommitdiffstats
path: root/libaf
diff options
context:
space:
mode:
Diffstat (limited to 'libaf')
-rw-r--r--libaf/af.c3
-rw-r--r--libaf/af_center.c2
-rw-r--r--libaf/af_comp.c2
-rw-r--r--libaf/af_delay.c14
-rw-r--r--libaf/af_dummy.c1
-rw-r--r--libaf/af_equalizer.c2
-rw-r--r--libaf/af_export.c19
-rw-r--r--libaf/af_extrastereo.c2
-rw-r--r--libaf/af_gate.c2
-rw-r--r--libaf/af_hrtf.c39
-rw-r--r--libaf/af_karaoke.c3
-rw-r--r--libaf/af_ladspa.c53
-rw-r--r--libaf/af_pan.c3
-rw-r--r--libaf/af_resample.c3
-rw-r--r--libaf/af_sinesuppress.c2
-rw-r--r--libaf/af_sub.c2
-rw-r--r--libaf/af_surround.c6
-rw-r--r--libaf/af_sweep.c8
-rw-r--r--libaf/af_volnorm.c2
-rw-r--r--libaf/af_volume.c2
20 files changed, 51 insertions, 119 deletions
diff --git a/libaf/af.c b/libaf/af.c
index 47eb9fa5b0..8b51eaa0d1 100644
--- a/libaf/af.c
+++ b/libaf/af.c
@@ -624,8 +624,7 @@ int af_resize_local_buffer(af_instance_t* af, af_data_t* data)
mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Reallocating memory in module %s, "
"old len = %i, new len = %i\n",af->info->name,af->data->len,len);
// If there is a buffer free it
- if(af->data->audio)
- free(af->data->audio);
+ free(af->data->audio);
// Create new buffer and check that it is OK
af->data->audio = malloc(len);
if(!af->data->audio){
diff --git a/libaf/af_center.c b/libaf/af_center.c
index d3c867c39e..1cc3626439 100644
--- a/libaf/af_center.c
+++ b/libaf/af_center.c
@@ -78,9 +78,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_comp.c b/libaf/af_comp.c
index 4999612865..db88dade5a 100644
--- a/libaf/af_comp.c
+++ b/libaf/af_comp.c
@@ -107,9 +107,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_delay.c b/libaf/af_delay.c
index 84a76c470e..f0a9704eaa 100644
--- a/libaf/af_delay.c
+++ b/libaf/af_delay.c
@@ -49,10 +49,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
int i;
// Free prevous delay queues
- for(i=0;i<af->data->nch;i++){
- if(s->q[i])
- free(s->q[i]);
- }
+ for(i=0;i<af->data->nch;i++)
+ free(s->q[i]);
af->data->rate = ((af_data_t*)arg)->rate;
af->data->nch = ((af_data_t*)arg)->nch;
@@ -112,13 +110,11 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
static void uninit(struct af_instance_s* af)
{
int i;
- if(af->data)
- free(af->data);
+
+ free(af->data);
for(i=0;i<AF_NCH;i++)
- if(((af_delay_t*)(af->setup))->q[i])
free(((af_delay_t*)(af->setup))->q[i]);
- if(af->setup)
- free(af->setup);
+ free(af->setup);
}
// Filter data through filter
diff --git a/libaf/af_dummy.c b/libaf/af_dummy.c
index 2d375924e1..ba921eb09b 100644
--- a/libaf/af_dummy.c
+++ b/libaf/af_dummy.c
@@ -41,7 +41,6 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
}
diff --git a/libaf/af_equalizer.c b/libaf/af_equalizer.c
index bd69fdec9d..318b7a72d0 100644
--- a/libaf/af_equalizer.c
+++ b/libaf/af_equalizer.c
@@ -181,9 +181,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_export.c b/libaf/af_export.c
index 780df80a93..193271b45e 100644
--- a/libaf/af_export.c
+++ b/libaf/af_export.c
@@ -73,7 +73,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
int mapsize;
// Free previous buffers
- if (s->buf && s->buf[0])
+ if (s->buf)
free(s->buf[0]);
// unmap previous area
@@ -136,8 +136,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
char *str = arg;
if (!str){
- if(s->filename)
- free(s->filename);
+ free(s->filename);
s->filename = get_path(SHARED_FILE);
return AF_OK;
@@ -146,8 +145,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
while((str[i]) && (str[i] != ':'))
i++;
- if(s->filename)
- free(s->filename);
+ free(s->filename);
s->filename = calloc(i + 1, 1);
memcpy(s->filename, str, i);
@@ -177,14 +175,12 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
*/
static void uninit( struct af_instance_s* af )
{
- if (af->data){
- free(af->data);
- af->data = NULL;
- }
+ free(af->data);
+ af->data = NULL;
if(af->setup){
af_export_t* s = af->setup;
- if (s->buf && s->buf[0])
+ if (s->buf)
free(s->buf[0]);
// Free mmaped area
@@ -194,8 +190,7 @@ static void uninit( struct af_instance_s* af )
if(s->fd > -1)
close(s->fd);
- if(s->filename)
- free(s->filename);
+ free(s->filename);
free(af->setup);
af->setup = NULL;
diff --git a/libaf/af_extrastereo.c b/libaf/af_extrastereo.c
index 28183bcdb9..347c257137 100644
--- a/libaf/af_extrastereo.c
+++ b/libaf/af_extrastereo.c
@@ -82,9 +82,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_gate.c b/libaf/af_gate.c
index 38db9ff055..30ed20a1be 100644
--- a/libaf/af_gate.c
+++ b/libaf/af_gate.c
@@ -102,9 +102,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_hrtf.c b/libaf/af_hrtf.c
index 30af96ad35..d8ec33e11b 100644
--- a/libaf/af_hrtf.c
+++ b/libaf/af_hrtf.c
@@ -349,32 +349,19 @@ static void uninit(struct af_instance_s *af)
if(af->setup) {
af_hrtf_t *s = af->setup;
- if(s->lf)
- free(s->lf);
- if(s->rf)
- free(s->rf);
- if(s->lr)
- free(s->lr);
- if(s->rr)
- free(s->rr);
- if(s->cf)
- free(s->cf);
- if(s->cr)
- free(s->cr);
- if(s->ba_l)
- free(s->ba_l);
- if(s->ba_r)
- free(s->ba_r);
- if(s->ba_ir)
- free(s->ba_ir);
- if(s->fwrbuf_l)
- free(s->fwrbuf_l);
- if(s->fwrbuf_r)
- free(s->fwrbuf_r);
- if(s->fwrbuf_lr)
- free(s->fwrbuf_lr);
- if(s->fwrbuf_rr)
- free(s->fwrbuf_rr);
+ free(s->lf);
+ free(s->rf);
+ free(s->lr);
+ free(s->rr);
+ free(s->cf);
+ free(s->cr);
+ free(s->ba_l);
+ free(s->ba_r);
+ free(s->ba_ir);
+ free(s->fwrbuf_l);
+ free(s->fwrbuf_r);
+ free(s->fwrbuf_lr);
+ free(s->fwrbuf_rr);
free(af->setup);
}
if(af->data)
diff --git a/libaf/af_karaoke.c b/libaf/af_karaoke.c
index e0f0d42471..780349dfee 100644
--- a/libaf/af_karaoke.c
+++ b/libaf/af_karaoke.c
@@ -46,8 +46,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
- free(af->data);
+ free(af->data);
}
// Filter data through filter
diff --git a/libaf/af_ladspa.c b/libaf/af_ladspa.c
index ace8302b54..8ab2648ea3 100644
--- a/libaf/af_ladspa.c
+++ b/libaf/af_ladspa.c
@@ -562,7 +562,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg) {
/* set new setup->myname */
- if(setup->myname) free(setup->myname);
+ free(setup->myname);
setup->myname = calloc(strlen(af_info_ladspa.name)+strlen(setup->file)+
strlen(setup->label)+6, 1);
snprintf(setup->myname, strlen(af_info_ladspa.name)+
@@ -652,8 +652,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg) {
static void uninit(struct af_instance_s *af) {
int i;
- if (af->data)
- free(af->data);
+ free(af->data);
if (af->setup) {
af_ladspa_t *setup = (af_ladspa_t*) af->setup;
const LADSPA_Descriptor *pdes = setup->plugin_descriptor;
@@ -671,36 +670,24 @@ static void uninit(struct af_instance_s *af) {
free(setup->chhandles);
}
- if (setup->file)
- free(setup->file);
- if (setup->label)
- free(setup->label);
- if (setup->inputcontrolsmap)
- free(setup->inputcontrolsmap);
- if (setup->inputcontrols)
- free(setup->inputcontrols);
- if (setup->outputcontrolsmap)
- free(setup->outputcontrolsmap);
- if (setup->outputcontrols)
- free(setup->outputcontrols);
- if (setup->inputs)
- free(setup->inputs);
- if (setup->outputs)
- free(setup->outputs);
+ free(setup->file);
+ free(setup->label);
+ free(setup->inputcontrolsmap);
+ free(setup->inputcontrols);
+ free(setup->outputcontrolsmap);
+ free(setup->outputcontrols);
+ free(setup->inputs);
+ free(setup->outputs);
if (setup->inbufs) {
- for(i=0; i<setup->nch; i++) {
- if (setup->inbufs[i])
- free(setup->inbufs[i]);
- }
+ for(i=0; i<setup->nch; i++)
+ free(setup->inbufs[i]);
free(setup->inbufs);
}
if (setup->outbufs) {
- for(i=0; i<setup->nch; i++) {
- if (setup->outbufs[i])
- free(setup->outbufs[i]);
- }
+ for(i=0; i<setup->nch; i++)
+ free(setup->outbufs[i]);
free(setup->outbufs);
}
@@ -753,17 +740,13 @@ static af_data_t* play(struct af_instance_s *af, af_data_t *data) {
setup->myname);
if(setup->inbufs) {
- for(i=0; i<setup->nch; i++) {
- if(setup->inbufs[i])
- free(setup->inbufs[i]);
- }
+ for(i=0; i<setup->nch; i++)
+ free(setup->inbufs[i]);
free(setup->inbufs);
}
if(setup->outbufs) {
- for(i=0; i<setup->nch; i++) {
- if(setup->outbufs[i])
- free(setup->outbufs[i]);
- }
+ for(i=0; i<setup->nch; i++)
+ free(setup->outbufs[i]);
free(setup->outbufs);
}
} /* everything is freed */
diff --git a/libaf/af_pan.c b/libaf/af_pan.c
index 9a3e520446..e3f7d29d1c 100644
--- a/libaf/af_pan.c
+++ b/libaf/af_pan.c
@@ -144,8 +144,7 @@ static void uninit(struct af_instance_s* af)
if(af->data)
free(af->data->audio);
free(af->data);
- if(af->setup)
- free(af->setup);
+ free(af->setup);
}
// Filter data through filter
diff --git a/libaf/af_resample.c b/libaf/af_resample.c
index 5dd0e70329..6809c48125 100644
--- a/libaf/af_resample.c
+++ b/libaf/af_resample.c
@@ -236,8 +236,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
fc = 1/(float)(max(s->up,s->dn));
// Allocate space for polyphase filter bank and prototype filter
w = malloc(sizeof(float) * s->up *L);
- if(NULL != s->w)
- free(s->w);
+ free(s->w);
s->w = malloc(L*s->up*af->data->bps);
// Design prototype filter type using Kaiser window with beta = 10
diff --git a/libaf/af_sinesuppress.c b/libaf/af_sinesuppress.c
index 56f6076b5c..3a69a86585 100644
--- a/libaf/af_sinesuppress.c
+++ b/libaf/af_sinesuppress.c
@@ -98,9 +98,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_sub.c b/libaf/af_sub.c
index ada1950649..4330515ddf 100644
--- a/libaf/af_sub.c
+++ b/libaf/af_sub.c
@@ -123,9 +123,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_surround.c b/libaf/af_surround.c
index 098234b364..28f69a586e 100644
--- a/libaf/af_surround.c
+++ b/libaf/af_surround.c
@@ -109,10 +109,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
}
// Free previous delay queues
- if(s->dl)
- free(s->dl);
- if(s->dr)
- free(s->dr);
+ free(s->dl);
+ free(s->dr);
// Allocate new delay queues
s->dl = calloc(LD,af->data->bps);
s->dr = calloc(LD,af->data->bps);
diff --git a/libaf/af_sweep.c b/libaf/af_sweep.c
index e1890c6b3b..3280125be1 100644
--- a/libaf/af_sweep.c
+++ b/libaf/af_sweep.c
@@ -60,12 +60,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
- free(af->data);
- if(af->setup){
- af_sweept *s = af->setup;
- free(s);
- }
+ free(af->data);
+ free(af->setup);
}
// Filter data through filter
diff --git a/libaf/af_volnorm.c b/libaf/af_volnorm.c
index 9bfaef6220..f7698e784c 100644
--- a/libaf/af_volnorm.c
+++ b/libaf/af_volnorm.c
@@ -116,9 +116,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
diff --git a/libaf/af_volume.c b/libaf/af_volume.c
index e523333c91..768f67c5f3 100644
--- a/libaf/af_volume.c
+++ b/libaf/af_volume.c
@@ -133,9 +133,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance_s* af)
{
- if(af->data)
free(af->data);
- if(af->setup)
free(af->setup);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 21:28:59 +0000