Commit FS#12069 - Playback rework - first stages. Gives as thorough as possible a treatment of codec management, track change and metadata logic as possible while maintaining fairly narrow focus and not rewriting everything all at once. Please see the rockbox-dev mail archive on 2011-04-25 (Playback engine rework) for a more thorough manifest of what was addressed. Plugins and codecs become incompatible.

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

1 files changed, 46 insertions, 60 deletions

diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index e179470f27..42bcc7081f 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -151,9 +151,19 @@ static uint8_t *read_buffer(size_t *realsize)
 }
 
 /* this is the codec entry point */
-enum codec_status codec_main(void)
+enum codec_status codec_main(enum codec_entry_call_reason reason)
+{
+    if (reason == CODEC_LOAD) {
+        /* Generic codec initialisation */
+        ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1);
+    }
+
+    return CODEC_OK;
+}
+
+/* this is called for each file to process */
+enum codec_status codec_run(void)
 {
-    int status;
     uint32_t decodedsamples;
     size_t n;
     int bufcount;
@@ -163,38 +173,28 @@ enum codec_status codec_main(void)
     off_t firstblockposn;     /* position of the first block in file */
     const struct pcm_codec *codec;
     uint32_t size;
-
-    /* Generic codec initialisation */
-    ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1);
-  
-next_track:
-    status = CODEC_OK;
+    intptr_t param;
 
     if (codec_init()) {
         DEBUGF("codec_init() error\n");
-        status = CODEC_ERROR;
-        goto exit;
+        return CODEC_ERROR;
     }
 
-    if (codec_wait_taginfo() != 0)
-        goto done;
-
     codec_set_replaygain(ci->id3);
     
     /* Need to save offset for later use (cleared indirectly by advance_buffer) */
     bytesdone = ci->id3->offset;
 
     /* get RIFF chunk header */
+    ci->seek_buffer(0);
     buf = ci->request_buffer(&n, 12);
     if (n < 12) {
         DEBUGF("request_buffer error\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
     if ((memcmp(buf, "RIFF", 4) != 0) || (memcmp(&buf[8], "WAVE", 4) != 0)) {
         DEBUGF("CODEC_ERROR: missing riff header\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
 
     /* advance to first WAVE chunk */
@@ -215,8 +215,7 @@ next_track:
         if (n < 8) {
             DEBUGF("data chunk request_buffer error\n");
             /* no more chunks, 'data' chunk must not have been found */
-            status = CODEC_ERROR;
-            goto done;
+            return CODEC_ERROR;
         }
 
         /* chunkSize */
@@ -225,8 +224,7 @@ next_track:
             if (size < 16) {
                 DEBUGF("CODEC_ERROR: 'fmt ' chunk size=%lu < 16\n",
                        (unsigned long)size);
-                status = CODEC_ERROR;
-                goto done;
+                return CODEC_ERROR;
             }
             /* wFormatTag */
             format.formattag=buf[8]|(buf[9]<<8);
@@ -256,8 +254,7 @@ next_track:
                         if (format.size < 22) {
                             DEBUGF("CODEC_ERROR: WAVE_FORMAT_EXTENSIBLE is "
                                    "missing extension\n");
-                            status = CODEC_ERROR;
-                            goto done;
+                            return CODEC_ERROR;
                         }
                         /* wValidBitsPerSample */
                         format.bitspersample = buf[26]|(buf[27]<<8);
@@ -273,8 +270,7 @@ next_track:
             {
                 if (!set_msadpcm_coeffs(buf))
                 {
-                    status = CODEC_ERROR;
-                    goto done;
+                    return CODEC_ERROR;
                 }
             }
 
@@ -284,8 +280,7 @@ next_track:
             {
                 DEBUGF("CODEC_ERROR: unsupported wave format 0x%x\n", 
                     (unsigned int) format.formattag);
-                status = CODEC_ERROR;
-                goto done;
+                return CODEC_ERROR;
             }
 
             /* riff 8bit linear pcm is unsigned */
@@ -295,8 +290,7 @@ next_track:
             /* set format, parse codec specific tag, check format, and calculate chunk size */
             if (!codec->set_format(&format))
             {
-                status = CODEC_ERROR;
-                goto done;
+                return CODEC_ERROR;
             }
         } else if (memcmp(buf, "data", 4) == 0) {
             format.numbytes = size;
@@ -324,31 +318,26 @@ next_track:
     if (!codec)
     {
         DEBUGF("CODEC_ERROR: 'fmt ' chunk not found\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
 
     /* common format check */
     if (format.channels == 0) {
         DEBUGF("CODEC_ERROR: 'fmt ' chunk not found or 0-channels file\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
     if (format.samplesperblock == 0) {
         DEBUGF("CODEC_ERROR: 'fmt ' chunk not found or 0-wSamplesPerBlock file\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
     if (format.blockalign == 0)
     {
         DEBUGF("CODEC_ERROR: 'fmt ' chunk not found or 0-blockalign file\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
     if (format.numbytes == 0) {
         DEBUGF("CODEC_ERROR: 'data' chunk not found or has zero-length\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
 
     /* check chunksize */
@@ -358,8 +347,7 @@ next_track:
     if (format.chunksize == 0)
     {
         DEBUGF("CODEC_ERROR: chunksize is 0\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
 
     ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency);
@@ -369,8 +357,7 @@ next_track:
         ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO);
     } else {
         DEBUGF("CODEC_ERROR: more than 2 channels\n");
-        status = CODEC_ERROR;
-        goto done;
+        return CODEC_ERROR;
     }
 
     /* make sure we're at the correct offset */
@@ -380,13 +367,12 @@ next_track:
                                                      PCM_SEEK_POS, &read_buffer);
 
         if (newpos->pos > format.numbytes)
-            goto done;
+            return CODEC_OK;
         if (ci->seek_buffer(firstblockposn + newpos->pos))
         {
             bytesdone      = newpos->pos;
             decodedsamples = newpos->samples;
         }
-        ci->seek_complete();
     } else {
         /* already where we need to be */
         bytesdone = 0;
@@ -396,22 +382,28 @@ next_track:
     endofstream = 0;
 
     while (!endofstream) {
-        ci->yield();
-        if (ci->stop_codec || ci->new_track) {
+        enum codec_command_action action = ci->get_command(&param);
+
+        if (action == CODEC_ACTION_HALT)
             break;
-        }
 
-        if (ci->seek_time) {
-            struct pcm_pos *newpos = codec->get_seek_pos(ci->seek_time, PCM_SEEK_TIME,
+        if (action == CODEC_ACTION_SEEK_TIME) {
+            struct pcm_pos *newpos = codec->get_seek_pos(param, PCM_SEEK_TIME,
                                                          &read_buffer);
-
             if (newpos->pos > format.numbytes)
+            {
+                ci->set_elapsed(ci->id3->length);
+                ci->seek_complete();
                 break;
+            }
+
             if (ci->seek_buffer(firstblockposn + newpos->pos))
             {
                 bytesdone      = newpos->pos;
                 decodedsamples = newpos->samples;
             }
+
+            ci->set_elapsed(decodedsamples*1000LL/ci->id3->frequency);
             ci->seek_complete();
         }
 
@@ -423,11 +415,10 @@ next_track:
             endofstream = 1;
         }
 
-        status = codec->decode(wavbuf, n, samples, &bufcount);
-        if (status == CODEC_ERROR)
+        if (codec->decode(wavbuf, n, samples, &bufcount) == CODEC_ERROR)
         {
             DEBUGF("codec error\n");
-            goto done;
+            return CODEC_ERROR;
         }
 
         ci->pcmbuf_insert(samples, NULL, bufcount);
@@ -440,10 +431,5 @@ next_track:
         ci->set_elapsed(decodedsamples*1000LL/ci->id3->frequency);
     }
 
-done:
-    if (ci->request_next_track())
-        goto next_track;
-
-exit:
-    return status;
+    return CODEC_OK;
 }