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

decoder/HybridDSD: implement seeking

Browse Source
This commit is contained in:
Max Kellermann
2018-02-13 09:53:05 +01:00
parent 60dbf1bea0
commit 61f2ce67dd
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/decoder/plugins/HybridDsdDecoderPlugin.cxx
View File

@@ -177,30 +177,33 @@ HybridDsdDecode(DecoderClient &client, InputStream &input)
streams */ streams */
return; return;
offset_type remaining_bytes; uint64_t total_frames;
size_t frame_size; size_t frame_size;
unsigned kbit_rate; unsigned kbit_rate;
try { try {
auto result = FindHybridDsdData(client, input); auto result = FindHybridDsdData(client, input);
auto duration = SignedSongTime::FromS(result.second / result.first.GetTimeToSize()); auto duration = SignedSongTime::FromS(result.second / result.first.GetTimeToSize());
client.Ready(result.first, client.Ready(result.first, true, duration);
/* TODO: implement seeking */ false,
duration);
frame_size = result.first.GetFrameSize(); frame_size = result.first.GetFrameSize();
kbit_rate = frame_size * result.first.sample_rate / kbit_rate = frame_size * result.first.sample_rate /
(1024u / 8u); (1024u / 8u);
remaining_bytes = result.second; total_frames = result.second / frame_size;
} catch (UnsupportedFile) { } catch (UnsupportedFile) {
/* not a Hybrid-DSD file; let the next decoder plugin /* not a Hybrid-DSD file; let the next decoder plugin
(e.g. FFmpeg) handle it */ (e.g. FFmpeg) handle it */
return; return;
} }
const offset_type start_offset = input.GetOffset();
offset_type remaining_bytes = total_frames * frame_size;
StaticFifoBuffer<uint8_t, 16384> buffer; StaticFifoBuffer<uint8_t, 16384> buffer;
auto cmd = client.GetCommand(); auto cmd = client.GetCommand();
while (remaining_bytes > 0) { while (remaining_bytes > 0) {
uint64_t seek_frame;
switch (cmd) { switch (cmd) {
case DecoderCommand::NONE: case DecoderCommand::NONE:
case DecoderCommand::START: case DecoderCommand::START:
@@ -210,7 +213,24 @@ HybridDsdDecode(DecoderClient &client, InputStream &input)
return; return;
case DecoderCommand::SEEK: case DecoderCommand::SEEK:
// TODO: implement seeking seek_frame = client.GetSeekFrame();
if (seek_frame >= total_frames) {
/* seeking past the end */
client.CommandFinished();
return;
}
try {
input.LockSeek(start_offset + seek_frame * frame_size);
remaining_bytes = (total_frames - seek_frame) * frame_size;
buffer.Clear();
client.CommandFinished();
} catch (...) {
LogError(std::current_exception());
client.SeekError();
}
cmd = DecoderCommand::NONE;
break; break;
} }