emotion: correctly destroy buffer.

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

diff --git a/src/modules/gstreamer/emotion_gstreamer.c b/src/modules/gstreamer/emotion_gstreamer.c
index d75d1b8..6a27d9c 100644 (file)
--- a/src/modules/gstreamer/emotion_gstreamer.c
+++ b/src/modules/gstreamer/emotion_gstreamer.c
@@ -379,19 +379,21 @@ em_shutdown(void *video)
         ev->eos_bus = NULL;
      }
 
+   if (ev->last_buffer)
+     {
+        gst_buffer_unref(ev->last_buffer);
+        ev->last_buffer = NULL;
+     }
+
    if (ev->pipeline)
      {
+       gstreamer_video_sink_new(ev, ev->obj, NULL);
+
        g_object_set(G_OBJECT(ev->sink), "ev", NULL, NULL);
        g_object_set(G_OBJECT(ev->sink), "evas-object", NULL, NULL);
        gst_element_set_state(ev->pipeline, GST_STATE_NULL);
        gst_object_unref(ev->pipeline);
 
-       if (ev->last_buffer)
-        {
-            gst_buffer_unref(ev->last_buffer);
-            ev->last_buffer = NULL;
-        }
-
        ev->pipeline = NULL;
        ev->sink = NULL;
      }
@@ -497,6 +499,8 @@ em_file_close(void *video)
 
    if (ev->pipeline)
      {
+        gstreamer_video_sink_new(ev, ev->obj, NULL);
+
         g_object_set(G_OBJECT(ev->sink), "ev", NULL, NULL);
         g_object_set(G_OBJECT(ev->sink), "evas-object", NULL, NULL);
         gst_element_set_state(ev->pipeline, GST_STATE_NULL);

diff --git a/src/modules/gstreamer/emotion_sink.c b/src/modules/gstreamer/emotion_sink.c
index 32e80b5..d71d5fa 100644 (file)
--- a/src/modules/gstreamer/emotion_sink.c
+++ b/src/modules/gstreamer/emotion_sink.c
@@ -801,20 +801,25 @@ evas_video_sink_main_render(void *data)
 
    _emotion_frame_new(ev->obj);
 
-   vstream = eina_list_nth(ev->video_streams, ev->video_stream_nbr - 1);
-
    gst_element_query_position(ev->pipeline, &fmt, &pos);
    ev->position = (double)pos / (double)GST_SECOND;
 
-   vstream->width = priv->width;
-   vstream->height = priv->height;
+   vstream = eina_list_nth(ev->video_streams, ev->video_stream_nbr - 1);
+
+   if (vstream)
+     {
+       vstream->width = priv->width;
+       vstream->height = priv->height;
+       _emotion_video_pos_update(ev->obj, ev->position, vstream->length_time);
+     }
+
    ev->ratio = (double) priv->width / (double) priv->height;
 
-   _emotion_video_pos_update(ev->obj, ev->position, vstream->length_time);
    _emotion_frame_resize(ev->obj, priv->width, priv->height, ev->ratio);
 
+   buffer = gst_buffer_ref(buffer);
    if (ev->last_buffer) gst_buffer_unref(ev->last_buffer);
-   ev->last_buffer = gst_buffer_ref(buffer);
+   ev->last_buffer = buffer;
 
  exit_point:
    emotion_gstreamer_buffer_free(send);
@@ -1010,6 +1015,9 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
    evas_object_event_callback_del_full(obj, EVAS_CALLBACK_RESIZE, _on_resize_fill, ev);
    evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_RENDER_FLUSH_POST, _on_post_clear, ev);
 
+   if (!uri)
+     return NULL;
+
    playbin = gst_element_factory_make("playbin2", "playbin");
    if (!playbin)
      {