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

Add song duration to DSF and DSDIFF DSD decoders.

Browse Source
This commit is contained in:
Jurgen Kramer 2012-07-12 19:40:56 +02:00 committed by Max Kellermann
parent 5385d1fa80
commit d4d92ac1a7
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/decoder/dsdiff_decoder_plugin.c
View File

@ -33,6 +33,7 @@
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "tag_handler.h" #include "tag_handler.h"
#include "dsdlib.h" #include "dsdlib.h"
#include "tag_handler.h"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> /* for SEEK_SET, SEEK_CUR */ #include <stdio.h> /* for SEEK_SET, SEEK_CUR */
@ -313,14 +314,19 @@ dsdiff_stream_decode(struct decoder *decoder, struct input_stream *is)
return; return;
} }
/* calculate song time from DSD chunk size and sample frequency */
uint64_t chunk_size = metadata.chunk_size;
float songtime = ((chunk_size / metadata.channels) * 8) /
(float) metadata.sample_rate;
/* success: file was recognized */ /* success: file was recognized */
decoder_initialized(decoder, &audio_format, false, -1); decoder_initialized(decoder, &audio_format, false, songtime);
/* every iteration of the following loop decodes one "DSD" /* every iteration of the following loop decodes one "DSD"
chunk from a DFF file */ chunk from a DFF file */
while (true) { while (true) {
uint64_t chunk_size = dsdiff_chunk_size(&chunk_header); chunk_size = dsdiff_chunk_size(&chunk_header);
if (dsdlib_id_equals(&chunk_header.id, "DSD ")) { if (dsdlib_id_equals(&chunk_header.id, "DSD ")) {
if (!dsdiff_decode_chunk(decoder, is, if (!dsdiff_decode_chunk(decoder, is,
@ -363,6 +369,11 @@ dsdiff_scan_stream(struct input_stream *is,
/* refuse to parse files which we cannot play anyway */ /* refuse to parse files which we cannot play anyway */
return false; return false;
/* calculate song time and add as tag */
unsigned songtime = ((metadata.chunk_size / metadata.channels) * 8) /
metadata.sample_rate;
tag_handler_invoke_duration(handler, handler_ctx, songtime);
return true; return true;
} }

12
src/decoder/dsf_decoder_plugin.c
View File

@ -33,6 +33,7 @@
#include "audio_check.h" #include "audio_check.h"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "dsdlib.h" #include "dsdlib.h"
#include "tag_handler.h"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> /* for SEEK_SET, SEEK_CUR */ #include <stdio.h> /* for SEEK_SET, SEEK_CUR */
@ -275,9 +276,13 @@ dsf_stream_decode(struct decoder *decoder, struct input_stream *is)
g_error_free(error); g_error_free(error);
return; return;
} }
/* Calculate song time from DSD chunk size and sample frequency */
uint64_t chunk_size = metadata.chunk_size;
float songtime = ((chunk_size / metadata.channels) * 8) /
(float) metadata.sample_rate;
/* success: file was recognized */ /* success: file was recognized */
decoder_initialized(decoder, &audio_format, false, -1); decoder_initialized(decoder, &audio_format, false, songtime);
if (!dsf_decode_chunk(decoder, is, metadata.channels, if (!dsf_decode_chunk(decoder, is, metadata.channels,
metadata.chunk_size, metadata.chunk_size,
@ -306,6 +311,11 @@ dsf_scan_stream(struct input_stream *is,
/* refuse to parse files which we cannot play anyway */ /* refuse to parse files which we cannot play anyway */
return false; return false;
/* calculate song time and add as tag */
unsigned songtime = ((metadata.chunk_size / metadata.channels) * 8) /
metadata.sample_rate;
tag_handler_invoke_duration(handler, handler_ctx, songtime);
return true; return true;
} }