pcm:plug: save converter config
PATCH v2 6/6 pcm:plug: save converter config
From: Andreas Pape <[email protected]>
Passed config is freed after call to open, thus it is invalid when trying to extract the converter name. So config entry is saved for later usage.
src/pcm/pcm_plug.c +11 -1
@@ -64,6 +64,8 @@ static int snd_pcm_plug_close(snd_pcm_t *pcm)snd_pcm_plug_t *plug = pcm->private_data;int err, result =0 ;free (plug->ttable); +if (plug->rate_converter) +snd_config_delete ((snd_config_t *)plug->rate_converter);assert (plug->gen.slave == plug->req_slave);if (plug->gen.close_slave) {snd_pcm_unlink_hw_ptr (pcm, plug->req_slave);
@@ -1108,7 +1110,13 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp, plug->sformat = sformat; plug->schannels = schannels; plug->srate = srate; - plug->rate_converter = rate_converter; +if (rate_converter) { +if ((err =snd_config_copy ((snd_config_t **)&plug->rate_converter, + (snd_config_t *)rate_converter)) <0 ) +free (plug); +return err; + } + plug->gen.slave = plug->req_slave = slave; plug->gen.close_slave = close_slave; plug->route_policy = route_policy;
@@ -1119,6 +1127,8 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp, err =snd_pcm_new (&pcm,SND_PCM_TYPE_PLUG , name, slave->stream, slave->mode);if (err <0 ) { +if (plug->rate_converter) +snd_config_delete ((snd_config_t *)plug->rate_converter);free (plug);return err; }
Signature · 1 line
2.7.4
Quoted 15 lines · On Mon, 27 Feb 2017 08:36:32 +0100, [email protected] wrote:
From: Andreas Pape <[email protected]>
Passed config is freed after call to open, thus it is invalid when trying to extract the converter name. So config entry is saved for later usage.
Signed-off-by Andreas Pape <[email protected]>Signed-off-by Mounesh Sutar <[email protected]>src/pcm/pcm_plug.c +0
-0
src/pcm/pcm_plug.c static int snd_pcm_plug_close(snd_pcm_t *pcm) · line 68
Quoted 5 lines
src/pcm/pcm_plug.c +2
-0@@ -64,6 +64,8 @@ static int snd_pcm_plug_close(snd_pcm_t *pcm)snd_pcm_plug_t *plug = pcm->private_data;int err, result =0 ;free (plug->ttable); +if (plug->rate_converter) +snd_config_delete ((snd_config_t *)plug->rate_converter);
Set NULL after calling snd_config_delete(), so that it won't double-free.
src/pcm/pcm_plug.c int snd_pcm_plug_open(snd_pcm_t **pcmp, · line 1117
Quoted 13 lines
src/pcm/pcm_plug.c +5
-1assert (plug->gen.slave == plug->req_slave);if (plug->gen.close_slave) {snd_pcm_unlink_hw_ptr (pcm, plug->req_slave);@@ -1108,7 +1110,13 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp, plug->sformat = sformat; plug->schannels = schannels; plug->srate = srate; - plug->rate_converter = rate_converter; +if (rate_converter) { +if ((err =snd_config_copy ((snd_config_t **)&plug->rate_converter, + (snd_config_t *)rate_converter)) <0 ) +free (plug); +return err;
Missing braces. It'll go out unconditionally. Did you really try this patch and confirm to work...?
thanks,
Takashi
Hi Takashi,
This is being used from 1.0.29 version.
I had to do some coding style fixes. Have resubmitted the changes now.
Regards,
Mounesh
-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: 27 February 2017 13:45
To: [email protected]
Cc: [email protected]; [email protected]; Sutar, Mounesh <[email protected]>; Andreas Pape <[email protected]>
Subject: Re: [PATCH v2 6/6] pcm:plug: save converter config
Quoted 15 lines · On Mon, 27 Feb 2017 08:36:32 +0100, [email protected] wrote:
From: Andreas Pape <[email protected]>
Passed config is freed after call to open, thus it is invalid when trying to extract the converter name. So config entry is saved for later usage.
Signed-off-by Andreas Pape <[email protected]>Signed-off-by Mounesh Sutar <[email protected]>src/pcm/pcm_plug.c index renamed from src/pcm/pcm_plug.c +0
-0266707b..ad0e99e 100644
src/pcm/pcm_plug.c static int snd_pcm_plug_close(snd_pcm_t *pcm) · line 68
Quoted 5 lines
src/pcm/pcm_plug.c +2
-0@@ -64,6 +64,8 @@ static int snd_pcm_plug_close(snd_pcm_t *pcm)snd_pcm_plug_t *plug = pcm->private_data;int err, result =0 ;free (plug->ttable); +if (plug->rate_converter) +snd_config_delete ((snd_config_t *)plug->rate_converter);
Set NULL after calling snd_config_delete(), so that it won't double-free.
src/pcm/pcm_plug.c int snd_pcm_plug_open(snd_pcm_t **pcmp, · line 1117
Quoted 13 lines
src/pcm/pcm_plug.c +0
-0assert (plug->gen.slave == plug->req_slave);if (plug->gen.close_slave) { snd_pcm_unlink_hw_ptr(pcm, plug->req_slave); @@ -1108,7 +1110,13 @@int snd_pcm_plug_open(snd_pcm_t **pcmp,
src/pcm/pcm_plug.c +5
-1plug->sformat = sformat; plug->schannels = schannels; plug->srate = srate; - plug->rate_converter = rate_converter; +if (rate_converter) { +if ((err =snd_config_copy ((snd_config_t **)&plug->rate_converter, + (snd_config_t *)rate_converter)) <0 ) +free (plug); +return err;
Missing braces. It'll go out unconditionally. Did you really try this patch and confirm to work...?
thanks,
Takashi