[FFmpeg-devel] [PATCH] libavformat/icecast.c Add Icecast protocol

epirat07 at gmail.com epirat07 at gmail.com
Wed Jul 23 02:12:16 CEST 2014


From: ePirat <epirat07 at gmail.com>

Fixed Makefile and micro version

---

Add Icecast protocol, a convenience wrapper for the HTTP protocol 

---
 Changelog                |   1 +
 configure                |   1 +
 doc/general.texi         |   1 +
 doc/protocols.texi       |  42 +++++++++
 libavformat/Makefile     |   1 +
 libavformat/allformats.c |   1 +
 libavformat/icecast.c    | 230 +++++++++++++++++++++++++++++++++++++++++++++++
 libavformat/version.h    |   4 +-
 8 files changed, 279 insertions(+), 2 deletions(-)
 create mode 100644 libavformat/icecast.c

diff --git a/Changelog b/Changelog
index 07cf1cf..54bb6ba 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
 version 2.3:
+- Icecast protocol
 - AC3 fixed-point decoding
 - shuffleplanes filter
 - subfile protocol
diff --git a/configure b/configure
index b4ec1e6..a0b2354 100755
--- a/configure
+++ b/configure
@@ -2483,6 +2483,7 @@ gopher_protocol_select="network"
 http_protocol_select="tcp_protocol"
 httpproxy_protocol_select="tcp_protocol"
 https_protocol_select="tls_protocol"
+icecast_protocol_select="http"
 librtmp_protocol_deps="librtmp"
 librtmpe_protocol_deps="librtmp"
 librtmps_protocol_deps="librtmp"
diff --git a/doc/general.texi b/doc/general.texi
index 35db917..9ce0b31 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -1055,6 +1055,7 @@ performance on systems without hardware floating point support).
 @item HLS          @tab X
 @item HTTP         @tab X
 @item HTTPS        @tab X
+ at item Icecast      @tab X
 @item MMSH         @tab X
 @item MMST         @tab X
 @item pipe         @tab X
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 1cd96cc..cb75d92 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -293,6 +293,48 @@ The required syntax to play a stream specifying a cookie is:
 ffplay -cookies "nlqptid=nltid=tsn; path=/; domain=somedomain.com;" http://somedomain.com/somestream.m3u8
 @end example
 
+ at section Icecast
+
+Icecast protocol
+
+ at table @option
+ at item ice_genre
+Set the genre of the stream.
+
+ at item ice_name
+Set the name of the stream.
+
+ at item ice_description
+Set the description of the stream.
+
+ at item ice_url
+Set the stream website url.
+
+ at item ice_public
+Set if the stream should be public.
+Default is 0 (not public).
+
+ at item ice_password
+Password for the mountpoint.
+
+ at item legacy_icecast
+If set to 1, enable support for legacy Icecast (Version < 2.4), using the SOURCE method
+instead of the PUT method.
+
+ at item content_type
+Set a specific content type for the stream.
+This MUST be set if streaming else than audio/mpeg
+
+ at item user_agent
+Override the User-Agent header. If not specified the protocol will use a
+string describing the libavformat build. ("Lavf/<version>")
+
+ at end table
+
+ at example
+icecast://[@var{username}[:@var{password}]@@]@var{server}:@var{port}/@var{mountpoint}
+ at end example
+
 @section mmst
 
 MMS (Microsoft Media Server) protocol over TCP.
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 9017e06..d2d0d87 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -484,6 +484,7 @@ OBJS-$(CONFIG_HLS_PROTOCOL)              += hlsproto.o
 OBJS-$(CONFIG_HTTP_PROTOCOL)             += http.o httpauth.o urldecode.o
 OBJS-$(CONFIG_HTTPPROXY_PROTOCOL)        += http.o httpauth.o urldecode.o
 OBJS-$(CONFIG_HTTPS_PROTOCOL)            += http.o httpauth.o urldecode.o
+OBJS-$(CONFIG_ICECAST_PROTOCOL)          += icecast.o
 OBJS-$(CONFIG_MMSH_PROTOCOL)             += mmsh.o mms.o asf.o
 OBJS-$(CONFIG_MMST_PROTOCOL)             += mmst.o mms.o asf.o
 OBJS-$(CONFIG_MD5_PROTOCOL)              += md5proto.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 00de817..5599bae 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -347,6 +347,7 @@ void av_register_all(void)
     REGISTER_PROTOCOL(HTTP,             http);
     REGISTER_PROTOCOL(HTTPPROXY,        httpproxy);
     REGISTER_PROTOCOL(HTTPS,            https);
+    REGISTER_PROTOCOL(ICECAST,          icecast);
     REGISTER_PROTOCOL(MMSH,             mmsh);
     REGISTER_PROTOCOL(MMST,             mmst);
     REGISTER_PROTOCOL(MD5,              md5);
diff --git a/libavformat/icecast.c b/libavformat/icecast.c
new file mode 100644
index 0000000..700bd97
--- /dev/null
+++ b/libavformat/icecast.c
@@ -0,0 +1,230 @@
+/*
+ * Icecast Protocol Handler
+ * Copyright (c) 2014 Marvin Scholz
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Icecast Protocol Handler
+ * http://icecast.org
+ */
+
+
+#include "libavutil/avstring.h"
+#include "libavutil/opt.h"
+
+#include "avformat.h"
+#include "network.h"
+
+
+typedef struct IcecastContext {
+    const AVClass *class;
+    URLContext *hd;
+    char *content_type;
+    char *description;
+    char *genre;
+    char *headers;
+    int legacy_icecast;
+    char *name;
+    char *pass;
+    int public;
+    int send_started;
+    char *url;
+    char *user;
+    char *user_agent;
+} IcecastContext;
+
+#define DEFAULT_ICE_USER "source"
+
+#define NOT_EMPTY(s) (s && s[0] != '\0')
+
+#define OFFSET(x) offsetof(IcecastContext, x)
+#define D AV_OPT_FLAG_DECODING_PARAM
+#define E AV_OPT_FLAG_ENCODING_PARAM
+
+static const AVOption options[] = {
+    { "ice_genre", "set stream genre", OFFSET(genre), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
+    { "ice_name", "set stream description", OFFSET(name), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
+    { "ice_description", "set stream description", OFFSET(description), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
+    { "ice_url", "set stream website", OFFSET(url), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
+    { "ice_public", "set if stream is public", OFFSET(public), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E },
+    { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
+    { "ice_password", "set password", OFFSET(pass), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
+    { "content_type", "set content-type, MUST be set if not audio/mpeg", OFFSET(content_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
+    { "legacy_icecast", "use legacy SOURCE method, for Icecast < v2.4", OFFSET(legacy_icecast), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E },
+    { NULL }
+};
+
+
+static char *cat_header(char buf[], const char key[], const char value[])
+{
+    int len = strlen(key) + strlen(value) + 5;
+    int is_first = !buf;
+
+    if (buf)
+        len += strlen(buf);
+    if (!(buf = av_realloc(buf, len)))
+        return NULL;
+    if (is_first)
+        *buf = '\0';
+
+    av_strlcatf(buf, len, "%s: %s\r\n", key, value);
+    return buf;
+}
+
+static int icecast_close(URLContext *h)
+{
+    IcecastContext *s = h->priv_data;
+    if (s->hd)
+        ffurl_close(s->hd);
+    return 0;
+}
+
+static int icecast_open(URLContext *h, const char *uri, int flags)
+{
+    IcecastContext *s = h->priv_data;
+
+    // Dict to set options that we pass to the HTTP protocol
+    AVDictionary *opt_dict = NULL;
+
+    // URI part variables
+    char h_url[1024], host[1024], auth[1024], path[1024];
+    int port;
+
+    // Build header strings
+    if (NOT_EMPTY(s->name))
+        s->headers = cat_header(s->headers, "Ice-Name", s->name);
+    if (NOT_EMPTY(s->description))
+        s->headers = cat_header(s->headers, "Ice-Description", s->description);
+    if (NOT_EMPTY(s->url))
+        s->headers = cat_header(s->headers, "Ice-URL", s->url);
+    if (NOT_EMPTY(s->genre))
+        s->headers = cat_header(s->headers, "Ice-Genre", s->genre);
+    if (s->public)
+        s->headers = cat_header(s->headers, "Ice-Public", "1");
+    else
+        s->headers = cat_header(s->headers, "Ice-Public", "0");
+
+    // Set options
+    av_dict_set(&opt_dict, "method", s->legacy_icecast ? "SOURCE" : "PUT", 0);
+    av_dict_set(&opt_dict, "auth_type", "basic", 0);
+    if (NOT_EMPTY(s->headers))
+        av_dict_set(&opt_dict, "headers", s->headers, 0);
+    if (NOT_EMPTY(s->content_type))
+        av_dict_set(&opt_dict, "content_type", s->content_type, 0);
+    if (NOT_EMPTY(s->user_agent))
+        av_dict_set(&opt_dict, "user_agent", s->user_agent, 0);
+
+    // Parse URI
+    av_url_split(NULL, 0, auth, sizeof(auth), host, sizeof(host),
+                 &port, path, sizeof(path), uri);
+
+    // Check for auth data in URI
+    if (auth[0] != '\0') {
+        int user_len;
+        char *p = strchr(auth, ':');
+        if (p) {
+            // Setting user and pass from URI
+            user_len = p - auth + 1;
+            if (!(s->user = av_malloc(user_len)))
+                return AVERROR(ENOMEM);
+            av_strlcpy(s->user, auth, user_len);
+            p++;
+            if (s->pass != NULL) {
+                av_free(s->pass);
+                av_log(h, AV_LOG_WARNING, "Overwriting -password <pass> with URI password!\n");
+            }
+            if (!(s->pass = av_malloc(strlen(auth) - user_len))) {
+                av_free(s->user);
+                return AVERROR(ENOMEM);
+            }
+            av_strlcpy(s->pass, p, strlen(auth) - user_len);
+        } else {
+            // Setting user from URI
+            if (!(s->user = av_malloc(strlen(auth))))
+                return AVERROR(ENOMEM);
+            av_strlcpy(s->user, auth, strlen(auth));
+        }
+    }
+
+    // Build new authstring
+    snprintf(auth, sizeof(auth),
+             "%s:%s",
+             s->user ? s->user : DEFAULT_ICE_USER,
+             s->pass ? s->pass : "");
+
+    // Check for mountpoint (path)
+    if (path[0] == '\0' || strcmp(path, "/") == 0) {
+        av_log(h, AV_LOG_ERROR, "No mountpoint (path) specified!\n");
+        return AVERROR(EIO);
+    }
+
+    // Build new URI for passing to http protocol
+    ff_url_join(h_url, sizeof(h_url), "http", auth, host, port, "%s", path);
+
+    // Free variables
+    av_free(s->user);
+
+    // Finally open http proto handler
+    return ffurl_open(&s->hd, h_url, AVIO_FLAG_READ_WRITE, NULL, &opt_dict);
+}
+
+static int icecast_write(URLContext *h, const uint8_t *buf, int size)
+{
+    IcecastContext *s = h->priv_data;
+    if (!s->send_started) {
+        s->send_started = 1;
+        if (!s->content_type && size >= 8) {
+            const uint8_t oggs[4] = { 0x4F, 0x67, 0x67, 0x53 };
+            const uint8_t webm[4] = { 0x1A, 0x45, 0xDF, 0xA3 };
+            const uint8_t opus[8] = { 0x4F, 0x70, 0x75, 0x73, 0x48, 0x65, 0x61, 0x64 };
+            if (memcmp(buf, oggs, sizeof(oggs)) == 0) {
+                av_log(h, AV_LOG_WARNING, "Streaming ogg but appropriated content type NOT set!\n");
+                av_log(h, AV_LOG_WARNING, "Set it with -content_type application/ogg\n");
+            } else if (memcmp(buf, opus, sizeof(opus)) == 0) {
+                av_log(h, AV_LOG_WARNING, "Streaming opus but appropriated content type NOT set!\n");
+                av_log(h, AV_LOG_WARNING, "Set it with -content_type audio/ogg\n");
+            } else if (memcmp(buf, webm, sizeof(webm)) == 0) {
+                av_log(h, AV_LOG_WARNING, "Streaming webm but appropriated content type NOT set!\n");
+                av_log(h, AV_LOG_WARNING, "Set it with -content_type video/webm\n");
+            } else {
+                av_log(h, AV_LOG_WARNING, "It seems you are streaming an unsupported format.\n");
+                av_log(h, AV_LOG_WARNING, "It might work, but is not officially supported in Icecast!\n");
+            }
+        }
+    }
+    return ffurl_write(s->hd, buf, size);
+}
+
+static const AVClass icecast_context_class = {
+    .class_name     = "icecast",
+    .item_name      = av_default_item_name,
+    .option         = options,
+    .version        = LIBAVUTIL_VERSION_INT,
+};
+
+URLProtocol ff_icecast_protocol = {
+    .name            = "icecast",
+    .url_open        = icecast_open,
+    .url_write       = icecast_write,
+    .url_close       = icecast_close,
+    .priv_data_size  = sizeof(IcecastContext),
+    .priv_data_class = &icecast_context_class,
+    .flags           = URL_PROTOCOL_FLAG_NETWORK,
+};
diff --git a/libavformat/version.h b/libavformat/version.h
index 4e28112..5ad2338 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,8 +30,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 48
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MINOR 49
+#define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \
-- 
1.8.5.2 (Apple Git-48)



More information about the ffmpeg-devel mailing list