Commit 8b2ca701 authored by Ralph Giles's avatar Ralph Giles Committed by Tim-Philipp Müller
Browse files

shout2send: send video/webm through libshout.

This requires SHOUT_FORMAT_WEBM, added in libshout 2.3.0,
so video/webm support is contingent on that symbol being
defined.

Also an indentation change required by the pre-commit hook.

https://bugzilla.gnome.org/show_bug.cgi?id=669590
parent 7a9970fc
/* GStreamer /* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* Copyright (C) <2006> Tim-Philipp Müller <tim centricular net> * Copyright (C) <2006> Tim-Philipp Müller <tim centricular net>
* Copyright (C) <2012> Ralph Giles <giles@mozilla.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
...@@ -70,12 +71,17 @@ enum ...@@ -70,12 +71,17 @@ enum
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
#ifdef SHOUT_FORMAT_WEBM
#define WEBM_CAPS "; video/webm"
#else
#define WEBM_CAPS ""
#endif
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/ogg; " GST_STATIC_CAPS ("application/ogg; "
"audio/mpeg, mpegversion = (int) 1, layer = (int) [ 1, 3 ]") "audio/mpeg, mpegversion = (int) 1, layer = (int) [ 1, 3 ]" WEBM_CAPS));
);
static void gst_shout2send_class_init (GstShout2sendClass * klass); static void gst_shout2send_class_init (GstShout2sendClass * klass);
static void gst_shout2send_base_init (GstShout2sendClass * klass); static void gst_shout2send_base_init (GstShout2sendClass * klass);
static void gst_shout2send_init (GstShout2send * shout2send); static void gst_shout2send_init (GstShout2send * shout2send);
...@@ -160,8 +166,7 @@ gst_shout2send_base_init (GstShout2sendClass * klass) ...@@ -160,8 +166,7 @@ gst_shout2send_base_init (GstShout2sendClass * klass)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
gst_element_class_add_static_pad_template (element_class, gst_element_class_add_static_pad_template (element_class, &sink_template);
&sink_template);
gst_element_class_set_details_simple (element_class, "Icecast network sink", gst_element_class_set_details_simple (element_class, "Icecast network sink",
"Sink/Network", "Sends data to an icecast server", "Sink/Network", "Sends data to an icecast server",
"Wim Taymans <wim.taymans@chello.be>, " "Wim Taymans <wim.taymans@chello.be>, "
...@@ -538,9 +543,14 @@ set_failed: ...@@ -538,9 +543,14 @@ set_failed:
static gboolean static gboolean
gst_shout2send_connect (GstShout2send * sink) gst_shout2send_connect (GstShout2send * sink)
{ {
GST_DEBUG_OBJECT (sink, "Connection format is: %s", const char *format =
(sink->audio_format == SHOUT_FORMAT_VORBIS) ? "vorbis" : (sink->audio_format == SHOUT_FORMAT_VORBIS) ? "vorbis" :
((sink->audio_format == SHOUT_FORMAT_MP3) ? "mp3" : "unknown")); ((sink->audio_format == SHOUT_FORMAT_MP3) ? "mp3" : "unknown");
#ifdef SHOUT_FORMAT_WEBM
if (sink->audio_format == SHOUT_FORMAT_WEBM)
format = "webm";
#endif
GST_DEBUG_OBJECT (sink, "Connection format is: %s", format);
if (shout_set_format (sink->conn, sink->audio_format) != SHOUTERR_SUCCESS) if (shout_set_format (sink->conn, sink->audio_format) != SHOUTERR_SUCCESS)
goto could_not_set_format; goto could_not_set_format;
...@@ -810,6 +820,10 @@ gst_shout2send_setcaps (GstPad * pad, GstCaps * caps) ...@@ -810,6 +820,10 @@ gst_shout2send_setcaps (GstPad * pad, GstCaps * caps)
shout2send->audio_format = SHOUT_FORMAT_MP3; shout2send->audio_format = SHOUT_FORMAT_MP3;
} else if (!strcmp (mimetype, "application/ogg")) { } else if (!strcmp (mimetype, "application/ogg")) {
shout2send->audio_format = SHOUT_FORMAT_VORBIS; shout2send->audio_format = SHOUT_FORMAT_VORBIS;
#ifdef SHOUT_FORMAT_WEBM
} else if (!strcmp (mimetype, "video/webm")) {
shout2send->audio_format = SHOUT_FORMAT_WEBM;
#endif
} else { } else {
ret = FALSE; ret = FALSE;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment