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

mp3: moved code to mp3_time_to_frame()

Browse Source 
Break the large function mp3_read() into smaller pieces.
This commit is contained in:
Max Kellermann 2008-10-29 16:12:26 +01:00
parent ec3083948f
commit a6f8776c94
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/decoder/mp3_plugin.c
View File

@ -820,6 +820,22 @@ mp3_open(struct input_stream *is, struct mp3_data *data,
return true; return true;
} }
static long
mp3_time_to_frame(const struct mp3_data *data, double t)
{
unsigned long i;
for (i = 0; i < data->highest_frame; ++i) {
double frame_time =
mad_timer_count(data->times[i],
MAD_UNITS_MILLISECONDS) / 1000.;
if (frame_time >= t)
break;
}
return i;
}
static enum mp3_action static enum mp3_action
mp3_read(struct mp3_data *data, ReplayGainInfo **replay_gain_info_r) mp3_read(struct mp3_data *data, ReplayGainInfo **replay_gain_info_r)
{ {
@ -951,18 +967,12 @@ mp3_read(struct mp3_data *data, ReplayGainInfo **replay_gain_info_r)
return DECODE_BREAK; return DECODE_BREAK;
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) { if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) {
unsigned long j = 0; unsigned long j;
assert(data->input_stream->seekable); assert(data->input_stream->seekable);
data->mute_frame = MUTEFRAME_SEEK; j = mp3_time_to_frame(data,
while (j < data->highest_frame && decoder_seek_where(decoder));
decoder_seek_where(decoder) >
((float)mad_timer_count(data->times[j],
MAD_UNITS_MILLISECONDS))
/ 1000) {
j++;
}
if (j < data->highest_frame) { if (j < data->highest_frame) {
if (mp3_seek(data, data->frame_offsets[j])) { if (mp3_seek(data, data->frame_offsets[j])) {
decoder_clear(decoder); decoder_clear(decoder);
@ -970,8 +980,8 @@ mp3_read(struct mp3_data *data, ReplayGainInfo **replay_gain_info_r)
decoder_command_finished(decoder); decoder_command_finished(decoder);
} else } else
decoder_seek_error(decoder); decoder_seek_error(decoder);
data->mute_frame = MUTEFRAME_NONE; } else
} data->mute_frame = MUTEFRAME_SEEK;
} }
} }