diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-24 12:58:17 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-24 12:58:17 +0000 |
| commit | a0f3fb2a36bc92b36395c8e6ab611eb7a316aa7a (patch) | |
| tree | 3435fce59b37d4b055c2111abc77c8776861fe43 | |
| parent | 20372318d9a421f4d01edccec3a80e09db061944 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 7 |
2 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2004-12-24 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * 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. + 2004-12-24 Thomas Vander Stichele <thomas at apestaart dot org> * Makefile.am: 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", |