Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

alsa/sim_alsa.c:fix ioctl AUDIOIOC_GETBUFFERINFO error

Browse Source 
when executing ioctl AUDIOIOC_GETBUFFERINFO,the priv->pcm is still NULL,
so it will return -ENXIO,we can remove this check at the start of ioctl
and add in the case where it is used.

Signed-off-by: shipei <shipei@xiaomi.com>
This commit is contained in:
shipei
2023-08-01 20:28:25 +08:00
committed by Xiang Xiao
parent e9b22401b9
commit 238eba14ad
1 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/sim/src/sim/posix/sim_alsa.c
+48 -30
View File
@@ -564,6 +564,11 @@ static int sim_audio_flush(struct audio_lowerhalf_s *dev)
struct sim_audio_s *priv = (struct sim_audio_s *)dev; struct sim_audio_s *priv = (struct sim_audio_s *)dev;
int ret; int ret;
if (!priv->pcm)
{
return 0;
}
ret = nxmutex_lock(&priv->pendlock); ret = nxmutex_lock(&priv->pendlock);
if (ret < 0) if (ret < 0)
{ {
@@ -587,6 +592,48 @@ static int sim_audio_flush(struct audio_lowerhalf_s *dev)
return 0; return 0;
} }
static int sim_alsa_get_latency(struct audio_lowerhalf_s *dev,
unsigned long arg)
{
struct sim_audio_s *priv = (struct sim_audio_s *)dev;
long *latency = (long *)arg;
struct ap_buffer_s *apb;
dq_entry_t *cur;
long remain = 0;
int ret;
if (!priv->pcm)
{
return -ENXIO;
}
ret = snd_pcm_delay(priv->pcm, latency);
if (ret < 0)
{
return ret;
}
else
{
remain = priv->aux->nbytes - priv->aux->curbyte;
ret = nxmutex_lock(&priv->pendlock);
if (ret < 0)
{
return ret;
}
for (cur = dq_peek(&priv->pendq); cur; cur = dq_next(cur))
{
apb = (struct ap_buffer_s *)cur;
remain += apb->nbytes - apb->curbyte;
}
nxmutex_unlock(&priv->pendlock);
*latency += remain / priv->frame_size;
}
return ret;
}
static int sim_audio_enqueuebuffer(struct audio_lowerhalf_s *dev, static int sim_audio_enqueuebuffer(struct audio_lowerhalf_s *dev,
struct ap_buffer_s *apb) struct ap_buffer_s *apb)
{ {
@@ -613,11 +660,6 @@ static int sim_audio_ioctl(struct audio_lowerhalf_s *dev, int cmd,
struct sim_audio_s *priv = (struct sim_audio_s *)dev; struct sim_audio_s *priv = (struct sim_audio_s *)dev;
int ret = 0; int ret = 0;
if (!priv->pcm)
{
return -ENXIO;
}
switch (cmd) switch (cmd)
{ {
case AUDIOIOC_SETBUFFERINFO: case AUDIOIOC_SETBUFFERINFO:
@@ -655,35 +697,11 @@ static int sim_audio_ioctl(struct audio_lowerhalf_s *dev, int cmd,
case AUDIOIOC_GETLATENCY: case AUDIOIOC_GETLATENCY:
{ {
long *latency = (long *)arg; ret = sim_alsa_get_latency(dev, arg);
long remain = 0;
dq_entry_t *cur;
ret = snd_pcm_delay(priv->pcm, latency);
if (ret < 0) if (ret < 0)
{ {
return ret; return ret;
} }
else
{
remain = priv->aux->nbytes - priv->aux->curbyte;
ret = nxmutex_lock(&priv->pendlock);
if (ret < 0)
{
return ret;
}
for (cur = dq_peek(&priv->pendq); cur; cur = dq_next(cur))
{
struct ap_buffer_s *apb = (struct ap_buffer_s *)cur;
remain += apb->nbytes - apb->curbyte;
}
nxmutex_unlock(&priv->pendlock);
*latency += remain / priv->frame_size;
}
} }
break; break;