apache/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-05-07 22:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

audio/composite: merge composite instance allocate to one times

Browse Source 
here is not need to allocate two times

Signed-off-by: chao an <anchao.archer@bytedance.com>
This commit is contained in:
chao an 2025-03-09 21:52:38 +08:00 committed by Alin Jerpelea
parent e83d31bee9
commit 7a96bee46f
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
audio/audio_comp.c
View File

@ -51,8 +51,8 @@ struct audio_comp_priv_s
/* This is the contained, low-level audio device array and count. */
FAR struct audio_lowerhalf_s **lower;
int count;
FAR struct audio_lowerhalf_s *lower[1];
};
/****************************************************************************
@ -942,30 +942,31 @@ FAR struct audio_lowerhalf_s *audio_comp_initialize(FAR const char *name,
{
FAR struct audio_comp_priv_s *priv;
va_list ap;
int ret = -ENOMEM;
int i;
int ret;
int i = 0;
priv = kmm_zalloc(sizeof(struct audio_comp_priv_s));
va_start(ap, name);
while (va_arg(ap, FAR void *))
{
i++;
}
va_end(ap);
if (i == 0)
{
return -EINVAL;
}
priv = kmm_zalloc(sizeof(struct audio_comp_priv_s) +
sizeof(FAR void *) * (i - 1));
if (priv == NULL)
{
return NULL;
}
priv->export.ops = &g_audio_comp_ops;
va_start(ap, name);
while (va_arg(ap, FAR struct audio_lowerhalf_s *))
{
priv->count++;
}
va_end(ap);
priv->lower = kmm_calloc(priv->count,
sizeof(FAR struct audio_lowerhalf_s *));
if (priv->lower == NULL)
{
goto free_priv;
}
priv->count = i;
va_start(ap, name);
for (i = 0; i < priv->count; i++)
@ -980,20 +981,16 @@ FAR struct audio_lowerhalf_s *audio_comp_initialize(FAR const char *name,
}
va_end(ap);
if (name != NULL)
{
ret = audio_register(name, &priv->export);
if (ret < 0)
{
goto free_lower;
kmm_free(priv);
return NULL;
}
}
return &priv->export;
free_lower:
kmm_free(priv->lower);
free_priv:
kmm_free(priv);
return NULL;
}