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

Using frame counts in pcm_readi and pcm_writei

Browse Source 
pcm_readi and pcm_writei now use a frame count to specify the
buffer length instead of using a byte count.
This commit is contained in:
Taylor Holberton
2016-12-01 20:43:28 -08:00
parent e0781f13a7
commit d7b140a5d9
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tinyalsa/pcm.h
+2 -2
View File
@@ -262,9 +262,9 @@ 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_writei(struct pcm *pcm, const void *data, unsigned int frame_count);
int pcm_readi(struct pcm *pcm, void *data, unsigned int count);
int pcm_readi(struct pcm *pcm, void *data, unsigned int frame_count);
#ifdef __GNUC__
src/pcm.c
+8 -10
View File
@@ -522,11 +522,11 @@ int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail,
* 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.
* @param frame_count The number of frames occupied by the sample array.
* @return On success, this function returns the number of frames written; otherwise, a negative number.
* @ingroup libtinyalsa-pcm
*/
int pcm_writei(struct pcm *pcm, const void *data, unsigned int count)
int pcm_writei(struct pcm *pcm, const void *data, unsigned int frame_count)
{
struct snd_xferi x;
@@ -534,8 +534,7 @@ int pcm_writei(struct pcm *pcm, const void *data, unsigned int count)
return -EINVAL;
x.buf = (void*)data;
x.frames = count / (pcm->config.channels *
pcm_format_to_bits(pcm->config.format) / 8);
x.frames = frame_count;
x.result = 0;
for (;;) {
if (!pcm->running) {
@@ -571,11 +570,11 @@ int pcm_writei(struct pcm *pcm, const void *data, unsigned int count)
* 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.
* @param count The number of frames occupied by the sample array.
* @return On success, this function returns the number of frames written; otherwise, a negative number.
* @ingroup libtinyalsa-pcm
*/
int pcm_readi(struct pcm *pcm, void *data, unsigned int count)
int pcm_readi(struct pcm *pcm, void *data, unsigned int frame_count)
{
struct snd_xferi x;
@@ -583,8 +582,7 @@ int pcm_readi(struct pcm *pcm, void *data, unsigned int count)
return -EINVAL;
x.buf = data;
x.frames = count / (pcm->config.channels *
pcm_format_to_bits(pcm->config.format) / 8);
x.frames = frame_count;
x.result = 0;
for (;;) {
if (!pcm->running) {
@@ -620,7 +618,7 @@ int pcm_readi(struct pcm *pcm, void *data, unsigned int count)
*/
int pcm_write(struct pcm *pcm, const void *data, unsigned int count)
{
int ret = pcm_writei(pcm, data, count);
int ret = pcm_writei(pcm, data, pcm_bytes_to_frames(pcm, count));
if (ret < 0){
return ret;
}
@@ -640,7 +638,7 @@ int pcm_write(struct pcm *pcm, const void *data, unsigned int count)
*/
int pcm_read(struct pcm *pcm, void *data, unsigned int count)
{
int ret = pcm_readi(pcm, data, count);
int ret = pcm_readi(pcm, data, pcm_bytes_to_frames(pcm, count));
if (ret < 0) {
return ret;
}