mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 04:52:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix for _negotiated_caps() change

Browse source
This commit is contained in:
Wim Taymans 2011-08-15 12:18:15 +02:00
parent 2d1ffa68a9
commit e904c529e3
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/ogg/gstoggmux.c
View file

@ -983,7 +983,7 @@ gst_ogg_mux_get_headers (GstOggPadData * pad)
GST_LOG_OBJECT (thepad, "getting headers"); GST_LOG_OBJECT (thepad, "getting headers");
caps = gst_pad_get_negotiated_caps (thepad); caps = gst_pad_get_current_caps (thepad);
if (caps != NULL) { if (caps != NULL) {
const GValue *streamheader; const GValue *streamheader;
@ -1126,7 +1126,7 @@ gst_ogg_mux_send_headers (GstOggMux * mux)
pad = (GstOggPadData *) walk->data; pad = (GstOggPadData *) walk->data;
thepad = pad->collect.pad; 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); structure = gst_caps_get_structure (caps, 0);
walk = walk->next; walk = walk->next;

2
gst-libs/gst/pbutils/gstdiscoverer.c
View file

@ -580,7 +580,7 @@ collect_stream_information (GstDiscoverer * dc, PrivateStream * ps, guint idx)
g_free (stname); g_free (stname);
/* Get caps */ /* Get caps */
caps = gst_pad_get_negotiated_caps (ps->pad); caps = gst_pad_get_current_caps (ps->pad);
if (!caps) { if (!caps) {
GST_WARNING ("Couldn't get negotiated caps from %s:%s", GST_WARNING ("Couldn't get negotiated caps from %s:%s",
GST_DEBUG_PAD_NAME (ps->pad)); GST_DEBUG_PAD_NAME (ps->pad));

4
gst/playback/gstdecodebin2.c
View file

@ -3083,7 +3083,7 @@ _gst_element_get_linked_caps (GstElement * src, GstElement * sink)
if (peer) { if (peer) {
parent = gst_pad_get_parent_element (peer); parent = gst_pad_get_parent_element (peer);
if (parent == sink) { if (parent == sink) {
caps = gst_pad_get_negotiated_caps (pad); caps = gst_pad_get_current_caps (pad);
done = TRUE; done = TRUE;
} }
@ -3179,7 +3179,7 @@ gst_decode_chain_get_topology (GstDecodeChain * chain)
} }
/* Caps that resulted in this 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) { if (!caps) {
caps = get_pad_caps (chain->pad); caps = get_pad_caps (chain->pad);
if (G_UNLIKELY (!gst_caps_is_fixed (caps))) { if (G_UNLIKELY (!gst_caps_is_fixed (caps))) {

2
gst/playback/gstplaysink.c
View file

@ -2835,7 +2835,7 @@ is_raw_pad (GstPad * pad)
if (!peer) if (!peer)
return raw; return raw;
caps = gst_pad_get_negotiated_caps (peer); caps = gst_pad_get_current_caps (peer);
if (!caps) { if (!caps) {
guint i, n; guint i, n;

2
gst/playback/gstplaysinkaudioconvert.c
View file

@ -86,7 +86,7 @@ pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
/* There must be a peer at this point */ /* There must be a peer at this point */
peer = gst_pad_get_peer (self->sinkpad); peer = gst_pad_get_peer (self->sinkpad);
caps = gst_pad_get_negotiated_caps (peer); caps = gst_pad_get_current_caps (peer);
if (!caps) if (!caps)
caps = gst_pad_get_caps (peer, NULL); caps = gst_pad_get_caps (peer, NULL);
gst_object_unref (peer); gst_object_unref (peer);

2
gst/playback/gstplaysinkvideoconvert.c
View file

@ -86,7 +86,7 @@ pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
/* There must be a peer at this point */ /* There must be a peer at this point */
peer = gst_pad_get_peer (self->sinkpad); peer = gst_pad_get_peer (self->sinkpad);
caps = gst_pad_get_negotiated_caps (peer); caps = gst_pad_get_current_caps (peer);
if (!caps) if (!caps)
caps = gst_pad_get_caps (peer, NULL); caps = gst_pad_get_caps (peer, NULL);
gst_object_unref (peer); gst_object_unref (peer);

6
gst/playback/gstsubtitleoverlay.c
View file

@ -736,7 +736,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
peer = gst_pad_get_peer (self->subtitle_sinkpad); peer = gst_pad_get_peer (self->subtitle_sinkpad);
if (peer) { if (peer) {
subcaps = gst_pad_get_negotiated_caps (peer); subcaps = gst_pad_get_current_caps (peer);
if (!subcaps) { if (!subcaps) {
subcaps = gst_pad_get_caps (peer, NULL); subcaps = gst_pad_get_caps (peer, NULL);
if (!gst_caps_is_fixed (subcaps)) { if (!gst_caps_is_fixed (subcaps)) {
@ -870,7 +870,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
GstCaps *video_caps; GstCaps *video_caps;
gint fps_n, fps_d; 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) { if (!video_caps) {
video_caps = gst_pad_get_caps (video_peer, NULL); video_caps = gst_pad_get_caps (video_peer, NULL);
if (!gst_caps_is_fixed (video_caps)) { 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); 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) { if (!caps) {
caps = gst_pad_get_caps (peer, NULL); caps = gst_pad_get_caps (peer, NULL);
if (!gst_caps_is_fixed (caps)) { if (!gst_caps_is_fixed (caps)) {

2
tests/check/libs/struct_x86_64.h
View file

@ -91,6 +91,6 @@ GstCheckABIStruct list[] = {
{"GstVideoRectangle", sizeof (GstVideoRectangle), 16}, {"GstVideoRectangle", sizeof (GstVideoRectangle), 16},
{"GstVideoSinkClass", sizeof (GstVideoSinkClass), 760}, {"GstVideoSinkClass", sizeof (GstVideoSinkClass), 760},
{"GstVideoSink", sizeof (GstVideoSink), 640}, {"GstVideoSink", sizeof (GstVideoSink), 640},
{"GstXOverlayClass", sizeof (GstXOverlayClass), 64}, {"GstVideoOverlayIface", sizeof (GstVideoOverlayIface), 64},
{NULL, 0, 0} {NULL, 0, 0}
}; };

2
tests/check/pipelines/oggmux.c
View file

@ -292,7 +292,7 @@ test_pipeline (const char *pipeline)
GstStructure *s; GstStructure *s;
GstCaps *muxcaps; GstCaps *muxcaps;
muxcaps = gst_pad_get_negotiated_caps (sinkpad); muxcaps = gst_pad_get_current_caps (sinkpad);
fail_unless (muxcaps != NULL); fail_unless (muxcaps != NULL);
s = gst_caps_get_structure (muxcaps, 0); s = gst_caps_get_structure (muxcaps, 0);
fail_unless (gst_structure_has_name (s, "application/ogg")); fail_unless (gst_structure_has_name (s, "application/ogg"));