From: cedric <cedric>
Date: Tue, 20 Sep 2011 11:04:54 +0000 (+0000)
Subject: emotion: don't use the pipeline anymore when it's not needed.
X-Git-Tag: submit/2.0alpha-wayland/20121127.222018~127
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0897a0dda004f882f37404d0b37525bd4afbe12a;p=profile%2Fivi%2Femotion.git

emotion: don't use the pipeline anymore when it's not needed.


git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@63497 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/modules/gstreamer/emotion_gstreamer.c b/src/modules/gstreamer/emotion_gstreamer.c
index ce903ee..3a38edc 100644
--- a/src/modules/gstreamer/emotion_gstreamer.c
+++ b/src/modules/gstreamer/emotion_gstreamer.c
@@ -870,8 +870,9 @@ em_video_data_size_get(void *video, int *w, int *h)
 
    ev = (Emotion_Gstreamer_Video *)video;
 
-   if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE))
-     goto on_error;
+   if (ev->pipeline && (!ev->video_stream_nbr || !ev->video_streams))
+     if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE))
+       goto on_error;
 
    vstream = eina_list_nth(ev->video_streams, ev->video_stream_nbr - 1);
    if (vstream)
diff --git a/src/modules/gstreamer/emotion_sink.c b/src/modules/gstreamer/emotion_sink.c
index d9a2392..dfb6e02 100644
--- a/src/modules/gstreamer/emotion_sink.c
+++ b/src/modules/gstreamer/emotion_sink.c
@@ -1051,7 +1051,6 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
 #else
 # warning "no ecore_x or xoverlay"
 #endif
-   fprintf(stderr, "sink: %p\n", sink);
    if (!sink)
      {
         sink = gst_element_factory_make("emotion-sink", "sink");