2 files changed, 12 insertions, 3 deletions

diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c
index a3721f0e9a..9ae174af7e 100644
--- a/apps/metadata/mp4.c
+++ b/apps/metadata/mp4.c
@@ -300,8 +300,7 @@ static bool read_mp4_esds(int fd, struct mp3entry* id3, uint32_t* size)
         /* Skip 13 bits from above, plus 3 bits, then read 11 bits */
         else if ((length >= 4) && (((bits >> 5) & 0x7ff) == 0x2b7))
         {
-            /* extensionAudioObjectType */
-            DEBUGF("MP4: extensionAudioType\n");
+            /* We found an extensionAudioObjectType */
             type = bits & 0x1f;         /* Object type - 5 bits*/
             bits = get_long_be(&buf[4]);
             
@@ -680,7 +679,6 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
             {
                 uint32_t frequency;
 
-                id3->codectype = (type == MP4_mp4a) ? AFMT_MP4_AAC : AFMT_MP4_ALAC;
                 lseek(fd, 22, SEEK_CUR);
                 read_uint32be(fd, &frequency);
                 size -= 26;
@@ -700,11 +698,13 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
                     read_mp4_atom(fd, &subsize, &subtype, size);
                     size -= 10;
                     
+                    id3->codectype = AFMT_MP4_AAC;
                     if (subtype == MP4_esds)
                     {
                         sbr_used = read_mp4_esds(fd, id3, &size);
                         if (sbr_used)
                         {
+                            id3->codectype = AFMT_MP4_AAC_HE;
                             if (SBR_upsampling_used)
                                 DEBUGF("MP4: AAC-HE, SBR upsampling\n");
                             else
@@ -712,6 +712,11 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
                         }
                     }
                 }
+                else
+                {
+                    id3->codectype = AFMT_MP4_ALAC;
+                }
+
             }
             break;
 
diff --git a/apps/metadata/mpc.c b/apps/metadata/mpc.c
index 0dd76fcc4b..0387dc9f77 100644
--- a/apps/metadata/mpc.c
+++ b/apps/metadata/mpc.c
@@ -125,6 +125,8 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3)
            
             bufused = set_replaygain_sv7(id3, false, header[3], bufused);
             bufused = set_replaygain_sv7(id3, true , header[4], bufused);
+            
+            id3->codectype = AFMT_MPC_SV7;
         } else {
             return false; /* only SV7 is allowed within a "MP+" signature */
         }
@@ -191,6 +193,8 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3)
                     bufused += set_replaygain_sv8(id3, true , gain, peak, bufused);
                 }
             }
+            
+            id3->codectype = AFMT_MPC_SV8;
         } else {
             /* No sv8 stream header found */
             return false;