diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-05 12:03:23 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-05 12:03:23 +0100 |
| commit | bc9ebb2ff2841fac97e6d99cb12ea913425e9a2a (patch) | |
| tree | 71e220c4906a1e970360f82ae6bdb570e479c158 | |
| parent | 854645861790588d7bca72b79a56c1b1d5d7689f (diff) | |
| download | gstreamer-plugins-bad-bc9ebb2ff2841fac97e6d99cb12ea913425e9a2a.tar.gz | |
use new style caps
| -rw-r--r-- | ext/mplex/Makefile.am | 3 | ||||
| -rw-r--r-- | ext/mplex/gstmplex.cc | 25 | ||||
| -rw-r--r-- | gst/camerabin2/gstviewfinderbin.c | 2 |
3 files changed, 16 insertions, 14 deletions
diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index 741b0d893..84243ffea 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -9,7 +9,8 @@ libgstmplex_la_SOURCES = \ libgstmplex_la_CXXFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS) libgstmplex_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(MPLEX_LIBS) + $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(GST_LIBS) $(MPLEX_LIBS) libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPLEX_LDFLAGS) libgstmplex_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 2c9328d17..ba461e6e5 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -54,6 +54,8 @@ #include <string.h> #include <gst/glib-compat-private.h> +#include <gst/audio/audio.h> + #include "gstmplex.hh" #include "gstmplexoutputstream.hh" #include "gstmplexibitstream.hh" @@ -93,11 +95,8 @@ static GstStaticPadTemplate audio_sink_templ = "audio/x-ac3, " COMMON_AUDIO_CAPS "; " "audio/x-dts; " - "audio/x-raw-int, " - "endianness = (int) BIG_ENDIAN, " - "signed = (boolean) TRUE, " - "width = (int) { 16, 20, 24 }, " - "depth = (int) { 16, 20, 24 }, " + "audio/x-raw, " + "format = (string) { S16BE, S20BE, S24BE }, " "rate = (int) { 48000, 96000 }, " "channels = (int) [ 1, 6 ]") ); @@ -324,20 +323,22 @@ gst_mplex_setcaps (GstPad * pad, GstCaps * caps) type = AC3_AUDIO; } else if (!strcmp (mime, "audio/x-dts")) { type = DTS_AUDIO; - } else if (!strcmp (mime, "audio/x-raw-int")) { + } else if (!strcmp (mime, "audio/x-raw")) { LpcmParams *params; gint bits, chans, rate; - gboolean result = TRUE; + GstAudioInfo info; type = LPCM_AUDIO; - /* set LPCM params */ - result &= gst_structure_get_int (structure, "depth", &bits); - result &= gst_structure_get_int (structure, "rate", &rate); - result &= gst_structure_get_int (structure, "channels", &chans); - if (!result) + gst_audio_info_init (&info); + if (!gst_audio_info_from_caps (&info, caps)) goto refuse_caps; + rate = GST_AUDIO_INFO_RATE (&info); + chans = GST_AUDIO_INFO_CHANNELS (&info); + bits = GST_AUDIO_INFO_DEPTH (&info); + + /* set LPCM params */ params = LpcmParams::Checked (rate, chans, bits); mplex->job->lpcm_param.push_back (params); diff --git a/gst/camerabin2/gstviewfinderbin.c b/gst/camerabin2/gstviewfinderbin.c index 90c78d5ab..1f87eb993 100644 --- a/gst/camerabin2/gstviewfinderbin.c +++ b/gst/camerabin2/gstviewfinderbin.c @@ -57,7 +57,7 @@ enum static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb") + GST_STATIC_CAPS ("video/x-raw") ); /* class initialization */ |