gst-libs/gst/play/gstplay.c: When analyzing the pads of an element the bin is mostly...

Original commit message from CVS:
2004-01-12  Julien MOUTTE <julien@moutte.net>

* gst-libs/gst/play/gstplay.c: (gst_play_get_sink_element): When
analyzing the pads of an element the bin is mostly in READY state so
no caps were negotiated. This helper function needs to work with
_get_caps directly then. I was not freeing them though, added that to
fix the mem leak.

diff --git a/ChangeLog b/ChangeLog
index add26c20569327c3b9efdc63294203d5c04631c8..63d900d6bacc99602ca54d2cc263a597b6dbe975 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-12  Julien MOUTTE <julien@moutte.net>
+
+       * gst-libs/gst/play/gstplay.c: (gst_play_get_sink_element): When
+       analyzing the pads of an element the bin is mostly in READY state so
+       no caps were negotiated. This helper function needs to work with
+       _get_caps directly then. I was not freeing them though, added that to
+       fix the mem leak.
+
 2004-01-12  Julien MOUTTE <julien@moutte.net>
 
        * sys/ximage/ximagesink.c: (gst_ximagesink_chain):

diff --git a/gst-libs/gst/play/gstplay.c b/gst-libs/gst/play/gstplay.c
index bcc5c4d1ec4853b49bbcfcf5c9972f0787f0a23e..dee3f8ef995563187d61637bd1063e3fc9a9fb3f 100644 (file)
--- a/gst-libs/gst/play/gstplay.c
+++ b/gst-libs/gst/play/gstplay.c
@@ -923,14 +923,14 @@ gst_play_get_sink_element (GstPlay *play,
         }
         else {
           /* If not a src pad checking caps */
-          const GstCaps *caps;
+          GstCaps *caps;
           GstStructure *structure;
           gboolean has_video_cap = FALSE;
           gboolean has_audio_cap = FALSE;
 
-          caps = gst_pad_get_negotiated_caps (GST_PAD (pads->data));
+          caps = gst_pad_get_caps (GST_PAD (pads->data));
           structure = gst_caps_get_structure (caps, 0);
-
+          
           if (strcmp (gst_structure_get_name (structure),
                                   "audio/x-raw-int") == 0) {
             has_audio_cap = TRUE;
@@ -943,6 +943,8 @@ gst_play_get_sink_element (GstPlay *play,
             has_video_cap = TRUE;
           }
 
+          gst_caps_free (caps);
+          
           switch (sink_type) {
             case GST_PLAY_SINK_TYPE_AUDIO:
               if (has_audio_cap)

diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index bcc5c4d1ec4853b49bbcfcf5c9972f0787f0a23e..dee3f8ef995563187d61637bd1063e3fc9a9fb3f 100644 (file)
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -923,14 +923,14 @@ gst_play_get_sink_element (GstPlay *play,
         }
         else {
           /* If not a src pad checking caps */
-          const GstCaps *caps;
+          GstCaps *caps;
           GstStructure *structure;
           gboolean has_video_cap = FALSE;
           gboolean has_audio_cap = FALSE;
 
-          caps = gst_pad_get_negotiated_caps (GST_PAD (pads->data));
+          caps = gst_pad_get_caps (GST_PAD (pads->data));
           structure = gst_caps_get_structure (caps, 0);
-
+          
           if (strcmp (gst_structure_get_name (structure),
                                   "audio/x-raw-int") == 0) {
             has_audio_cap = TRUE;
@@ -943,6 +943,8 @@ gst_play_get_sink_element (GstPlay *play,
             has_video_cap = TRUE;
           }
 
+          gst_caps_free (caps);
+          
           switch (sink_type) {
             case GST_PLAY_SINK_TYPE_AUDIO:
               if (has_audio_cap)