From e62580db0bab0650f088f9f45c66657d18dfb679 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 15 Mar 2009 03:32:34 +0100 Subject: httpd: new output plugin to replace "shout" Let's get rid of the "shout" plugin, and the awfully complicated icecast daemon setup! MPD can do better if it's doing the HTTP server stuff on its own. This new plugin has several advantages: - easier to set up - only one daemon, no password settings, no mount settings - MPD controls the encoder and thus already knows the packet boundaries - icecast has to parse them - MPD doesn't bother to encode data while nobody is listening This implementation is very experimental (no header parsing, ignores request URI, no icy-metadata, ...). It should be able to suport several encoders in parallel in the future (with different bit rates, different codec, ...), to make MPD the perfect streaming server. Once MPD gets multi-player support, we can even mount several different radio stations on one server. --- doc/mpdconf.example | 12 +++++++++ doc/user.xml | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) (limited to 'doc') diff --git a/doc/mpdconf.example b/doc/mpdconf.example index f7816e4ae..3af0567d6 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -198,6 +198,18 @@ log_file "~/.mpd/log" # timeout "2" # optional #} # +# An example of a httpd output (built-in HTTP streaming server): +# +#audio_output { +# type "httpd" +# name "My HTTP Stream" +# encoder "ogg" # optional +# port "8000" +# quality "5.0" +# bitrate "128" +# format "44100:16:1" +#} +# # An example of a pulseaudio output (streaming to a remote pulseaudio server) # #audio_output { diff --git a/doc/user.xml b/doc/user.xml index 06dc087f0..6837181a9 100644 --- a/doc/user.xml +++ b/doc/user.xml @@ -251,6 +251,77 @@ cd mpd-0.14.2 +
+ <varname>httpd</varname> + + + The httpd plugin creates a HTTP server, + similar to ShoutCast / IceCast. HTTP streaming clients like + mplayer can connect to it. + + + + You must configure either quality or + bitrate. It is highly recommended to + configure a fixed format, because a + stream cannot switch its audio format on-the-fly when the + song changes. + + + + + + + Setting + Description + + + + + + port + P + + + Binds the HTTP server to the specified port (on all + interfaces). + + + + + encoder + NAME + + + Chooses an encoder plugin, + e.g. vorbis. + + + + + quality + Q + + + Configures the encoder quality (for VBR) in the + range -1 .. 10. + + + + + bitrate + BR + + + Sets a constant encoder bit rate, in kilobit per + second. + + + + + +
+
<varname>null</varname> -- cgit v1.2.3