sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/audio: fix samp rate conversion issue

Browse Source 
Signed-off-by: jinxiuxu <jinxiuxu@xiaomi.com>
This commit is contained in:
jinxiuxu 2024-08-20 13:45:58 +08:00 committed by Alan Carvalho de Assis
parent 618a51fa84
commit b874d95beb
9 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/src/cxd56xx/cxd56_nxaudio.c
View File

@ -2587,6 +2587,8 @@ static int cxd56_getcaps(struct audio_lowerhalf_s *lower, int type,
{ {
DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -2631,8 +2633,8 @@ static int cxd56_getcaps(struct audio_lowerhalf_s *lower, int type,
/* Report supported output sample rates */ /* Report supported output sample rates */
caps->ac_controls.b[0] = CXD56_SUPP_RATES_L; ptr = (uint16_t *)caps->ac_controls.b;
caps->ac_controls.b[1] = CXD56_SUPP_RATES_H; *ptr = CXD56_SUPP_RATES_L;
break; break;
default: default:
@ -2652,8 +2654,8 @@ static int cxd56_getcaps(struct audio_lowerhalf_s *lower, int type,
/* Report supported input sample rates */ /* Report supported input sample rates */
caps->ac_controls.b[0] = CXD56_SUPP_RATES_L; ptr = (uint16_t *)caps->ac_controls.b;
caps->ac_controls.b[1] = CXD56_SUPP_RATES_H; *ptr = CXD56_SUPP_RATES_L;
break; break;
default: default:

17
drivers/audio/audio_null.c
View File

@ -215,6 +215,8 @@ static int null_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
DEBUGASSERT(caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps->ac_len >= sizeof(struct audio_caps_s));
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -273,13 +275,14 @@ static int null_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.b[0] = AUDIO_SAMP_RATE_8K | ptr = (uint16_t *)caps->ac_controls.b;
AUDIO_SAMP_RATE_11K | *ptr = AUDIO_SAMP_RATE_8K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K |
AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_44K |
AUDIO_SAMP_RATE_48K;
break; break;
case AUDIO_FMT_MP3: case AUDIO_FMT_MP3:

5
drivers/audio/cs4344.c
View File

@ -358,6 +358,8 @@ static int cs4344_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
audinfo("type=%d ac_type=%d\n", type, caps->ac_type); audinfo("type=%d ac_type=%d\n", type, caps->ac_type);
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -416,7 +418,8 @@ static int cs4344_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |
AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_48K;

5
drivers/audio/cs43l22.c
View File

@ -522,6 +522,8 @@ static int cs43l22_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
audinfo("type=%d ac_type=%d\n", type, caps->ac_type); audinfo("type=%d ac_type=%d\n", type, caps->ac_type);
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -580,7 +582,8 @@ static int cs43l22_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |

10
drivers/audio/es8311.c
View File

@ -802,6 +802,8 @@ static int es8311_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
audinfo("getcaps: type=%d ac_type=%d\n", type, caps->ac_type); audinfo("getcaps: type=%d ac_type=%d\n", type, caps->ac_type);
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -845,11 +847,11 @@ static int es8311_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* 8kHz is hardware dependent */ /* 8kHz is hardware dependent */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K |
AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K |
AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K;
caps->ac_controls.b[1] = 0;
break; break;
} }
@ -863,11 +865,11 @@ static int es8311_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
{ {
/* Report supported input sample rates */ /* Report supported input sample rates */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K |
AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K |
AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K;
caps->ac_controls.b[1] = 0;
break; break;
} }

10
drivers/audio/es8388.c
View File

@ -773,6 +773,8 @@ static int es8388_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
audinfo("getcaps: type=%d ac_type=%d\n", type, caps->ac_type); audinfo("getcaps: type=%d ac_type=%d\n", type, caps->ac_type);
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -828,11 +830,11 @@ static int es8388_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* 8kHz is hardware dependent */ /* 8kHz is hardware dependent */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K |
AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K |
AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K;
caps->ac_controls.b[1] = 0;
break; break;
default: default:
@ -851,11 +853,11 @@ static int es8388_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Report supported input sample rates */ /* Report supported input sample rates */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_16K |
AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_32K |
AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_48K;
caps->ac_controls.b[1] = 0;
break; break;
default: default:

17
drivers/audio/vs1053.c
View File

@ -564,6 +564,8 @@ static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type,
DEBUGASSERT(caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps->ac_len >= sizeof(struct audio_caps_s));
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -647,13 +649,14 @@ static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.b[0] = AUDIO_SAMP_RATE_8K | ptr = (uint16_t *)caps->ac_controls.b;
AUDIO_SAMP_RATE_11K | *ptr = AUDIO_SAMP_RATE_8K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K |
AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_44K |
AUDIO_SAMP_RATE_48K;
break; break;
case AUDIO_FMT_MP3: case AUDIO_FMT_MP3:

5
drivers/audio/wm8904.c
View File

@ -957,6 +957,8 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
audinfo("type=%d ac_type=%d\n", type, caps->ac_type); audinfo("type=%d ac_type=%d\n", type, caps->ac_type);
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -1016,7 +1018,8 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |

5
drivers/audio/wm8994.c
View File

@ -655,6 +655,8 @@ static int wm8994_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
audinfo("type=%d ac_type=%d\n", type, caps->ac_type); audinfo("type=%d ac_type=%d\n", type, caps->ac_type);
uint16_t *ptr;
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format.hw = 0; caps->ac_format.hw = 0;
@ -714,7 +716,8 @@ static int wm8994_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.b[0] = ptr = (uint16_t *)caps->ac_controls.b;
*ptr =
AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K | AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |