devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25134 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-03-12 18:47:13 +00:00
parent c82cac4c3d
commit 2ac401f486
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/codecs/atrac3_oma.c
View file

@ -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;
}

2
apps/codecs/atrac3_rm.c
View file

@ -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;
}

4
apps/metadata/wave.c
View file

@ -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;