From 962b7fd589e53bd7b10e9d9071bab13d4ce0df78 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sat, 7 Jun 2014 11:10:31 +0100 Subject: Revert "VAAPI DEBUG" This reverts commit 95c7751a7c4ef44fc1c2345e75e8cec10385fb4d. --- clutter-gst/clutter-gst-video-sink.c | 24 +++--------------------- examples/simple-player.js | 10 ---------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 6c81287..db69028 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -1727,8 +1727,6 @@ clutter_gst_build_caps (GSList *renderers) g_slist_foreach (renderers, append_cap, caps); - /* g_message ("Caps list : %s", gst_caps_to_string (caps)); */ - return caps; } @@ -1760,19 +1758,12 @@ clutter_gst_video_sink_get_caps (GstBaseSink *bsink, GstCaps *filter) { ClutterGstVideoSink *sink; - GstCaps *ret; sink = CLUTTER_GST_VIDEO_SINK (bsink); if (sink->priv->caps == NULL) - ret = NULL; - else if (filter == NULL) - ret = gst_caps_ref (sink->priv->caps); + return NULL; else - ret = gst_caps_intersect (filter, sink->priv->caps); - g_message ("Filter %s |||||||||| Intersect result : %s", - gst_caps_to_string (filter), gst_caps_to_string (ret)); - - return ret; + return gst_caps_ref (sink->priv->caps); } static gboolean @@ -1887,15 +1878,8 @@ clutter_gst_video_sink_set_caps (GstBaseSink *bsink, sink = CLUTTER_GST_VIDEO_SINK (bsink); priv = sink->priv; - if (!clutter_gst_video_sink_parse_caps (caps, sink, FALSE)) - { - g_message ("Caps fail : %s", gst_caps_to_string (caps)); - return FALSE; - } - - g_message ("Caps success : %s", gst_caps_to_string (caps)); - + return FALSE; g_mutex_lock (&priv->source->buffer_lock); priv->source->has_new_caps = TRUE; @@ -2212,8 +2196,6 @@ clutter_gst_video_sink_propose_allocation (GstBaseSink *base_sink, GstQuery *que gst_query_parse_allocation (query, &caps, &need_pool); - g_message ("clutter video sink propose allocation!"); - gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL); gst_query_add_allocation_meta (query, diff --git a/examples/simple-player.js b/examples/simple-player.js index 2d2eedf..9bd38d7 100644 --- a/examples/simple-player.js +++ b/examples/simple-player.js @@ -18,10 +18,8 @@ */ const Lang = imports.lang; -const Mainloop = imports.mainloop; const Clutter = imports.gi.Clutter; const ClutterGst = imports.gi.ClutterGst; -const Gst = imports.gi.Gst; if (ARGV.length < 1) throw "Need 1 argument : simple-player.js videofile "; @@ -54,12 +52,4 @@ stage.add_child(actor); stage.show(); -Mainloop.timeout_add(1000, function() { - log(player.get_pipeline()); - Gst.debug_bin_to_dot_file_with_ts(player.get_pipeline(), - Gst.DebugGraphDetails.ALL, - "plop"); - log('dumped.'); -}); - Clutter.main(); -- cgit v1.2.1