Initial, work-in-progress, version of a WMA codec using Michael Giacomelli's fixed-point and malloc-less WMA decoder (based on the ffmpeg WMA decoder from early 2006, and also building on the work started by Paul Jones). The codec itself and the ASF parsing code were written by me, inspired by the ASF parser in libasf. Current performance is around 400% realtime on gigabeat, 100% realtime on PP and 20% realtime on Coldfire.

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

2 files changed, 4 insertions, 0 deletions

diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 96a27a55af..4ce2e9978f 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -56,6 +56,7 @@ enum
     AFMT_SPEEX,        /* Ogg Speex speech */
     AFMT_SPC,          /* SPC700 save state */
     AFMT_APE,          /* Monkey's Audio (APE) */
+    AFMT_WMA,          /* WMAV1/V2 in ASF */
 #endif
 
     /* add new formats at any index above this line to have a sensible order -
diff --git a/firmware/id3.c b/firmware/id3.c
index 3e7b392554..197aa0492a 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -110,6 +110,9 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
     /* APE (Monkey's Audio) */
     [AFMT_APE] =
         AFMT_ENTRY("APE",  "ape",     NULL,          "ape\0mac\0"      ),
+    /* WMA (WMAV1/V2 in ASF) */
+    [AFMT_WMA] =
+        AFMT_ENTRY("WMA",  "wma",     NULL,          "wma\0wmv\0asf"   ),
 #endif
 };