From 7081dd936f3d14c01172b9790d85f1b11f96334f Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 24 Dec 2004 12:58:17 +0000 Subject: gst/: Add 3GP (variables name Q3GP because they can't start with a decoder is work in progress. Also do a GST_WARNING... Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_type_get), (qtdemux_audio_caps): * gst/typefind/gsttypefindfunctions.c: (q3gp_type_find), (plugin_init): Add 3GP (variables name Q3GP because they can't start with a number). Add samr audio fourcc (used in .3gp files), decoder is work in progress. Also do a GST_WARNING instead of ERROR in case of unknown nodes, to decrease output. --- gst/qtdemux/qtdemux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gst/qtdemux') diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 5babfe7c..82e4a318 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -131,7 +131,7 @@ static GstStaticPadTemplate gst_qtdemux_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/quicktime; audio/x-m4a") + GST_STATIC_CAPS ("video/quicktime; audio/x-m4a; application/x-3gp") ); static GstStaticPadTemplate gst_qtdemux_videosrc_template = @@ -1392,7 +1392,7 @@ qtdemux_type_get (guint32 fourcc) return qt_node_types + i; } - GST_ERROR ("unknown QuickTime node type " GST_FOURCC_FORMAT, + GST_WARNING ("unknown QuickTime node type " GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); return qt_node_types + n_qt_node_types - 1; } @@ -2640,6 +2640,9 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data, case GST_MAKE_FOURCC ('a', 'g', 's', 'm'): /* GSM */ return gst_caps_new_simple ("audio/x-gsm", NULL); + case GST_MAKE_FOURCC ('s', 'a', 'm', 'r'): + /* AMR-NB */ + return gst_caps_new_simple ("audio/x-amr-nb", NULL); case GST_MAKE_FOURCC ('i', 'm', 'a', '4'): /* IMA 4:1 */ return gst_caps_new_simple ("audio/x-adpcm", -- cgit v1.2.1