aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile.am7
-rw-r--r--NEWS1
-rw-r--r--src/decoder/ffmpeg_decoder_plugin.c6
-rw-r--r--src/input/ffmpeg_input_plugin.c168
-rw-r--r--src/input/ffmpeg_input_plugin.h28
-rw-r--r--src/input_registry.c7
-rw-r--r--src/ls.c8
7 files changed, 225 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 86b0246fa..d9f32f468 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ mpd_headers = \
src/input_registry.h \
src/input_stream.h \
src/input/file_input_plugin.h \
+ src/input/ffmpeg_input_plugin.h \
src/input/curl_input_plugin.h \
src/input/rewind_input_plugin.h \
src/input/mms_input_plugin.h \
@@ -590,10 +591,12 @@ endif
INPUT_CFLAGS = \
$(CURL_CFLAGS) \
+ $(FFMPEG_CFLAGS) \
$(MMS_CFLAGS)
INPUT_LIBS = \
$(CURL_LIBS) \
+ $(FFMPEG_LIBS) \
$(MMS_LIBS)
INPUT_SRC = \
@@ -608,6 +611,10 @@ INPUT_SRC += src/input/curl_input_plugin.c \
src/icy_metadata.c
endif
+if HAVE_FFMPEG
+INPUT_SRC += src/input/ffmpeg_input_plugin.c
+endif
+
if ENABLE_MMS
INPUT_SRC += src/input/mms_input_plugin.c
endif
diff --git a/NEWS b/NEWS
index e80847d74..836f60208 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ ver 0.16 (20??/??/??)
- zip: renamed plugin to "zzip"
* input:
- lastfm: obsolete plugin removed
+ - ffmpeg: new input plugin using libavformat's "avio" library
* tags:
- added tags "ArtistSort", "AlbumArtistSort"
- id3: revised "performer" tag support
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 4f956f555..d2ea28681 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -575,6 +575,12 @@ static const char *const ffmpeg_mime_types[] = {
"video/x-vid",
"video/x-wmv",
"video/x-xvid",
+
+ /* special value for the "ffmpeg" input plugin: all streams by
+ the "ffmpeg" input plugin shall be decoded by this
+ plugin */
+ "audio/x-mpd-ffmpeg",
+
NULL
};
diff --git a/src/input/ffmpeg_input_plugin.c b/src/input/ffmpeg_input_plugin.c
new file mode 100644
index 000000000..0a6be29bc
--- /dev/null
+++ b/src/input/ffmpeg_input_plugin.c
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "input/ffmpeg_input_plugin.h"
+#include "input_plugin.h"
+
+#ifdef OLD_FFMPEG_INCLUDES
+#include <avio.h>
+#include <avformat.h>
+#else
+#include <libavformat/avio.h>
+#include <libavformat/avformat.h>
+#endif
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "input_ffmpeg"
+
+struct input_ffmpeg {
+ struct input_stream base;
+
+ URLContext *h;
+
+ bool eof;
+};
+
+static inline GQuark
+ffmpeg_quark(void)
+{
+ return g_quark_from_static_string("ffmpeg");
+}
+
+static bool
+input_ffmpeg_init(G_GNUC_UNUSED const struct config_param *param,
+ G_GNUC_UNUSED GError **error_r)
+{
+ av_register_all();
+
+#if LIBAVFORMAT_VERSION_MAJOR >= 52
+ /* disable this plugin if there's no registered protocol */
+ if (av_protocol_next(NULL) == NULL) {
+ g_set_error(error_r, ffmpeg_quark(), 0,
+ "No protocol");
+ return false;
+ }
+#endif
+
+ return true;
+}
+
+static struct input_stream *
+input_ffmpeg_open(const char *uri, GError **error_r)
+{
+ struct input_ffmpeg *i;
+
+ if (!g_str_has_prefix(uri, "gopher://") &&
+ !g_str_has_prefix(uri, "rtp://") &&
+ !g_str_has_prefix(uri, "rtsp://") &&
+ !g_str_has_prefix(uri, "rtmp://") &&
+ !g_str_has_prefix(uri, "rtmpt://") &&
+ !g_str_has_prefix(uri, "rtmps://"))
+ return NULL;
+
+ i = g_new(struct input_ffmpeg, 1);
+ input_stream_init(&i->base, &input_plugin_ffmpeg, uri);
+
+ int ret = url_open(&i->h, uri, URL_RDONLY);
+ if (ret != 0) {
+ g_free(i);
+ g_set_error(error_r, ffmpeg_quark(), ret,
+ "libavformat failed to open the URI");
+ return NULL;
+ }
+
+ i->eof = false;
+
+ i->base.ready = true;
+ i->base.seekable = !i->h->is_streamed;
+ i->base.size = url_filesize(i->h);
+
+ /* hack to make MPD select the "ffmpeg" decoder plugin - since
+ avio.h doesn't tell us the MIME type of the resource, we
+ can't select a decoder plugin, but the "ffmpeg" plugin is
+ quite good at auto-detection */
+ i->base.mime = g_strdup("audio/x-mpd-ffmpeg");
+
+ return &i->base;
+}
+
+static size_t
+input_ffmpeg_read(struct input_stream *is, void *ptr, size_t size,
+ GError **error_r)
+{
+ struct input_ffmpeg *i = (struct input_ffmpeg *)is;
+
+ int ret = url_read(i->h, ptr, size);
+ if (ret <= 0) {
+ if (ret < 0)
+ g_set_error(error_r, ffmpeg_quark(), 0,
+ "url_read() failed");
+
+ i->eof = true;
+ return false;
+ }
+
+ is->offset += ret;
+ return (size_t)ret;
+}
+
+static void
+input_ffmpeg_close(struct input_stream *is)
+{
+ struct input_ffmpeg *i = (struct input_ffmpeg *)is;
+
+ url_close(i->h);
+ input_stream_deinit(&i->base);
+ g_free(i);
+}
+
+static bool
+input_ffmpeg_eof(struct input_stream *is)
+{
+ struct input_ffmpeg *i = (struct input_ffmpeg *)is;
+
+ return i->eof;
+}
+
+static bool
+input_ffmpeg_seek(struct input_stream *is, goffset offset, int whence,
+ G_GNUC_UNUSED GError **error_r)
+{
+ struct input_ffmpeg *i = (struct input_ffmpeg *)is;
+ int64_t ret = url_seek(i->h, offset, whence);
+
+ if (ret >= 0) {
+ i->eof = false;
+ return true;
+ } else {
+ g_set_error(error_r, ffmpeg_quark(), 0, "url_seek() failed");
+ return false;
+ }
+}
+
+const struct input_plugin input_plugin_ffmpeg = {
+ .name = "ffmpeg",
+ .init = input_ffmpeg_init,
+ .open = input_ffmpeg_open,
+ .close = input_ffmpeg_close,
+ .read = input_ffmpeg_read,
+ .eof = input_ffmpeg_eof,
+ .seek = input_ffmpeg_seek,
+};
diff --git a/src/input/ffmpeg_input_plugin.h b/src/input/ffmpeg_input_plugin.h
new file mode 100644
index 000000000..ff87064be
--- /dev/null
+++ b/src/input/ffmpeg_input_plugin.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_FFMPEG_INPUT_PLUGIN_H
+#define MPD_FFMPEG_INPUT_PLUGIN_H
+
+/**
+ * An input plugin based on libavformat's "avio" library.
+ */
+extern const struct input_plugin input_plugin_ffmpeg;
+
+#endif
diff --git a/src/input_registry.c b/src/input_registry.c
index 81b105770..0b9b47d10 100644
--- a/src/input_registry.c
+++ b/src/input_registry.c
@@ -29,6 +29,10 @@
#include "input/curl_input_plugin.h"
#endif
+#ifdef HAVE_FFMPEG
+#include "input/ffmpeg_input_plugin.h"
+#endif
+
#ifdef ENABLE_MMS
#include "input/mms_input_plugin.h"
#endif
@@ -43,6 +47,9 @@ const struct input_plugin *const input_plugins[] = {
#ifdef ENABLE_CURL
&input_plugin_curl,
#endif
+#ifdef HAVE_FFMPEG
+ &input_plugin_ffmpeg,
+#endif
#ifdef ENABLE_MMS
&input_plugin_mms,
#endif
diff --git a/src/ls.c b/src/ls.c
index 94c763d13..c30765c62 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -41,6 +41,14 @@ static const char *remoteUrlPrefixes[] = {
"mmst://",
"mmsu://",
#endif
+#ifdef HAVE_FFMPEG
+ "gopher://",
+ "rtp://",
+ "rtsp://",
+ "rtmp://",
+ "rtmpt://",
+ "rtmps://",
+#endif
NULL
};