speex voice: Detect the end of a clip the right way.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15731 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 9 deletions

diff --git a/apps/voice_thread.c b/apps/voice_thread.c
index f7494f9587..7ebfb1bcd4 100644
--- a/apps/voice_thread.c
+++ b/apps/voice_thread.c
@@ -313,11 +313,10 @@ static void voice_thread(void)
         }
 
     voice_decode:
-        /* Check if all data was exhausted for this clip */
-        if (speex_bits_remaining(&td.bits) < 8)
+        /* Decode the data */
+        if (speex_decode_int(td.st, &td.bits, voice_output_buf) < 0)
         {
-    voice_error:
-            /* Get next clip */
+            /* End of stream or error - get next clip */
             td.vi.size = 0;
 
             if (td.vi.get_more != NULL)
@@ -329,6 +328,8 @@ static void voice_thread(void)
                 speex_bits_set_bit_buffer(&td.bits, td.vi.start, td.vi.size);
                 speex_decoder_ctl(td.st, SPEEX_GET_LOOKAHEAD, &td.lookahead);
 
+                /* Paranoid check - be sure never to somehow get stuck in a
+                 * loop without listening to the queue */
                 yield();
 
                 if (!queue_empty(&voice_queue))
@@ -354,13 +355,8 @@ static void voice_thread(void)
             goto message_process;
         }
 
-        /* Decode the data */
-        int status = speex_decode_int(td.st, &td.bits, voice_output_buf);
         yield();
 
-        if (status == -2)
-            goto voice_error; /* error - try some more */
-
         /* Output the decoded frame */
         td.count = VOICE_FRAME_SIZE - td.lookahead;
         td.src[0] = (const char *)&voice_output_buf[td.lookahead];