fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented reference counting inside codec2 management module, allowing for multiple calls of codec_init()

This commit is contained in:
Silvano Seva 2022-08-17 18:03:04 +02:00
parent 26048b90d1
commit bf8a257c2b
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openrtx/include/core/audio_codec.h
View File

@ -31,6 +31,10 @@ extern "C" {
/** /**
* Initialise audio codec manager, allocating data buffers. * Initialise audio codec manager, allocating data buffers.
*
* This function allows recursive calls. However the number of times this
* function is called must be balanced by an equal number of calls to the
* terminate() function.
*/ */
void codec_init(); void codec_init();

15
openrtx/src/core/audio_codec.c
View File

@ -32,6 +32,7 @@ static struct CODEC2 *codec2;
static stream_sample_t *audioBuf; static stream_sample_t *audioBuf;
static streamId audioStream; static streamId audioStream;
static uint8_t initCnt = 0;
static bool running; static bool running;
static pthread_t codecThread; static pthread_t codecThread;
static pthread_mutex_t mutex; static pthread_mutex_t mutex;
@ -58,6 +59,15 @@ static void startThread(void *(*func) (void *));
void codec_init() void codec_init()
{ {
if(initCnt > 0)
{
pthread_mutex_lock(&mutex);
initCnt += 1;
pthread_mutex_unlock(&mutex);
return;
}
initCnt = 1;
running = false; running = false;
readPos = 0; readPos = 0;
writePos = 0; writePos = 0;
@ -73,6 +83,11 @@ void codec_init()
void codec_terminate() void codec_terminate()
{ {
pthread_mutex_lock(&mutex);
initCnt -= 1;
pthread_mutex_unlock(&mutex);
if(initCnt > 0) return;
if(running) codec_stop(); if(running) codec_stop();
pthread_mutex_destroy(&mutex); pthread_mutex_destroy(&mutex);