Initial version of a test_codec plugin (viewer). This loads the audio file into the audio buffer and decodes it as fast as it can via a locally implemented version of the codec API. Intended for use when optimising codecs - so isn't built by default. Remember to add it to both plugins/SOURCES and viewers.config to enable it. Currently the codec is run in the main thread which means mpa.codec doesn't work - it requires more stack than is available on the main thread. The solution will be to create a new thread in the plugin which steals the main codec thread's IRAM stack, but that's not done yet.

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

5 files changed, 364 insertions, 3 deletions

diff --git a/apps/playback.c b/apps/playback.c
index b26754eb3a..889cf9406e 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -275,7 +275,6 @@ static size_t high_watermark = 0; /* High watermark for rebuffer (A/V/other) */
 
 /* Multiple threads */
 static void set_current_codec(int codec_idx);
-static const char *get_codec_filename(int enc_spec); /* (A-/C-/V-) */
 /* Set the watermark to trigger buffer fill (A/C) FIXME */
 static void set_filebuf_watermark(int seconds);
 
@@ -995,7 +994,7 @@ static void set_filebuf_watermark(int seconds)
     conf_watermark = bytes;
 }
 
-static const char * get_codec_filename(int cod_spec)
+const char * get_codec_filename(int cod_spec)
 {
     const char *fname;
 
diff --git a/apps/playback.h b/apps/playback.h
index 9a8bd10390..eaab4386e0 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -57,6 +57,7 @@ struct track_info {
 };
 
 /* Functions */
+const char * get_codec_filename(int cod_spec);
 void audio_set_track_changed_event(void (*handler)(struct mp3entry *id3));
 void audio_set_track_buffer_event(void (*handler)(struct mp3entry *id3,
                                                   bool last_track));
diff --git a/apps/plugin.c b/apps/plugin.c
index ea228c454c..9e17c232ce 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -488,6 +488,12 @@ static const struct plugin_api rockbox_api = {
     spinlock_lock,
     spinlock_unlock,
 #endif
+
+#if (CONFIG_CODEC == SWCODEC)
+    codec_load_file,
+    get_metadata,
+    get_codec_filename,
+#endif
 };
 
 int plugin_load(const char* plugin, void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 987c07067d..cb8324febe 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -59,6 +59,9 @@
 #include "misc.h"
 #if (CONFIG_CODEC == SWCODEC)
 #include "dsp.h"
+#include "codecs.h"
+#include "playback.h"
+#include "metadata.h"
 #ifdef HAVE_RECORDING
 #include "recording.h"
 #endif
@@ -110,7 +113,7 @@
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 54
+#define PLUGIN_API_VERSION 55
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
@@ -602,6 +605,13 @@ struct plugin_api {
     void (*spinlock_lock)(struct mutex *m);
     void (*spinlock_unlock)(struct mutex *m);
 #endif
+
+#if (CONFIG_CODEC == SWCODEC)
+    int (*codec_load_file)(const char* codec, struct codec_api *api);
+    bool (*get_metadata)(struct track_info* track, int fd, const char* trackname,
+                         bool v1first);
+    const char *(*get_codec_filename)(int cod_spec);
+#endif
 };
 
 /* plugin header */
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
new file mode 100644
index 0000000000..56d59b3ab3
--- /dev/null
+++ b/apps/plugins/test_codec.c
@@ -0,0 +1,345 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: $
+ *
+ * Copyright (C) 2007 Dave Chapman
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "plugin.h"
+
+PLUGIN_HEADER
+
+static struct plugin_api* rb;
+
+static void* audiobuf;
+static void* codec_mallocbuf;
+static size_t audiosize;
+static char str[40];
+
+/* Our local implementation of the codec API */
+static struct codec_api ci;
+
+
+static struct track_info track;
+
+static bool taginfo_ready = true;
+
+
+/* Returns buffer to malloc array. Only codeclib should need this. */
+static void* get_codec_memory(size_t *size)
+{
+   DEBUGF("get_codec_memory(%d)\n",(int)size);
+   *size = 512*1024;
+   return codec_mallocbuf;
+}
+
+
+/* Insert PCM data into audio buffer for playback. Playback will start
+   automatically. */
+static bool pcmbuf_insert(const void *ch1, const void *ch2, int count)
+{
+    /* Always successful - just discard data */
+    (void)ch1;
+    (void)ch2;
+    (void)count;
+
+    return true;
+}
+
+
+static unsigned int prev_value = 0;
+
+/* Set song position in WPS (value in ms). */
+static void set_elapsed(unsigned int value)
+{
+    if ((value - prev_value) > 2000)
+    {
+        rb->snprintf(str,sizeof(str),"%d of %d",value,(int)track.id3.length);
+        rb->lcd_puts(0,0,str);
+        rb->lcd_update();
+        prev_value = value;
+    }
+}
+
+
+/* Read next <size> amount bytes from file buffer to <ptr>.
+   Will return number of bytes read or 0 if end of file. */
+static size_t read_filebuf(void *ptr, size_t size)
+{
+   DEBUGF("read_filebuf(_,%d)\n",(int)size);
+   if (ci.curpos > (off_t)track.filesize)
+   {
+       return 0;
+   } else {
+       /* TODO: Don't read beyond end of buffer */
+       rb->memcpy(ptr, audiobuf + ci.curpos, size);
+       ci.curpos += size;
+       DEBUGF("New ci.curpos = %d\n",ci.curpos);
+       return size;
+   }
+}
+
+
+/* Request pointer to file buffer which can be used to read
+   <realsize> amount of data. <reqsize> tells the buffer system
+   how much data it should try to allocate. If <realsize> is 0,
+   end of file is reached. */
+static void* request_buffer(size_t *realsize, size_t reqsize)
+{
+    *realsize = MIN(track.filesize-ci.curpos,reqsize);
+
+    return (audiobuf + ci.curpos);
+}
+
+
+/* Advance file buffer position by <amount> amount of bytes. */
+static void advance_buffer(size_t amount)
+{
+    ci.curpos += amount;
+    DEBUGF("advance_buffer(%d) - new ci.curpos=%d\n",(int)amount,(int)ci.curpos);
+}
+
+
+/* Advance file buffer to a pointer location inside file buffer. */
+static void advance_buffer_loc(void *ptr)
+{
+    ci.curpos = ptr - audiobuf;
+}
+
+
+/* Seek file buffer to position <newpos> beginning of file. */
+static bool seek_buffer(size_t newpos)
+{
+    ci.curpos = newpos;
+    return true;
+}
+
+
+/* Codec should call this function when it has done the seeking. */
+static void seek_complete(void)
+{
+    /* Do nothing */
+}
+
+
+/* Calculate mp3 seek position from given time data in ms. */
+static off_t mp3_get_filepos(int newtime)
+{
+    /* We don't ask the codec to seek, so no need to implement this. */
+    (void)newtime;
+    return 0;
+}
+
+
+/* Request file change from file buffer. Returns true is next
+   track is available and changed. If return value is false,
+   codec should exit immediately with PLUGIN_OK status. */
+static bool request_next_track(void)
+{
+    /* We are only decoding a single track */
+    return false;
+}
+
+
+/* Free the buffer area of the current codec after its loaded */
+static void discard_codec(void)
+{
+    /* ??? */
+}
+
+
+static void set_offset(size_t value)
+{
+    DEBUGF("set_offset(%d)\n",(int)value);
+    /* ??? */
+    (void)value;
+}
+
+
+/* Configure different codec buffer parameters. */
+static void configure(int setting, intptr_t value)
+{
+    (void)setting;
+    (void)value;
+    DEBUGF("setting %d = %d\n",setting,(int)value);
+}
+
+static void init_ci(void)
+{
+    /* --- Our "fake" implementations of the codec API functions. --- */
+
+    ci.get_codec_memory = get_codec_memory;
+    ci.pcmbuf_insert = pcmbuf_insert;
+    ci.set_elapsed = set_elapsed;
+    ci.read_filebuf = read_filebuf;
+    ci.request_buffer = request_buffer;
+    ci.advance_buffer = advance_buffer;
+    ci.advance_buffer_loc = advance_buffer_loc;
+    ci.seek_buffer = seek_buffer;
+    ci.seek_complete = seek_complete;
+    ci.mp3_get_filepos = mp3_get_filepos;
+    ci.request_next_track = request_next_track;
+    ci.discard_codec = discard_codec;
+    ci.set_offset = set_offset;
+    ci.configure = configure;
+
+    /* --- "Core" functions --- */
+
+    /* kernel/ system */
+    ci.PREFIX(sleep) = rb->PREFIX(sleep);
+    ci.yield = rb->yield;
+
+    /* strings and memory */
+    ci.strcpy = rb->strcpy;
+    ci.strncpy = rb->strncpy;
+    ci.strlen = rb->strlen;
+    ci.strcmp = rb->strcmp;
+    ci.strcat = rb->strcat;
+    ci.memset = rb->memset;
+    ci.memcpy = rb->memcpy;
+    ci.memmove = rb->memmove;
+    ci.memcmp = rb->memcmp;
+    ci.memchr = rb->memchr;
+
+#if defined(DEBUG) || defined(SIMULATOR)
+    ci.debugf = rb->debugf;
+#endif
+#ifdef ROCKBOX_HAS_LOGF
+    ci.logf = rb->logf;
+#endif
+
+    ci.qsort = rb->qsort;
+    ci.global_settings = rb->global_settings;
+
+#ifdef RB_PROFILE
+    ci.profile_thread = rb->profile_thread;
+    ci.profstop = rb->profstop;
+    ci.profile_func_enter = rb->profile_func_enter;
+    ci.profile_func_exit = rb->profile_func_exit;
+#endif
+}
+
+/* plugin entry point */
+enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
+{
+    size_t n;
+    int fd;
+    const char* codecname;
+    int res;
+    unsigned long starttick;
+    unsigned long ticks;
+    unsigned long speed;
+    unsigned long duration;
+
+    rb = api;
+
+    if (parameter == NULL)
+    {
+        rb->splash(HZ*2, "No File");
+        return PLUGIN_ERROR;
+    }
+
+    codec_mallocbuf = rb->plugin_get_audio_buffer(&audiosize);
+    audiobuf = codec_mallocbuf + 512*1024;
+    audiosize -= 512*1024;
+    
+    fd = rb->open(parameter,O_RDONLY);
+    if (fd < 0)
+    {
+        rb->splash(HZ*2, "Cannot open file");
+        return PLUGIN_ERROR;
+    }
+
+    track.filesize = rb->filesize(fd);
+
+    if (!rb->get_metadata(&track, fd, parameter,
+                      rb->global_settings->id3_v1_first))
+    {
+        rb->splash(HZ*2, "Cannot read metadata");
+        return PLUGIN_ERROR;
+    }
+    
+    if (track.filesize > audiosize)
+    {
+        rb->splash(HZ*2, "File too large");
+        return PLUGIN_ERROR;
+    }
+
+    rb->splash(0, "Loading...");
+
+    n = rb->read(fd, audiobuf, track.filesize);
+
+    if (n != track.filesize)
+    {
+        rb->splash(HZ*2, "Read failed.");
+        return PLUGIN_ERROR;
+    }
+
+    /* Initialise the function pointers in the codec API */
+    init_ci();
+
+    /* Prepare the codec struct for playing the whole file */
+    ci.filesize = track.filesize;
+    ci.id3 = &track.id3;
+    ci.taginfo_ready = &taginfo_ready;
+    ci.curpos = 0;
+    ci.stop_codec = false;
+    ci.new_track = 0;
+    ci.seek_time = 0;
+
+    codecname = rb->get_codec_filename(track.id3.codectype);
+
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    rb->cpu_boost(true);
+#endif
+    rb->lcd_set_backdrop(NULL);
+    rb->lcd_set_foreground(LCD_WHITE);
+    rb->lcd_set_background(LCD_BLACK);
+    rb->lcd_clear_display();
+    rb->lcd_update();
+
+    starttick = *rb->current_tick;
+
+    /* Load the codec and start decoding. */
+    res = rb->codec_load_file(codecname,&ci);
+
+
+    /* Display benchmark information */
+
+    ticks = *rb->current_tick - starttick;
+    rb->snprintf(str,sizeof(str),"Decode time - %d.%02ds",(int)ticks/100,(int)ticks%100);
+    rb->lcd_puts(0,1,str);
+
+    duration = track.id3.length / 10;
+    rb->snprintf(str,sizeof(str),"File duration - %d.%02ds",(int)duration/100,(int)duration%100);
+    rb->lcd_puts(0,2,str);
+
+    if (ticks > 0)
+        speed = duration * 10000 / ticks;
+    else
+        speed = 0;
+
+    rb->snprintf(str,sizeof(str),"%d.%02d%% realtime",(int)speed/100,(int)speed%100);
+    rb->lcd_puts(0,3,str);
+
+    rb->lcd_update();
+
+    while (rb->button_get(true) != BUTTON_SELECT);
+
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    rb->cpu_boost(false);
+#endif
+
+    return PLUGIN_OK;
+}