openharmony/third_party_tinyalsa
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_tinyalsa.git synced 2026-07-18 13:25:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added pcm_readi and pcm_writei functions

Browse Source 
Added these functions to replace pcm_read and pcm_write, which don't return the number of frames actually transferred.

On GCC-like compilers, pcm_read and pcm_write have been marked as deprecated

On doxygen documentation, they have been marked as deprecated as well.
This commit is contained in:
Taylor Holberton
2016-12-01 20:25:41 -08:00
parent 77979a8855
commit f9834eef24
2 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tinyalsa/pcm.h
+14
View File
@@ -262,10 +262,24 @@ int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail, struct timespec *ts
unsigned int pcm_get_subdevice(const struct pcm *pcm);
int pcm_writei(struct pcm *pcm, const void *data, unsigned int count);
int pcm_readi(struct pcm *pcm, void *data, unsigned int count);
#ifdef __GNUC__
int pcm_write(struct pcm *pcm, const void *data, unsigned int count) __attribute((deprecated));
int pcm_read(struct pcm *pcm, void *data, unsigned int count) __attribute((deprecated));
#else
int pcm_write(struct pcm *pcm, const void *data, unsigned int count);
int pcm_read(struct pcm *pcm, void *data, unsigned int count);
#endif
int pcm_mmap_write(struct pcm *pcm, const void *data, unsigned int count);
int pcm_mmap_read(struct pcm *pcm, void *data, unsigned int count);
src/pcm.c
+46 -6
View File
@@ -523,10 +523,10 @@ int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail,
* @param pcm A PCM handle.
* @param data The audio sample array
* @param count The number of bytes occupied by the sample array.
* @return On success, this function returns zero; otherwise, a negative number.
* @return On success, this function returns the number of frames written; otherwise, a negative number.
* @ingroup libtinyalsa-pcm
*/
int pcm_write(struct pcm *pcm, const void *data, unsigned int count)
int pcm_writei(struct pcm *pcm, const void *data, unsigned int count)
{
struct snd_xferi x;
@@ -561,7 +561,7 @@ int pcm_write(struct pcm *pcm, const void *data, unsigned int count)
}
return oops(pcm, errno, "cannot write stream data");
}
return 0;
return x.result;
}
}
@@ -572,10 +572,10 @@ int pcm_write(struct pcm *pcm, const void *data, unsigned int count)
* @param pcm A PCM handle.
* @param data The audio sample array
* @param count The number of bytes occupied by the sample array.
* @return On success, this function returns zero; otherwise, a negative number.
* @return On success, this function returns the number of frames written; otherwise, a negative number.
* @ingroup libtinyalsa-pcm
*/
int pcm_read(struct pcm *pcm, void *data, unsigned int count)
int pcm_readi(struct pcm *pcm, void *data, unsigned int count)
{
struct snd_xferi x;
@@ -603,10 +603,50 @@ int pcm_read(struct pcm *pcm, void *data, unsigned int count)
}
return oops(pcm, errno, "cannot read stream data");
}
return 0;
return x.result;
}
}
/** Writes audio samples to PCM.
* If the PCM has not been started, it is started in this function.
* This function is only valid for PCMs opened with the @ref PCM_OUT flag.
* This function is not valid for PCMs opened with the @ref PCM_MMAP flag.
* @param pcm A PCM handle.
* @param data The audio sample array
* @param count The number of bytes occupied by the sample array.
* @return On success, this function returns zero; otherwise, a negative number.
* @deprecated
* @ingroup libtinyalsa-pcm
*/
int pcm_write(struct pcm *pcm, const void *data, unsigned int count)
{
int ret = pcm_writei(pcm, data, count);
if (ret < 0){
return ret;
}
return 0;
}
/** Reads audio samples from PCM.
* If the PCM has not been started, it is started in this function.
* This function is only valid for PCMs opened with the @ref PCM_IN flag.
* This function is not valid for PCMs opened with the @ref PCM_MMAP flag.
* @param pcm A PCM handle.
* @param data The audio sample array
* @param count The number of bytes occupied by the sample array.
* @return On success, this function returns zero; otherwise, a negative number.
* @deprecated
* @ingroup libtinyalsa-pcm
*/
int pcm_read(struct pcm *pcm, void *data, unsigned int count)
{
int ret = pcm_readi(pcm, data, count);
if (ret < 0) {
return ret;
}
return 0;
}
static struct pcm bad_pcm = {
.fd = -1,
};