diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/elements/gstaggregator.c | 2 | ||||
-rw-r--r-- | plugins/elements/gstfakesink.c | 2 | ||||
-rw-r--r-- | plugins/elements/gstfakesrc.c | 2 | ||||
-rw-r--r-- | plugins/elements/gstidentity.c | 10 | ||||
-rw-r--r-- | plugins/elements/gstidentity.h | 2 | ||||
-rw-r--r-- | plugins/elements/gstmd5sink.c | 2 | ||||
-rw-r--r-- | plugins/elements/gstqueue.c | 10 | ||||
-rw-r--r-- | plugins/elements/gstshaper.c | 10 | ||||
-rw-r--r-- | plugins/elements/gsttee.c | 24 | ||||
-rw-r--r-- | plugins/elements/gsttypefind.c | 32 | ||||
-rw-r--r-- | plugins/elements/gsttypefind.h | 4 | ||||
-rw-r--r-- | plugins/elements/gsttypefindelement.c | 32 | ||||
-rw-r--r-- | plugins/elements/gsttypefindelement.h | 4 |
13 files changed, 68 insertions, 68 deletions
diff --git a/plugins/elements/gstaggregator.c b/plugins/elements/gstaggregator.c index 2c30e62c66..a6b69a0b5b 100644 --- a/plugins/elements/gstaggregator.c +++ b/plugins/elements/gstaggregator.c @@ -55,7 +55,7 @@ GstStaticPadTemplate aggregator_src_template = GST_STATIC_PAD_TEMPLATE ( "sink%d", GST_PAD_SINK, GST_PAD_REQUEST, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); #define GST_TYPE_AGGREGATOR_SCHED (gst_aggregator_sched_get_type()) diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index 4f8a6a008c..5589f14df8 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -60,7 +60,7 @@ GstStaticPadTemplate fakesink_sink_template = GST_STATIC_PAD_TEMPLATE ( "sink%d", GST_PAD_SINK, GST_PAD_REQUEST, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); #define GST_TYPE_FAKESINK_STATE_ERROR (gst_fakesink_state_error_get_type()) diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index 58cc59a954..a832f0ff39 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -77,7 +77,7 @@ GstStaticPadTemplate fakesrc_src_template = GST_STATIC_PAD_TEMPLATE ( "src%d", GST_PAD_SRC, GST_PAD_REQUEST, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); #define GST_TYPE_FAKESRC_OUTPUT (gst_fakesrc_output_get_type()) diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c index 1b660b58af..acf97add1a 100644 --- a/plugins/elements/gstidentity.c +++ b/plugins/elements/gstidentity.c @@ -152,7 +152,7 @@ gst_identity_class_init (GstIdentityClass *klass) gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_identity_get_property); } -static GstCaps2* +static GstCaps* gst_identity_getcaps (GstPad *pad) { GstIdentity *identity; @@ -171,20 +171,20 @@ gst_identity_getcaps (GstPad *pad) if (peer) { return gst_pad_get_caps (peer); } else { - return gst_caps2_new_any (); + return gst_caps_new_any (); } } static GstPadLinkReturn -gst_identity_link (GstPad *pad, const GstCaps2 *caps) +gst_identity_link (GstPad *pad, const GstCaps *caps) { GstIdentity *identity; identity = GST_IDENTITY (gst_pad_get_parent (pad)); - if (gst_caps2_is_fixed (caps)) { + if (gst_caps_is_fixed (caps)) { if (identity->delay_capsnego && GST_PAD_IS_SINK (pad)) { - identity->srccaps = gst_caps2_copy (caps); + identity->srccaps = gst_caps_copy (caps); return GST_PAD_LINK_OK; } diff --git a/plugins/elements/gstidentity.h b/plugins/elements/gstidentity.h index 5b7004d6b7..8e39b84248 100644 --- a/plugins/elements/gstidentity.h +++ b/plugins/elements/gstidentity.h @@ -59,7 +59,7 @@ struct _GstIdentity { gboolean dump; gchar *last_message; gboolean delay_capsnego; - GstCaps2 *srccaps; + GstCaps *srccaps; }; struct _GstIdentityClass { diff --git a/plugins/elements/gstmd5sink.c b/plugins/elements/gstmd5sink.c index c50b7a262d..2b7d63b7a7 100644 --- a/plugins/elements/gstmd5sink.c +++ b/plugins/elements/gstmd5sink.c @@ -58,7 +58,7 @@ GstStaticPadTemplate md5_sink_template = GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); /* GObject stuff */ diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 2e9f2e0ffa..0502ff5b2b 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -83,10 +83,10 @@ static void gst_queue_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static GstCaps2 *gst_queue_getcaps (GstPad *pad); +static GstCaps *gst_queue_getcaps (GstPad *pad); static GstPadLinkReturn gst_queue_link (GstPad *pad, - const GstCaps2 *caps); + const GstCaps *caps); static void gst_queue_chain (GstPad *pad, GstData *data); static GstData *gst_queue_get (GstPad *pad); @@ -330,12 +330,12 @@ gst_queue_otherpad (GstPad *pad) } static GstPadLinkReturn -gst_queue_link (GstPad *pad, const GstCaps2 *caps) +gst_queue_link (GstPad *pad, const GstCaps *caps) { return gst_pad_proxy_link (gst_queue_otherpad (pad), caps); } -static GstCaps2 * +static GstCaps * gst_queue_getcaps (GstPad *pad) { GstPad *otherpad = GST_PAD_PEER (gst_queue_otherpad (pad)); @@ -343,7 +343,7 @@ gst_queue_getcaps (GstPad *pad) if (otherpad) return gst_pad_get_caps (otherpad); - return gst_caps2_new_any (); + return gst_caps_new_any (); } static void diff --git a/plugins/elements/gstshaper.c b/plugins/elements/gstshaper.c index 6b5e3ee8da..95a3f1a162 100644 --- a/plugins/elements/gstshaper.c +++ b/plugins/elements/gstshaper.c @@ -64,14 +64,14 @@ GstStaticPadTemplate shaper_src_template = GST_STATIC_PAD_TEMPLATE ( "src%d", GST_PAD_SRC, GST_PAD_SOMETIMES, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); GstStaticPadTemplate shaper_sink_template = GST_STATIC_PAD_TEMPLATE ( "sink%d", GST_PAD_SINK, GST_PAD_REQUEST, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); #define GST_TYPE_SHAPER_POLICY (gst_shaper_policy_get_type()) @@ -170,7 +170,7 @@ gst_shaper_class_init (GstShaperClass *klass) gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR (gst_shaper_request_new_pad); } -static GstCaps2* +static GstCaps* gst_shaper_getcaps (GstPad *pad) { GstPad *otherpad; @@ -180,7 +180,7 @@ gst_shaper_getcaps (GstPad *pad) otherpad = (pad == connection->srcpad ? connection->sinkpad : connection->srcpad); - return gst_caps2_copy (gst_pad_get_allowed_caps (otherpad)); + return gst_caps_copy (gst_pad_get_allowed_caps (otherpad)); } static GList* @@ -200,7 +200,7 @@ gst_shaper_get_internal_link (GstPad *pad) } static GstPadLinkReturn -gst_shaper_link (GstPad *pad, const GstCaps2 *caps) +gst_shaper_link (GstPad *pad, const GstCaps *caps) { GstPad *otherpad; GstShaperConnection *connection; diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c index c5d03cb21a..89acedc9b7 100644 --- a/plugins/elements/gsttee.c +++ b/plugins/elements/gsttee.c @@ -57,7 +57,7 @@ GstStaticPadTemplate tee_src_template = GST_STATIC_PAD_TEMPLATE ( "src%d", GST_PAD_SRC, GST_PAD_REQUEST, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); static void gst_tee_base_init (gpointer g_class); @@ -138,17 +138,17 @@ gst_tee_class_init (GstTeeClass *klass) } static GstPadLinkReturn -gst_tee_sinklink (GstPad *pad, const GstCaps2 *caps) +gst_tee_sinklink (GstPad *pad, const GstCaps *caps) { GstTee *tee; const GList *pads; GstPadLinkReturn set_retval; - GST_DEBUG ( "gst_tee_sinklink caps=%s", gst_caps2_to_string(caps)); + GST_DEBUG ( "gst_tee_sinklink caps=%s", gst_caps_to_string(caps)); tee = GST_TEE (gst_pad_get_parent (pad)); - if (!gst_caps2_is_fixed (caps)) { + if (!gst_caps_is_fixed (caps)) { return GST_PAD_LINK_DELAYED; } @@ -170,21 +170,21 @@ gst_tee_sinklink (GstPad *pad, const GstCaps2 *caps) } static GstPadLinkReturn -gst_tee_srclink (GstPad *pad, const GstCaps2 *caps) +gst_tee_srclink (GstPad *pad, const GstCaps *caps) { GstTee *tee; - GST_DEBUG ( "gst_tee_srclink caps=%s", gst_caps2_to_string(caps)); + GST_DEBUG ( "gst_tee_srclink caps=%s", gst_caps_to_string(caps)); tee = GST_TEE (gst_pad_get_parent (pad)); return gst_pad_proxy_link (tee->sinkpad, caps); } -static GstCaps2* +static GstCaps* gst_tee_getcaps (GstPad *pad) { - GstCaps2 *caps = GST_CAPS2_ANY; + GstCaps *caps = GST_CAPS_ANY; GstTee *tee; const GList *pads; @@ -197,8 +197,8 @@ gst_tee_getcaps (GstPad *pad) while (pads) { GstPad *srcpad = GST_PAD (pads->data); GstPad *peer; - const GstCaps2 *peercaps; - GstCaps2 *newcaps; + const GstCaps *peercaps; + GstCaps *newcaps; pads = g_list_next (pads); @@ -208,8 +208,8 @@ gst_tee_getcaps (GstPad *pad) } peercaps = gst_pad_get_caps (peer); - newcaps = gst_caps2_intersect (caps, peercaps); - gst_caps2_free (caps); + newcaps = gst_caps_intersect (caps, peercaps); + gst_caps_free (caps); caps = newcaps; } diff --git a/plugins/elements/gsttypefind.c b/plugins/elements/gsttypefind.c index 565758d09c..c38099a82b 100644 --- a/plugins/elements/gsttypefind.c +++ b/plugins/elements/gsttypefind.c @@ -58,14 +58,14 @@ GstStaticPadTemplate type_find_element_sink_template = GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); GstStaticPadTemplate type_find_element_src_template = GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); /* TypeFind signals and args */ @@ -141,17 +141,17 @@ gst_type_find_element_get_type (void) return typefind_type; } static void -gst_type_find_element_have_type (GstTypeFindElement *typefind, guint probability, GstCaps2 *caps) +gst_type_find_element_have_type (GstTypeFindElement *typefind, guint probability, GstCaps *caps) { gchar *caps_str; g_assert (typefind->caps == NULL); g_assert (caps != NULL); - caps_str = gst_caps2_to_string (caps); + caps_str = gst_caps_to_string (caps); GST_INFO_OBJECT (typefind, "found caps %s", caps_str); g_free (caps_str); - gst_caps2_replace (&typefind->caps, caps); + gst_caps_replace (&typefind->caps, caps); if (gst_pad_try_set_caps (typefind->src, caps) < GST_PAD_LINK_OK) { gst_element_error (GST_ELEMENT (typefind), "could not set caps on source pad"); } @@ -184,7 +184,7 @@ gst_type_find_element_class_init (gpointer g_class, gpointer class_data) g_object_class_install_property (gobject_class, ARG_CAPS, g_param_spec_boxed ("caps", _("caps"), _("detected capabilities in stream"), - gst_caps2_get_type(), G_PARAM_READABLE)); + gst_caps_get_type(), G_PARAM_READABLE)); g_object_class_install_property (gobject_class, ARG_MINIMUM, g_param_spec_uint ("minimum", _("minimum"), "minimum probability required to accept caps", GST_TYPE_FIND_MINIMUM, GST_TYPE_FIND_MAXIMUM, GST_TYPE_FIND_MINIMUM, G_PARAM_READWRITE)); @@ -196,7 +196,7 @@ gst_type_find_element_class_init (gpointer g_class, gpointer class_data) G_TYPE_FROM_CLASS (g_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstTypeFindElementClass, have_type), NULL, NULL, gst_marshal_VOID__UINT_BOXED, G_TYPE_NONE, 2, - G_TYPE_UINT, gst_caps2_get_type()); + G_TYPE_UINT, gst_caps_get_type()); gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_type_find_element_change_state); } @@ -313,7 +313,7 @@ gst_type_find_element_src_event (GstPad *pad, GstEvent *event) typedef struct { GstTypeFindFactory * factory; gint probability; - GstCaps2 * caps; + GstCaps * caps; gint64 requested_offset; guint requested_size; @@ -333,7 +333,7 @@ free_entry (TypeFindEntry *entry) free_entry_buffers (entry); if (entry->caps) - gst_caps2_free (entry->caps); + gst_caps_free (entry->caps); g_free (entry); } static void @@ -473,18 +473,18 @@ find_peek (gpointer data, gint64 offset, guint size) } } static void -find_suggest (gpointer data, guint probability, const GstCaps2 *caps) +find_suggest (gpointer data, guint probability, const GstCaps *caps) { gchar *str; TypeFindEntry *entry = (TypeFindEntry *) data; - str = gst_caps2_to_string (caps); + str = gst_caps_to_string (caps); GST_LOG_OBJECT (entry->self, "'%s' called suggest (%u, %s)", GST_PLUGIN_FEATURE_NAME (entry->factory), probability, str); g_free (str); if (((gint) probability) > entry->probability) { entry->probability = probability; - gst_caps2_replace (&entry->caps, gst_caps2_copy (caps)); + gst_caps_replace (&entry->caps, gst_caps_copy (caps)); } } static gint @@ -563,10 +563,10 @@ gst_type_find_element_chain (GstPad *pad, GstData *data) free_entry (entry); } else if (entry->probability >= typefind->max_probability) { /* wooha, got caps */ - GstCaps2 *found_caps = entry->caps; + GstCaps *found_caps = entry->caps; guint probability = entry->probability; - found_caps = gst_caps2_copy (found_caps); + found_caps = gst_caps_copy (found_caps); GST_INFO_OBJECT (typefind, "'%s' returned %u/%u probability, using it NOW", GST_PLUGIN_FEATURE_NAME (entry->factory), probability, typefind->max_probability); while (walk) { @@ -581,7 +581,7 @@ gst_type_find_element_chain (GstPad *pad, GstData *data) typefind->possibilities = NULL; g_list_free (typefind->possibilities); g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], 0, probability, found_caps); - gst_caps2_free (found_caps); + gst_caps_free (found_caps); } else { typefind->possibilities = g_list_prepend (typefind->possibilities, entry); } @@ -669,7 +669,7 @@ gst_type_find_element_change_state (GstElement *element) break; case GST_STATE_PAUSED_TO_READY: stop_typefinding (typefind); - gst_caps2_replace (&typefind->caps, NULL); + gst_caps_replace (&typefind->caps, NULL); break; default: break; diff --git a/plugins/elements/gsttypefind.h b/plugins/elements/gsttypefind.h index bfbb955df0..7f508ba5e6 100644 --- a/plugins/elements/gsttypefind.h +++ b/plugins/elements/gsttypefind.h @@ -50,7 +50,7 @@ struct _GstTypeFindElement { guint min_probability; guint max_probability; - GstCaps2 * caps; + GstCaps * caps; guint mode; GstBufferStore * store; @@ -66,7 +66,7 @@ struct _GstTypeFindElementClass { /* signals */ void (*have_type) (GstTypeFindElement *element, guint probability, - GstCaps2 * caps); + GstCaps * caps); }; GType gst_type_find_element_get_type (void); diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c index 565758d09c..c38099a82b 100644 --- a/plugins/elements/gsttypefindelement.c +++ b/plugins/elements/gsttypefindelement.c @@ -58,14 +58,14 @@ GstStaticPadTemplate type_find_element_sink_template = GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); GstStaticPadTemplate type_find_element_src_template = GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS2_ANY + GST_STATIC_CAPS_ANY ); /* TypeFind signals and args */ @@ -141,17 +141,17 @@ gst_type_find_element_get_type (void) return typefind_type; } static void -gst_type_find_element_have_type (GstTypeFindElement *typefind, guint probability, GstCaps2 *caps) +gst_type_find_element_have_type (GstTypeFindElement *typefind, guint probability, GstCaps *caps) { gchar *caps_str; g_assert (typefind->caps == NULL); g_assert (caps != NULL); - caps_str = gst_caps2_to_string (caps); + caps_str = gst_caps_to_string (caps); GST_INFO_OBJECT (typefind, "found caps %s", caps_str); g_free (caps_str); - gst_caps2_replace (&typefind->caps, caps); + gst_caps_replace (&typefind->caps, caps); if (gst_pad_try_set_caps (typefind->src, caps) < GST_PAD_LINK_OK) { gst_element_error (GST_ELEMENT (typefind), "could not set caps on source pad"); } @@ -184,7 +184,7 @@ gst_type_find_element_class_init (gpointer g_class, gpointer class_data) g_object_class_install_property (gobject_class, ARG_CAPS, g_param_spec_boxed ("caps", _("caps"), _("detected capabilities in stream"), - gst_caps2_get_type(), G_PARAM_READABLE)); + gst_caps_get_type(), G_PARAM_READABLE)); g_object_class_install_property (gobject_class, ARG_MINIMUM, g_param_spec_uint ("minimum", _("minimum"), "minimum probability required to accept caps", GST_TYPE_FIND_MINIMUM, GST_TYPE_FIND_MAXIMUM, GST_TYPE_FIND_MINIMUM, G_PARAM_READWRITE)); @@ -196,7 +196,7 @@ gst_type_find_element_class_init (gpointer g_class, gpointer class_data) G_TYPE_FROM_CLASS (g_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstTypeFindElementClass, have_type), NULL, NULL, gst_marshal_VOID__UINT_BOXED, G_TYPE_NONE, 2, - G_TYPE_UINT, gst_caps2_get_type()); + G_TYPE_UINT, gst_caps_get_type()); gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_type_find_element_change_state); } @@ -313,7 +313,7 @@ gst_type_find_element_src_event (GstPad *pad, GstEvent *event) typedef struct { GstTypeFindFactory * factory; gint probability; - GstCaps2 * caps; + GstCaps * caps; gint64 requested_offset; guint requested_size; @@ -333,7 +333,7 @@ free_entry (TypeFindEntry *entry) free_entry_buffers (entry); if (entry->caps) - gst_caps2_free (entry->caps); + gst_caps_free (entry->caps); g_free (entry); } static void @@ -473,18 +473,18 @@ find_peek (gpointer data, gint64 offset, guint size) } } static void -find_suggest (gpointer data, guint probability, const GstCaps2 *caps) +find_suggest (gpointer data, guint probability, const GstCaps *caps) { gchar *str; TypeFindEntry *entry = (TypeFindEntry *) data; - str = gst_caps2_to_string (caps); + str = gst_caps_to_string (caps); GST_LOG_OBJECT (entry->self, "'%s' called suggest (%u, %s)", GST_PLUGIN_FEATURE_NAME (entry->factory), probability, str); g_free (str); if (((gint) probability) > entry->probability) { entry->probability = probability; - gst_caps2_replace (&entry->caps, gst_caps2_copy (caps)); + gst_caps_replace (&entry->caps, gst_caps_copy (caps)); } } static gint @@ -563,10 +563,10 @@ gst_type_find_element_chain (GstPad *pad, GstData *data) free_entry (entry); } else if (entry->probability >= typefind->max_probability) { /* wooha, got caps */ - GstCaps2 *found_caps = entry->caps; + GstCaps *found_caps = entry->caps; guint probability = entry->probability; - found_caps = gst_caps2_copy (found_caps); + found_caps = gst_caps_copy (found_caps); GST_INFO_OBJECT (typefind, "'%s' returned %u/%u probability, using it NOW", GST_PLUGIN_FEATURE_NAME (entry->factory), probability, typefind->max_probability); while (walk) { @@ -581,7 +581,7 @@ gst_type_find_element_chain (GstPad *pad, GstData *data) typefind->possibilities = NULL; g_list_free (typefind->possibilities); g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], 0, probability, found_caps); - gst_caps2_free (found_caps); + gst_caps_free (found_caps); } else { typefind->possibilities = g_list_prepend (typefind->possibilities, entry); } @@ -669,7 +669,7 @@ gst_type_find_element_change_state (GstElement *element) break; case GST_STATE_PAUSED_TO_READY: stop_typefinding (typefind); - gst_caps2_replace (&typefind->caps, NULL); + gst_caps_replace (&typefind->caps, NULL); break; default: break; diff --git a/plugins/elements/gsttypefindelement.h b/plugins/elements/gsttypefindelement.h index bfbb955df0..7f508ba5e6 100644 --- a/plugins/elements/gsttypefindelement.h +++ b/plugins/elements/gsttypefindelement.h @@ -50,7 +50,7 @@ struct _GstTypeFindElement { guint min_probability; guint max_probability; - GstCaps2 * caps; + GstCaps * caps; guint mode; GstBufferStore * store; @@ -66,7 +66,7 @@ struct _GstTypeFindElementClass { /* signals */ void (*have_type) (GstTypeFindElement *element, guint probability, - GstCaps2 * caps); + GstCaps * caps); }; GType gst_type_find_element_get_type (void); |