From: Wim Taymans Date: Mon, 15 Aug 2011 10:18:15 +0000 (+0200) Subject: fix for _negotiated_caps() change X-Git-Tag: 1.19.3~511^2~7364 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e904c529e32b0457cd7ceb7783294c606e3fa063;p=platform%2Fupstream%2Fgstreamer.git fix for _negotiated_caps() change --- diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index e5e1051..a87e4fc 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -983,7 +983,7 @@ gst_ogg_mux_get_headers (GstOggPadData * pad) GST_LOG_OBJECT (thepad, "getting headers"); - caps = gst_pad_get_negotiated_caps (thepad); + caps = gst_pad_get_current_caps (thepad); if (caps != NULL) { const GValue *streamheader; @@ -1126,7 +1126,7 @@ gst_ogg_mux_send_headers (GstOggMux * mux) pad = (GstOggPadData *) walk->data; thepad = pad->collect.pad; - caps = gst_pad_get_negotiated_caps (thepad); + caps = gst_pad_get_current_caps (thepad); structure = gst_caps_get_structure (caps, 0); walk = walk->next; diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index 140ca39..bdbcb26 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -580,7 +580,7 @@ collect_stream_information (GstDiscoverer * dc, PrivateStream * ps, guint idx) g_free (stname); /* Get caps */ - caps = gst_pad_get_negotiated_caps (ps->pad); + caps = gst_pad_get_current_caps (ps->pad); if (!caps) { GST_WARNING ("Couldn't get negotiated caps from %s:%s", GST_DEBUG_PAD_NAME (ps->pad)); diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index 0fe084c..88f43ad 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -3083,7 +3083,7 @@ _gst_element_get_linked_caps (GstElement * src, GstElement * sink) if (peer) { parent = gst_pad_get_parent_element (peer); if (parent == sink) { - caps = gst_pad_get_negotiated_caps (pad); + caps = gst_pad_get_current_caps (pad); done = TRUE; } @@ -3179,7 +3179,7 @@ gst_decode_chain_get_topology (GstDecodeChain * chain) } /* Caps that resulted in this chain */ - caps = gst_pad_get_negotiated_caps (chain->pad); + caps = gst_pad_get_current_caps (chain->pad); if (!caps) { caps = get_pad_caps (chain->pad); if (G_UNLIKELY (!gst_caps_is_fixed (caps))) { diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c index 0283051..23e9526 100644 --- a/gst/playback/gstplaysink.c +++ b/gst/playback/gstplaysink.c @@ -2835,7 +2835,7 @@ is_raw_pad (GstPad * pad) if (!peer) return raw; - caps = gst_pad_get_negotiated_caps (peer); + caps = gst_pad_get_current_caps (peer); if (!caps) { guint i, n; diff --git a/gst/playback/gstplaysinkaudioconvert.c b/gst/playback/gstplaysinkaudioconvert.c index 1bef613..08f356e 100644 --- a/gst/playback/gstplaysinkaudioconvert.c +++ b/gst/playback/gstplaysinkaudioconvert.c @@ -86,7 +86,7 @@ pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, /* There must be a peer at this point */ peer = gst_pad_get_peer (self->sinkpad); - caps = gst_pad_get_negotiated_caps (peer); + caps = gst_pad_get_current_caps (peer); if (!caps) caps = gst_pad_get_caps (peer, NULL); gst_object_unref (peer); diff --git a/gst/playback/gstplaysinkvideoconvert.c b/gst/playback/gstplaysinkvideoconvert.c index bba335e..494d44a 100644 --- a/gst/playback/gstplaysinkvideoconvert.c +++ b/gst/playback/gstplaysinkvideoconvert.c @@ -86,7 +86,7 @@ pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, /* There must be a peer at this point */ peer = gst_pad_get_peer (self->sinkpad); - caps = gst_pad_get_negotiated_caps (peer); + caps = gst_pad_get_current_caps (peer); if (!caps) caps = gst_pad_get_caps (peer, NULL); gst_object_unref (peer); diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c index 4e6088b..6b9e1c8 100644 --- a/gst/playback/gstsubtitleoverlay.c +++ b/gst/playback/gstsubtitleoverlay.c @@ -736,7 +736,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, peer = gst_pad_get_peer (self->subtitle_sinkpad); if (peer) { - subcaps = gst_pad_get_negotiated_caps (peer); + subcaps = gst_pad_get_current_caps (peer); if (!subcaps) { subcaps = gst_pad_get_caps (peer, NULL); if (!gst_caps_is_fixed (subcaps)) { @@ -870,7 +870,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, GstCaps *video_caps; gint fps_n, fps_d; - video_caps = gst_pad_get_negotiated_caps (video_peer); + video_caps = gst_pad_get_current_caps (video_peer); if (!video_caps) { video_caps = gst_pad_get_caps (video_peer, NULL); if (!gst_caps_is_fixed (video_caps)) { @@ -1811,7 +1811,7 @@ gst_subtitle_overlay_subtitle_sink_link (GstPad * pad, GstPad * peer) GST_DEBUG_OBJECT (pad, "Linking pad to peer %" GST_PTR_FORMAT, peer); - caps = gst_pad_get_negotiated_caps (peer); + caps = gst_pad_get_current_caps (peer); if (!caps) { caps = gst_pad_get_caps (peer, NULL); if (!gst_caps_is_fixed (caps)) { diff --git a/tests/check/libs/struct_x86_64.h b/tests/check/libs/struct_x86_64.h index ad8bc7c..9f18dfb 100644 --- a/tests/check/libs/struct_x86_64.h +++ b/tests/check/libs/struct_x86_64.h @@ -91,6 +91,6 @@ GstCheckABIStruct list[] = { {"GstVideoRectangle", sizeof (GstVideoRectangle), 16}, {"GstVideoSinkClass", sizeof (GstVideoSinkClass), 760}, {"GstVideoSink", sizeof (GstVideoSink), 640}, - {"GstXOverlayClass", sizeof (GstXOverlayClass), 64}, + {"GstVideoOverlayIface", sizeof (GstVideoOverlayIface), 64}, {NULL, 0, 0} }; diff --git a/tests/check/pipelines/oggmux.c b/tests/check/pipelines/oggmux.c index 7c9607d..6b072bc 100644 --- a/tests/check/pipelines/oggmux.c +++ b/tests/check/pipelines/oggmux.c @@ -292,7 +292,7 @@ test_pipeline (const char *pipeline) GstStructure *s; GstCaps *muxcaps; - muxcaps = gst_pad_get_negotiated_caps (sinkpad); + muxcaps = gst_pad_get_current_caps (sinkpad); fail_unless (muxcaps != NULL); s = gst_caps_get_structure (muxcaps, 0); fail_unless (gst_structure_has_name (s, "application/ogg"));