Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

system/nxplayer/nxrecorder: move apb buffer instance to stack

Browse source 
move apb buffer instance to stack to avoid alloc buffer from heap

Signed-off-by: chao an <anchao.archer@bytedance.com>
This commit is contained in:
chao an 2025-03-10 10:12:37 +08:00 • committed by Xiang Xiao
parent e280e9bdb4
commit 6d0a039cc9
2 changed files with 22 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

42
system/nxplayer/nxplayer.c
View file

@ -796,7 +796,6 @@ static FAR void *nxplayer_playthread(pthread_addr_t pvarg)
bool streaming = true;
bool failed = false;
struct ap_buffer_info_s buf_info;
FAR struct ap_buffer_s **buffers;
unsigned int prio;
#ifdef CONFIG_DEBUG_FEATURES
int outstanding = 0;
@ -819,23 +818,11 @@ static FAR void *nxplayer_playthread(pthread_addr_t pvarg)
/* Create array of pointers to buffers */
buffers = (FAR struct ap_buffer_s **)
malloc(buf_info.nbuffers * sizeof(FAR void *));
if (buffers == NULL)
{
/* Error allocating memory for buffer storage! */
ret = -ENOMEM;
running = false;
goto err_out;
}
FAR struct ap_buffer_s *buffers[buf_info.nbuffers];
/* Create our audio pipeline buffers to use for queueing up data */
for (x = 0; x < buf_info.nbuffers; x++)
{
buffers[x] = NULL;
}
memset(buffers, 0, sizeof(buffers));
for (x = 0; x < buf_info.nbuffers; x++)
{
@ -1145,27 +1132,20 @@ static FAR void *nxplayer_playthread(pthread_addr_t pvarg)
err_out:
audinfo("Clean-up and exit\n");
if (buffers != NULL)
audinfo("Freeing buffers\n");
for (x = 0; x < buf_info.nbuffers; x++)
{
audinfo("Freeing buffers\n");
for (x = 0; x < buf_info.nbuffers; x++)
/* Fill in the buffer descriptor struct to issue a free request */
if (buffers[x] != NULL)
{
/* Fill in the buffer descriptor struct to issue a free request */
if (buffers[x] != NULL)
{
#ifdef CONFIG_AUDIO_MULTI_SESSION
buf_desc.session = pplayer->session;
buf_desc.session = pplayer->session;
#endif
buf_desc.u.buffer = buffers[x];
ioctl(pplayer->dev_fd, AUDIOIOC_FREEBUFFER,
(unsigned long)&buf_desc);
}
buf_desc.u.buffer = buffers[x];
ioctl(pplayer->dev_fd, AUDIOIOC_FREEBUFFER,
(unsigned long)&buf_desc);
}
/* Free the pointers to the buffers */
free(buffers);
}
/* Unregister the message queue and release the session */

43
system/nxrecorder/nxrecorder.c
View file

@ -528,7 +528,6 @@ static FAR void *nxrecorder_recordthread(pthread_addr_t pvarg)
bool streaming = true;
bool failed = false;
struct ap_buffer_info_s buf_info;
FAR struct ap_buffer_s **pbuffers;
unsigned int prio;
#ifdef CONFIG_DEBUG_FEATURES
int outstanding = 0;
@ -551,23 +550,11 @@ static FAR void *nxrecorder_recordthread(pthread_addr_t pvarg)
/* Create array of pointers to buffers */
pbuffers = (FAR struct ap_buffer_s **) malloc(buf_info.nbuffers *
sizeof(FAR void *));
if (pbuffers == NULL)
{
/* Error allocating memory for buffer storage! */
ret = -ENOMEM;
running = false;
goto err_out;
}
FAR struct ap_buffer_s *pbuffers[buf_info.nbuffers];
/* Create our audio pipeline buffers to use for queueing up data */
for (x = 0; x < buf_info.nbuffers; x++)
{
pbuffers[x] = NULL;
}
memset(pbuffers, 0, sizeof(pbuffers));
for (x = 0; x < buf_info.nbuffers; x++)
{
@ -820,28 +807,20 @@ static FAR void *nxrecorder_recordthread(pthread_addr_t pvarg)
err_out:
audinfo("Clean-up and exit\n");
if (pbuffers != NULL)
audinfo("Freeing buffers\n");
for (x = 0; x < buf_info.nbuffers; x++)
{
audinfo("Freeing buffers\n");
for (x = 0; x < buf_info.nbuffers; x++)
/* Fill in the buffer descriptor struct to issue a free request */
if (pbuffers[x] != NULL)
{
/* Fill in the buffer descriptor struct to issue a free request */
if (pbuffers[x] != NULL)
{
#ifdef CONFIG_AUDIO_MULTI_SESSION
buf_desc.session = precorder->session;
buf_desc.session = precorder->session;
#endif
buf_desc.u.buffer = pbuffers[x];
ioctl(precorder->dev_fd,
AUDIOIOC_FREEBUFFER,
(uintptr_t)&buf_desc);
}
buf_desc.u.buffer = pbuffers[x];
ioctl(precorder->dev_fd, AUDIOIOC_FREEBUFFER,
(uintptr_t)&buf_desc);
}
/* Free the pointers to the buffers */
free(pbuffers);
}
/* Unregister the message queue and release the session */