Alternative mp3 handling via dr_mp3

Signed-off-by: falkTX <falktx@falktx.com>

source/modules/audio_decoder/Makefile

@@ -15,6 +15,7 @@ BUILD_C_FLAGS += -Werror=deprecated-declarations
 # ---------------------------------------------------------------------------------------------------------------------
 
 OBJS = \
+	$(OBJDIR)/ad_dr_mp3.c.o \
 	$(OBJDIR)/ad_ffmpeg.c.o \
 	$(OBJDIR)/ad_minimp3.c.o \
 	$(OBJDIR)/ad_plugin.c.o \
@@ -47,21 +48,16 @@ $(OBJDIR)/ad_ffmpeg.c.o: ad_ffmpeg.c
 	@echo "Compiling $<"
 	@$(CC) $< $(BUILD_C_FLAGS) $(FFMPEG_FLAGS) -c -o $@
 
-$(OBJDIR)/ad_minimp3.c.o: ad_minimp3.c
+$(OBJDIR)/ad_soundfile.c.o: ad_soundfile.c
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
-	@$(CC) $< $(BUILD_C_FLAGS) -c -o $@
+	@$(CC) $< $(BUILD_C_FLAGS) $(SNDFILE_FLAGS) -c -o $@
 
-$(OBJDIR)/ad_plugin.c.o: ad_plugin.c
+$(OBJDIR)/ad_%.c.o: ad_%.c
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-$(OBJDIR)/ad_soundfile.c.o: ad_soundfile.c
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $<"
-	@$(CC) $< $(BUILD_C_FLAGS) $(SNDFILE_FLAGS) -c -o $@
-
 -include $(OBJS:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/audio_decoder/ad_dr_mp3.c

@@ -0,0 +1,131 @@
+/**
+   Copyright (C) 2011-2013 Robin Gareus <robin@gareus.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser Public License as published by
+   the Free Software Foundation; either version 2.1, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <math.h>
+
+#include "ad_plugin.h"
+
+#define DR_MP3_FLOAT_OUTPUT
+#define DR_MP3_IMPLEMENTATION
+#include "dr_mp3.h"
+
+/* internal abstraction */
+
+typedef struct {
+	drmp3 mp3;
+} drmp3_audio_decoder;
+
+static int ad_info_dr_mp3(void *sf, struct adinfo *nfo) {
+	drmp3_audio_decoder *priv = (drmp3_audio_decoder*) sf;
+	if (!priv) return -1;
+	if (nfo) {
+		nfo->channels = priv->mp3.channels;
+		nfo->frames = drmp3_get_pcm_frame_count(&priv->mp3);
+		nfo->sample_rate = priv->mp3.sampleRate;
+		nfo->length = nfo->sample_rate ? (nfo->frames * 1000) / nfo->sample_rate : 0;
+		nfo->bit_depth = 16;
+		nfo->bit_rate = priv->mp3.frameInfo.bitrate_kbps;
+		nfo->meta_data = NULL;
+		nfo->can_seek = 1;
+	}
+	return 0;
+}
+
+static void *ad_open_dr_mp3(const char *filename, struct adinfo *nfo) {
+	drmp3_audio_decoder *priv = (drmp3_audio_decoder*)calloc (1, sizeof(drmp3_audio_decoder));
+	drmp3_bool32 res = drmp3_init_file(&priv->mp3, filename, NULL);
+	if (res == DRMP3_FALSE) {
+		dbg(0, "unable to open file '%s'.", filename);
+		free (priv);
+		return NULL;
+	}
+	ad_info_dr_mp3 (priv, nfo);
+	return (void*) priv;
+}
+
+static int ad_close_dr_mp3(void *sf) {
+	drmp3_audio_decoder *priv = (drmp3_audio_decoder*) sf;
+	if (!priv) return -1;
+	if (!sf) {
+		dbg (0, "fatal: bad file close.\n");
+		return -1;
+	}
+	drmp3_uninit (&priv->mp3);
+	free (priv);
+	return 0;
+}
+
+static int64_t ad_seek_dr_mp3(void *sf, int64_t pos)
+{
+	drmp3_audio_decoder *priv = (drmp3_audio_decoder*) sf;
+	if (!priv) return -1;
+	return drmp3_seek_to_pcm_frame (&priv->mp3, pos);
+}
+
+static ssize_t ad_read_dr_mp3(void *sf, float* d, size_t len)
+{
+	drmp3_audio_decoder *priv = (drmp3_audio_decoder*) sf;
+	if (!priv) return -1;
+	return drmp3_read_pcm_frames_f32 (&priv->mp3, len / priv->mp3.channels, d) * priv->mp3.channels;
+}
+
+static int ad_get_bitrate_dr_mp3(void *sf) {
+	drmp3_audio_decoder *priv = (drmp3_audio_decoder*) sf;
+	if (!priv) return -1;
+	return priv->mp3.frameInfo.bitrate_kbps;
+}
+
+static int ad_eval_dr_mp3(const char *f)
+{
+	char *ext = strrchr(f, '.');
+	if (strstr (f, "://")) return 0;
+	if (!ext) return 5;
+	if (!strcasecmp(ext, ".mp3")) return 100;
+	return 0;
+}
+
+static const ad_plugin ad_dr_mp3 = {
+#if 1
+	&ad_eval_dr_mp3,
+	&ad_open_dr_mp3,
+	&ad_close_dr_mp3,
+	&ad_info_dr_mp3,
+	&ad_seek_dr_mp3,
+	&ad_read_dr_mp3,
+	&ad_get_bitrate_dr_mp3
+#else
+	&ad_eval_null,
+	&ad_open_null,
+	&ad_close_null,
+	&ad_info_null,
+	&ad_seek_null,
+	&ad_read_null,
+	&ad_bit_rate_null
+#endif
+};
+
+/* dlopen handler */
+const ad_plugin * adp_get_dr_mp3() {
+	return &ad_dr_mp3;
+}

source/modules/audio_decoder/ad_plugin.c

@@ -54,8 +54,15 @@ static ad_plugin const * choose_backend(const char *fn) {
 	val=adp_get_sndfile()->eval(fn);
 	if (val>max) {max=val; b=adp_get_sndfile();}
 
+#if 0
+	// NOTE seek is broken for minimp3
 	val = adp_get_minimp3()->eval(fn);
 	if (val > max) {max=val; b=adp_get_minimp3();}
+#else
+	// NOTE dr_mp3 has memory corruption issues
+	val = adp_get_dr_mp3()->eval(fn);
+	if (val > max) {max=val; b=adp_get_dr_mp3();}
+#endif
 
 	val=adp_get_ffmpeg()->eval(fn);
 	if (val>max) {max=val; b=adp_get_ffmpeg();}