From 40938b8a8946c5d9b92976f49763dbaaebe6c34c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 31 Dec 2011 14:32:45 +0100 Subject: [PATCH] ogg: Update for the libgstriff API changes Still needs to handle the raw audio channel reordering. --- ext/ogg/gstoggstream.c | 4 +++- ext/ogg/gstogmparse.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index 08a1842..1ae61f0 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -1446,7 +1446,9 @@ setup_ogmaudio_mapper (GstOggStream * pad, ogg_packet * packet) fstr = g_strdup_printf ("%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); GST_DEBUG ("fourcc: %s", fstr); - pad->caps = gst_riff_create_audio_caps (fourcc, NULL, NULL, NULL, NULL, NULL); + /* FIXME: Need to do something with the reorder map */ + pad->caps = + gst_riff_create_audio_caps (fourcc, NULL, NULL, NULL, NULL, NULL, NULL); GST_LOG ("sample rate: %d", pad->granulerate_n); if (pad->granulerate_n == 0) diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c index 6790937..2d2115b 100644 --- a/ext/ogg/gstogmparse.c +++ b/ext/ogg/gstogmparse.c @@ -540,8 +540,10 @@ gst_ogm_parse_stream_header (GstOgmParse * ogm, const guint8 * data, guint size) GST_WARNING_OBJECT (ogm, "cannot parse subtype %s", ogm->hdr.subtype); } + /* FIXME: Need to do something with the reorder map */ caps = - gst_riff_create_audio_caps (codec_id, NULL, NULL, NULL, NULL, NULL); + gst_riff_create_audio_caps (codec_id, NULL, NULL, NULL, NULL, NULL, + NULL); if (caps == NULL) { GST_WARNING_OBJECT (ogm, "no audio caps for codec %u found", codec_id); -- 2.7.4