2 files changed, 79 insertions, 0 deletions

diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 8a79cb0ce1..99999817c2 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -19,8 +19,37 @@
 #ifndef ID3_H
 #define ID3_H
 
+#include "config.h"
 #include "file.h"
 
+/* Audio file types. */
+/* NOTE: When adding new audio types, also add to codec_labels[] in id3.c */
+enum {
+    AFMT_UNKNOWN = 0,  /* Unknown file format */
+
+#if CONFIG_HWCODEC==MASNONE
+    AFMT_MPA_L1,       /* MPEG Audio layer 1 */
+#endif
+
+    AFMT_MPA_L2,       /* MPEG Audio layer 2 */
+    AFMT_MPA_L3,       /* MPEG Audio layer 3 */
+
+#if CONFIG_HWCODEC==MASNONE
+    AFMT_PCM_WAV,      /* Uncompressed PCM in a WAV file */
+    AFMT_OGG_VORBIS,   /* Ogg Vorbis */
+    AFMT_FLAC,         /* FLAC */
+    AFMT_MPC,          /* Musepack */
+    AFMT_AAC,          /* AAC */
+    AFMT_APE,          /* Monkey's Audio */
+    AFMT_WMA,          /* Windows Media Audio */
+    AFMT_A52,          /* A/52 (aka AC3) audio */
+    AFMT_REAL,         /* Realaudio */
+    AFMT_WAVPACK,      /* WavPack */
+#endif
+
+    AFMT_ENDMARKER     /* THIS MUST BE THE LAST VALUE */
+};
+
 struct mp3entry {
     char path[MAX_PATH];
     char *title;
@@ -33,6 +62,7 @@ struct mp3entry {
     int tracknum;
     int version;
     int layer;
+    int codectype;
     int year;
     unsigned char id3version;
     unsigned char genre;
@@ -76,5 +106,6 @@ enum {
 
 bool mp3info(struct mp3entry *entry, const char *filename, bool v1first);
 char* id3_get_genre(const struct mp3entry* id3);
+char* id3_get_codec(const struct mp3entry* id3);
 
 #endif
diff --git a/firmware/id3.c b/firmware/id3.c
index becb6781cc..603639d1f5 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -33,6 +33,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <ctype.h>
+#include "config.h"
 #include "file.h"
 #include "debug.h"
 #include "atoi.h"
@@ -77,6 +78,31 @@ static const char* const genres[] = {
     "Duet", "Punk Rock", "Drum Solo", "A capella", "Euro-House", "Dance Hall"
 };
 
+static const char* const codec_labels[] = {
+  "???",  /* Unknown file format */
+
+#if CONFIG_HWCODEC==MASNONE
+  "MP1",  /* MPEG Audio layer 1 */
+#endif
+
+  "MP2",  /* MPEG Audio layer 2 */
+  "MP3",  /* MPEG Audio layer 3 */
+
+#if CONFIG_HWCODEC==MASNONE
+  "WAV",  /* Uncompressed PCM in a WAV file */
+  "OGG",  /* Ogg Vorbis */
+  "FLAC", /* FLAC */
+  "MPC",  /* Musepack */
+  "AAC",  /* AAC */
+  "APE",  /* Monkey's Audio */
+  "WMA",  /* Windows Media Audio */
+  "AC3",  /* A/52 (aka AC3) audio */
+  "RA",   /* Realaudio */
+  "WV",   /* WavPack */
+#endif
+  NULL
+};
+
 char* id3_get_genre(const struct mp3entry* id3)
 {
     if( id3->genre_string )
@@ -87,6 +113,15 @@ char* id3_get_genre(const struct mp3entry* id3)
     return NULL;
 }
 
+char* id3_get_codec(const struct mp3entry* id3)
+{
+  if ((id3->codectype >= 0) && (id3->codectype < AFMT_ENDMARKER)) {
+    return (char*)codec_labels[id3->codectype];
+  } else {
+    return NULL;
+  }
+}
+
 /*
     HOW TO ADD ADDITIONAL ID3 VERSION 2 TAGS
     Code and comments by Thomas Paul Diffenbach
@@ -763,6 +798,19 @@ static int getsonglength(int fd, struct mp3entry *entry)
     entry->frequency = info.frequency;
     entry->version = info.version;
     entry->layer = info.layer;
+    switch(entry->layer) {
+#if CONFIG_HWCODEC==MASNONE
+        case 0:
+            entry->codectype=AFMT_MPA_L1;
+            break;
+#endif
+        case 1:
+            entry->codectype=AFMT_MPA_L2;
+            break;
+        case 2:
+            entry->codectype=AFMT_MPA_L3;
+            break;
+    }
 
     /* If the file time hasn't been established, this may be a fixed
        rate MP3, so just use the default formula */