oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/mikmod: count frame position

Browse Source 
Don't maintain the current time stamp in a floating point variable,
because this is subject to rounding errors.
This commit is contained in:
Max Kellermann
2009-11-14 02:18:58 +01:00
parent 1648c7aa5b
commit dd4625ce13
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/decoder/mikmod_plugin.c
View File

@@ -146,10 +146,9 @@ mikmod_decoder_file_decode(struct decoder *decoder, const char *path_fs)
char *path2; char *path2;
MODULE *handle; MODULE *handle;
struct audio_format audio_format; struct audio_format audio_format;
float total_time = 0.0;
int ret; int ret;
float secPerByte;
SBYTE buffer[MIKMOD_FRAME_SIZE]; SBYTE buffer[MIKMOD_FRAME_SIZE];
unsigned frame_size, current_frame = 0;
enum decoder_command cmd = DECODE_COMMAND_NONE; enum decoder_command cmd = DECODE_COMMAND_NONE;
path2 = g_strdup(path_fs); path2 = g_strdup(path_fs);
@@ -167,18 +166,17 @@ mikmod_decoder_file_decode(struct decoder *decoder, const char *path_fs)
audio_format_init(&audio_format, mikmod_sample_rate, 16, 2); audio_format_init(&audio_format, mikmod_sample_rate, 16, 2);
assert(audio_format_valid(&audio_format)); assert(audio_format_valid(&audio_format));
secPerByte =
1.0 / ((audio_format.bits * audio_format.channels / 8.0) *
(float)audio_format.sample_rate);
decoder_initialized(decoder, &audio_format, false, 0); decoder_initialized(decoder, &audio_format, false, 0);
frame_size = audio_format_frame_size(&audio_format);
Player_Start(handle); Player_Start(handle);
while (cmd == DECODE_COMMAND_NONE && Player_Active()) { while (cmd == DECODE_COMMAND_NONE && Player_Active()) {
ret = VC_WriteBytes(buffer, sizeof(buffer)); ret = VC_WriteBytes(buffer, sizeof(buffer));
total_time += ret * secPerByte; current_frame += ret / frame_size;
cmd = decoder_data(decoder, NULL, buffer, ret, cmd = decoder_data(decoder, NULL, buffer, ret,
total_time, 0, NULL); (float)current_frame / (float)mikmod_sample_rate,
0, NULL);
} }
Player_Stop(); Player_Stop();