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

nxlooper: support different period size of player & recorder

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2022-02-18 21:19:44 +08:00 committed by Xiang Xiao
parent d6a187efed
commit 427798f7ee
1 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
system/nxlooper/nxlooper.c
View File

@ -55,6 +55,10 @@
#define AUDIO_APB_RECORD (1 << 4) #define AUDIO_APB_RECORD (1 << 4)
#define AUDIO_APB_PLAY (1 << 5) #define AUDIO_APB_PLAY (1 << 5)
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -316,7 +320,6 @@ static void *nxlooper_loopthread(pthread_addr_t pvarg)
{ {
FAR struct nxlooper_s *plooper = (FAR struct nxlooper_s *)pvarg; FAR struct nxlooper_s *plooper = (FAR struct nxlooper_s *)pvarg;
FAR struct ap_buffer_s *apb; FAR struct ap_buffer_s *apb;
FAR struct ap_buffer_s *apbtemp;
struct dq_queue_s playdq; struct dq_queue_s playdq;
struct dq_queue_s recorddq; struct dq_queue_s recorddq;
struct audio_msg_s msg; struct audio_msg_s msg;
@ -493,6 +496,7 @@ static void *nxlooper_loopthread(pthread_addr_t pvarg)
case AUDIO_MSG_DEQUEUE: case AUDIO_MSG_DEQUEUE:
apb = msg.u.ptr; apb = msg.u.ptr;
apb->curbyte = 0;
if (apb->flags & AUDIO_APB_PLAY) if (apb->flags & AUDIO_APB_PLAY)
{ {
dq_addlast(&apb->dq_entry, &playdq); dq_addlast(&apb->dq_entry, &playdq);
@ -504,20 +508,40 @@ static void *nxlooper_loopthread(pthread_addr_t pvarg)
if (dq_count(&playdq) != 0 && dq_count(&recorddq) != 0) if (dq_count(&playdq) != 0 && dq_count(&recorddq) != 0)
{ {
apbtemp = (struct ap_buffer_s *)dq_remfirst(&recorddq); FAR struct ap_buffer_s *apbrec;
apb = (struct ap_buffer_s *)dq_remfirst(&playdq); uint32_t copy;
apb->nbytes = apbtemp->nbytes; apbrec = (FAR struct ap_buffer_s *)dq_peek(&recorddq);
memcpy(apb->samp, apbtemp->samp, apbtemp->nbytes); apb = (FAR struct ap_buffer_s *)dq_peek(&playdq);
ret = nxlooper_enqueuerecordbuffer(plooper, apbtemp); copy = MIN(apbrec->nbytes - apbrec->curbyte,
if (ret == OK) apb->nmaxbytes - apb->curbyte);
memcpy(apb->samp + apb->curbyte,
apbrec->samp + apbrec->curbyte, copy);
apbrec->curbyte += copy;
apb->curbyte += copy;
if (apbrec->curbyte == apbrec->nbytes)
{ {
apbrec =
(FAR struct ap_buffer_s *)dq_remfirst(&recorddq);
apbrec->curbyte = 0;
ret = nxlooper_enqueuerecordbuffer(plooper, apbrec);
}
if (ret == OK && apb->curbyte == apb->nmaxbytes)
{
apb = (FAR struct ap_buffer_s *)dq_remfirst(&playdq);
apb->nbytes = apb->nmaxbytes;
apb->curbyte = 0;
ret = nxlooper_enqueueplaybuffer(plooper, apb); ret = nxlooper_enqueueplaybuffer(plooper, apb);
if (ret == OK && }
plooper->loopstate == NXLOOPER_STATE_RECORDING) }
if (ret == OK && plooper->loopstate == NXLOOPER_STATE_RECORDING)
{ {
#ifdef CONFIG_AUDIO_MULTI_SESSION #ifdef CONFIG_O_MULTI_SESSION
ret = ioctl(plooper->playdev_fd, AUDIOIOC_START, ret = ioctl(plooper->playdev_fd, AUDIOIOC_START,
(unsigned long)plooper->pplayses); (unsigned long)plooper->pplayses);
#else #else
@ -528,8 +552,6 @@ static void *nxlooper_loopthread(pthread_addr_t pvarg)
plooper->loopstate = NXLOOPER_STATE_LOOPING; plooper->loopstate = NXLOOPER_STATE_LOOPING;
} }
} }
}
}
if (ret == OK) if (ret == OK)
{ {