len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

VGM Codec: Improve time and fade behavior. Tweak minor misc.

Browse source 
Prevents cutoff of tracks, especially short ones:
* Extend looped tracks by fade length to fade at start of loop repeat.
* No fade occurs for non-repeating track only having an intro.
* Uses id3.tail_trim field to store fade duration.

Use libGME built-in elapsed time reporting instead of custom calculation:
* libGME already reports in milliseconds.
* Don't advance time counter when Repeat == One. It just runs the progress
  over the length limit.

Fix a comment about sample rate and set the reported bitrate to be
accurate for 44.1 kHz stereo.

Change-Id: I3ede22bda0f9a941a3fef751f4d678eb0027344c
This commit is contained in:
Michael Sevakis 2013-03-06 19:36:24 -05:00
parent 2f9e3cae2c
commit c73894213d
2 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/rbcodec/metadata/vgm.c
View file

@ -113,6 +113,8 @@ static long check_gd3_header( byte* h, long remain )
static void get_vgm_length( struct header_t* h, struct mp3entry* id3 )
{
long length = get_long_le( h->track_duration ) * 10 / 441;
id3->tail_trim = 4 * 1000; /* assume fade */
if ( length > 0 )
{
long loop_length = 0, intro_length = 0;
@ -126,13 +128,15 @@ static void get_vgm_length( struct header_t* h, struct mp3entry* id3 )
{
intro_length = length; /* make it clear that track is no longer than length */
loop_length = 0;
id3->tail_trim = 0;
}
id3->length = intro_length + 2 * loop_length; /* intro + 2 loops */
return;
/* intro + 2 loops + fade */
id3->length = intro_length + 2 * loop_length + id3->tail_trim;
return;
}
id3->length = 150 * 1000; /* 2.5 minutes */
id3->length = 150 * 1000 + id3->tail_trim; /* 2.5 minutes + fade */
}
bool get_vgm_metadata(int fd, struct mp3entry* id3)
@ -151,7 +155,7 @@ bool get_vgm_metadata(int fd, struct mp3entry* id3)
id3->vbr = false;
id3->filesize = filesize(fd);
id3->bitrate = 706;
id3->bitrate = 1411;
id3->frequency = 44100;
/* If file is gzipped, will get metadata later */