[v4,6/6] pcm:plug: save converter config

Commit Message

Takashi Sakamoto March 21, 2017, 12:04 p.m. UTC

Hi,

On Mar 21 2017 14:49, [e-mail] wrote:
> From: Andreas Pape <[e-mail]>
>
> 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 <[e-mail]>
> Signed-off-by: Mounesh Sutar <[e-mail]>
>
> diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
> index 266707b..f1ae814 100644
> --- a/src/pcm/pcm_plug.c
> +++ b/src/pcm/pcm_plug.c
> @@ -64,6 +64,10 @@ 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);
> +		plug->rate_converter = NULL;
> +	}
>  	assert(plug->gen.slave == plug->req_slave);
>  	if (plug->gen.close_slave) {
>  		snd_pcm_unlink_hw_ptr(pcm, plug->req_slave);
> @@ -1108,7 +1112,6 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp,
>  	plug->sformat = sformat;
>  	plug->schannels = schannels;
>  	plug->srate = srate;
> -	plug->rate_converter = rate_converter;
>  	plug->gen.slave = plug->req_slave = slave;
>  	plug->gen.close_slave = close_slave;
>  	plug->route_policy = route_policy;
> @@ -1125,6 +1128,14 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp,
>  	pcm->ops = &snd_pcm_plug_ops;
>  	pcm->fast_ops = slave->fast_ops;
>  	pcm->fast_op_arg = slave->fast_op_arg;
> +	if (rate_converter) {
> +		if ((err = snd_config_copy((snd_config_t**)&plug->rate_converter,
> +					   (snd_config_t *)rate_converter)) < 0) {

$ cd alsa-lib
$ git grep '[^(]err = ' | grep \( | wc
    1871   10782  132938
$ git grep '(err = ' | wc
     177    1522   13279

Your choice is 10% or less. Let's join in the majority.

Additionally, we decide to allocate memory object to the 'rate_convert'.
This is against the original design of 'snd_pcm_plug_t' structure,
because the member has const modifier. Thus let's drop the modifier from
the member, and drop cast of the first argument.

> +			snd_pcm_free(pcm);
> +			free(plug);
> +			return err;
> +		}
> +	}
>  	pcm->private_data = plug;
>  	pcm->poll_fd = slave->poll_fd;
>  	pcm->poll_events = slave->poll_events;

For your information.



Regards

Takashi Sakamoto

Patch

diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index 266707b..e4c684d 100644
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -50,7 +50,7 @@  typedef struct {
         snd_pcm_format_t sformat;
         int schannels;
         int srate;
-       const snd_config_t *rate_converter;
+       snd_config_t *rate_converter;
         enum snd_pcm_plug_route_policy route_policy;
         snd_pcm_route_ttable_entry_t *ttable;
         int ttable_ok;
@@ -64,6 +64,10 @@  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(plug->rate_converter);
+               plug->rate_converter = NULL;
+       }
         assert(plug->gen.slave == plug->req_slave);
         if (plug->gen.close_slave) {
                 snd_pcm_unlink_hw_ptr(pcm, plug->req_slave);
@@ -1108,7 +1112,6 @@  int snd_pcm_plug_open(snd_pcm_t **pcmp,
         plug->sformat = sformat;
         plug->schannels = schannels;
         plug->srate = srate;
-       plug->rate_converter = rate_converter;
         plug->gen.slave = plug->req_slave = slave;
         plug->gen.close_slave = close_slave;
         plug->route_policy = route_policy;
@@ -1125,6 +1128,15 @@  int snd_pcm_plug_open(snd_pcm_t **pcmp,
         pcm->ops = &snd_pcm_plug_ops;
         pcm->fast_ops = slave->fast_ops;
         pcm->fast_op_arg = slave->fast_op_arg;
+       if (rate_converter) {
+               err = snd_config_copy(&plug->rate_converter,
+                                     (snd_config_t *)rate_converter);
+               if (err < 0) {
+                       snd_pcm_free(pcm);
+                       free(plug);
+                       return err;
+               }
+       }
         pcm->private_data = plug;
         pcm->poll_fd = slave->poll_fd;
         pcm->poll_events = slave->poll_events;