audiolite/mp3dec: Fix freeze on audiolite_mp3dec component

Fix a freeze issue on audiolite_mp3dec component when it started with user built mp3dec worker.
sonydevworld · Nov 5, 2024 · 52ff862 · 52ff862
1 parent e930717
commit 52ff862
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/sdk/modules/audiolite/src/components/al_mp3dec.cxx b/sdk/modules/audiolite/src/components/al_mp3dec.cxx
@@ -74,7 +74,7 @@ void audiolite_mp3dec::decode_runner()
 
   while (_is_thrdrun)
     {
-      if (_isplay)
+      if (_isplay && _worker_booted)
         {
           audiolite_memapbuf *mem = 
               (audiolite_memapbuf *)_omempool->allocate();
@@ -216,18 +216,9 @@ int audiolite_mp3dec::handle_mesage(al_comm_msghdr_t hdr,
             }
         }
 
-      for (int i = 0; i < thiz->_outq.get_qsize(); i++)
-        {
-          mem = (audiolite_memapbuf *)thiz->_omempool->allocate();
-          if (mem)
-            {
-              thiz->_outq.push(mem);
-              alworker_inject_omem(thiz->_worker.getwtask(), mem);
-            }
-        }
-
       alworker_send_startframe(thiz->_worker.getwtask());
       alworker_send_start(thiz->_worker.getwtask());
+      thiz->_worker_booted = true; /* This makes start injection of omem */
     }
   else if (CHECK_HDR(hdr, SYS, SYS_ERR))
     {
@@ -254,7 +245,8 @@ audiolite_mp3dec::audiolite_mp3dec() : audiolite_decoder("mp3decomem",
                                        CONFIG_ALMP3DEC_INJECTSTACK),
                   _omempool(NULL), _worker(),
                   _inq(SPRMP3_FRAMEMEM_QSIZE / 2),
-                  _outq(SPRMP3_OUTMEM_QSIZE / 2), _frame_eof(false)
+                  _outq(SPRMP3_OUTMEM_QSIZE / 2), _frame_eof(false),
+                  _worker_booted(false)
 {
   _worker.set_msghandler(audiolite_mp3dec::handle_mesage, this);
 }
@@ -293,6 +285,7 @@ int audiolite_mp3dec::stop_decode()
     }
   _inq.disable();
   _worker.terminate_worker();
+  _worker_booted = false;
   _outq.disable();
 
   return OK;

diff --git a/sdk/modules/include/audiolite/al_mp3dec.h b/sdk/modules/include/audiolite/al_mp3dec.h
@@ -61,6 +61,7 @@ class audiolite_mp3dec : public audiolite_decoder
     audiolite_workermemq _inq;
     audiolite_workermemq _outq;
     bool _frame_eof;
+    volatile bool _worker_booted;
 
     static int handle_mesage(al_comm_msghdr_t hdr,
                              al_comm_msgopt_t *opt, void *arg);