kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bugs in mp3 info gathering. Should be quicker now.

CQTexperiment
vspader 2007-02-17 17:07:30 +00:00
parent eb47e318f3
commit ff98fd44f0
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sound/SoundFile/MADFile.m
View File

@ -160,7 +160,9 @@ int parse_headers(struct xing *xing, struct lame *lame, struct mad_bitptr ptr, u
_fileSize = ftell(_inFd); _fileSize = ftell(_inFd);
fseek(_inFd, 0, SEEK_SET); fseek(_inFd, 0, SEEK_SET);
while (1) BOOL done = NO;
while (!done)
{ {
remainder = stream.bufend - stream.next_frame; remainder = stream.bufend - stream.next_frame;
@ -226,7 +228,7 @@ int parse_headers(struct xing *xing, struct lame *lame, struct mad_bitptr ptr, u
mad_timer_multiply (&_duration, frames); mad_timer_multiply (&_duration, frames);
bitrate = 8.0 * xing.bytes / mad_timer_count(_duration, MAD_UNITS_SECONDS); bitrate = 8.0 * xing.bytes / mad_timer_count(_duration, MAD_UNITS_SECONDS);
NSLog(@"Xing bitrate: %i", bitrate); done = YES;
break; break;
} }
} }
@ -241,7 +243,7 @@ int parse_headers(struct xing *xing, struct lame *lame, struct mad_bitptr ptr, u
bitrate += header.bitrate; bitrate += header.bitrate;
} }
if ((vbr && !has_xing) && fast && frames >= N_AVERAGE_FRAMES) if ((!vbr || (vbr && !has_xing)) && fast && frames >= N_AVERAGE_FRAMES)
{ {
float frame_size = ((double)data_used) / N_AVERAGE_FRAMES; float frame_size = ((double)data_used) / N_AVERAGE_FRAMES;
frames = (_fileSize - tagsize) / frame_size; frames = (_fileSize - tagsize) / frame_size;
@ -250,11 +252,7 @@ int parse_headers(struct xing *xing, struct lame *lame, struct mad_bitptr ptr, u
_duration.fraction /= N_AVERAGE_FRAMES; _duration.fraction /= N_AVERAGE_FRAMES;
mad_timer_multiply (&_duration, frames); mad_timer_multiply (&_duration, frames);
if (vbr && !has_xing) { done = YES;
bitrate /= N_AVERAGE_FRAMES;
bitrate *= frames;
}
break; break;
} }
} }

5
TODO
View File

@ -1,2 +1,3 @@
Deep sort when dropping files into the playlist. Plugins.
Plugins and such. Stuff.