Make atrac3 streams in wav containers work again (error was introduced with r24782). Add additional info to atrac3 debug information.

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

3 files changed, 5 insertions, 3 deletions

diff --git a/apps/codecs/atrac3_oma.c b/apps/codecs/atrac3_oma.c
index df34999..00a0ec0 100644
--- a/apps/codecs/atrac3_oma.c
+++ b/apps/codecs/atrac3_oma.c
@@ -60,7 +60,7 @@ next_track:
     
     res =atrac3_decode_init(&q, ci->id3);
     if(res < 0) {
-        DEBUGF("failed to initialize atrac decoder\n");
+        DEBUGF("failed to initialize OMA atrac decoder\n");
         return CODEC_ERROR;
     }
 
diff --git a/apps/codecs/atrac3_rm.c b/apps/codecs/atrac3_rm.c
index b8f8489..a0b0fd8 100644
--- a/apps/codecs/atrac3_rm.c
+++ b/apps/codecs/atrac3_rm.c
@@ -83,7 +83,7 @@ next_track:
     
     res =atrac3_decode_init(&q, ci->id3);
     if(res < 0) {
-        DEBUGF("failed to initialize atrac decoder\n");
+        DEBUGF("failed to initialize RM atrac decoder\n");
         return CODEC_ERROR;
     }
 
diff --git a/apps/metadata/wave.c b/apps/metadata/wave.c
index 1753b64..3a54d72 100644
--- a/apps/metadata/wave.c
+++ b/apps/metadata/wave.c
@@ -196,6 +196,8 @@ static void parse_riff_format(unsigned char* buf, int fmtsize, struct wave_fmt *
         id3->extradata_size = 14;
         id3->channels = 2;
         id3->codectype = AFMT_OMA_ATRAC3;
+        id3->bytesperframe = fmt->blockalign;
+        
         /* Store the extradata for the codec */
         AV_WL16(&id3->id3v2buf[0],  1);             // always 1
         AV_WL32(&id3->id3v2buf[2],  id3->frequency);// samples rate
@@ -303,7 +305,7 @@ static bool read_header(int fd, struct mp3entry* id3, const unsigned char **chun
     id3->filesize = filesize(fd);
 
     /* Calculate track length (in ms) and estimate the bitrate (in kbit/s) */
-    if(fmt.formattag != AFMT_OMA_ATRAC3)
+    if(fmt.formattag != WAVE_FORMAT_ATRAC3)
     {
         if (id3->frequency != 0)
             id3->length = ((int64_t) fmt.totalsamples * 1000) / id3->frequency;