aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/dsdlib.c
diff options
context:
space:
mode:
authorJurgen Kramer <gtmkramer@xs4all.nl>2012-10-27 11:42:34 +0200
committerJurgen Kramer <gtmkramer@xs4all.nl>2012-10-27 11:42:34 +0200
commitdc32d1f3f3176dcd1304d4ba9fb302859b81dbfd (patch)
tree3db72760d1b950fd51bb08bc67380f1fdaebd664 /src/decoder/dsdlib.c
parentcbdaa1369f950b75b346951611b79eacffe9b2a7 (diff)
downloadmpd-dc32d1f3f3176dcd1304d4ba9fb302859b81dbfd.tar.gz
mpd-dc32d1f3f3176dcd1304d4ba9fb302859b81dbfd.tar.xz
mpd-dc32d1f3f3176dcd1304d4ba9fb302859b81dbfd.zip
Add tag support for DSD (DSDIFF & DSF) decoders
Diffstat (limited to '')
-rw-r--r--src/decoder/dsdlib.c56
1 files changed, 56 insertions, 0 deletions
diff --git a/src/decoder/dsdlib.c b/src/decoder/dsdlib.c
index 3df9497c4..c788184e2 100644
--- a/src/decoder/dsdlib.c
+++ b/src/decoder/dsdlib.c
@@ -27,12 +27,18 @@
#include "dsf_decoder_plugin.h"
#include "decoder_api.h"
#include "util/bit_reverse.h"
+#include "tag_handler.h"
+#include "tag_id3.h"
#include "dsdlib.h"
#include "dsdiff_decoder_plugin.h"
#include <unistd.h>
#include <stdio.h> /* for SEEK_SET, SEEK_CUR */
+#ifdef HAVE_ID3TAG
+#include <id3tag.h>
+#endif
+
bool
dsdlib_id_equals(const struct dsdlib_id *id, const char *s)
{
@@ -110,3 +116,53 @@ dsdlib_skip(struct decoder *decoder, struct input_stream *is,
return true;
}
+/**
+ * Add tags from ID3 tag. All tags commonly found in the ID3 tags of
+ * DSF and DSDIFF files are imported
+ */
+
+#ifdef HAVE_ID3TAG
+void
+dsdlib_tag_id3(struct input_stream *is,
+ const struct tag_handler *handler,
+ void *handler_ctx, goffset tagoffset)
+{
+ assert(tagoffset >= 0);
+
+ if (tagoffset == 0)
+ return;
+
+ if (!dsdlib_skip_to(NULL, is, tagoffset))
+ return;
+
+ struct id3_tag *id3_tag = NULL;
+ id3_length_t count;
+
+ /* Prevent broken files causing problems */
+ if (is->offset >= is->size)
+ return;
+
+ count = is->size - is->offset;
+
+ /* Check and limit id3 tag size to prevent a stack overflow */
+ if (count == 0 || count > 4096)
+ return;
+
+ id3_byte_t dsdid3[count];
+ id3_byte_t *dsdid3data;
+ dsdid3data = dsdid3;
+
+ if (!dsdlib_read(NULL, is, dsdid3data, count))
+ return;
+
+ id3_tag = id3_tag_parse(dsdid3data, count);
+ if (id3_tag == NULL)
+ return;
+
+ scan_id3_tag(id3_tag, handler, handler_ctx);
+
+ id3_tag_delete(id3_tag);
+
+ return;
+}
+#endif