summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer/emotion_sink.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-12-30 13:17:26 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-12-30 13:17:26 +0000
commit74e897b4799c83c3dbe57153a87f9bec9106b1c2 (patch)
tree589fb29f7c4b7b46d50191ca55c9daf99a30256a /legacy/emotion/src/modules/gstreamer/emotion_sink.c
parent8b055c639876d43aee68062a8bbd92238fabcbd4 (diff)
emotion_gst... compile again on linux.. and remove warnings (bugs
waiting to possibly happen) SVN revision: 66689
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_sink.c34
1 files changed, 20 insertions, 14 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index 1e8b05098b..678396eb32 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
@@ -472,13 +472,13 @@ evas_video_sink_samsung_main_render(void *data)
472{ 472{
473 Emotion_Gstreamer_Buffer *send; 473 Emotion_Gstreamer_Buffer *send;
474 Emotion_Video_Stream *vstream; 474 Emotion_Video_Stream *vstream;
475 EvasVideoSinkPrivate* priv; 475 EvasVideoSinkPrivate *priv = NULL;
476 GstBuffer* buffer; 476 GstBuffer* buffer;
477 unsigned char *evas_data; 477 unsigned char *evas_data;
478 const guint8 *gst_data; 478 const guint8 *gst_data;
479 GstFormat fmt = GST_FORMAT_TIME; 479 GstFormat fmt = GST_FORMAT_TIME;
480 gint64 pos; 480 gint64 pos;
481 Eina_Bool preroll; 481 Eina_Bool preroll = EINA_FALSE;
482 int stride, elevation; 482 int stride, elevation;
483 Evas_Coord w, h; 483 Evas_Coord w, h;
484 484
@@ -591,10 +591,13 @@ evas_video_sink_samsung_main_render(void *data)
591 emotion_gstreamer_buffer_free(send); 591 emotion_gstreamer_buffer_free(send);
592 592
593 exit_stream: 593 exit_stream:
594 if (preroll || !priv->o) return ; 594 if (priv)
595 595 {
596 if (!priv->unlocked) 596 if (preroll || !priv->o) return;
597 eina_condition_signal(&priv->c); 597
598 if (!priv->unlocked)
599 eina_condition_signal(&priv->c);
600 }
598} 601}
599 602
600static void 603static void
@@ -603,12 +606,12 @@ evas_video_sink_main_render(void *data)
603 Emotion_Gstreamer_Buffer *send; 606 Emotion_Gstreamer_Buffer *send;
604 Emotion_Gstreamer_Video *ev = NULL; 607 Emotion_Gstreamer_Video *ev = NULL;
605 Emotion_Video_Stream *vstream; 608 Emotion_Video_Stream *vstream;
606 EvasVideoSinkPrivate* priv; 609 EvasVideoSinkPrivate *priv = NULL;
607 GstBuffer* buffer; 610 GstBuffer *buffer;
608 unsigned char *evas_data; 611 unsigned char *evas_data;
609 GstFormat fmt = GST_FORMAT_TIME; 612 GstFormat fmt = GST_FORMAT_TIME;
610 gint64 pos; 613 gint64 pos;
611 Eina_Bool preroll; 614 Eina_Bool preroll = EINA_FALSE;
612 615
613 send = data; 616 send = data;
614 617
@@ -692,10 +695,13 @@ evas_video_sink_main_render(void *data)
692 emotion_gstreamer_buffer_free(send); 695 emotion_gstreamer_buffer_free(send);
693 696
694 exit_stream: 697 exit_stream:
695 if (preroll || !priv->o) return ; 698 if (priv)
696 699 {
697 if (!priv->unlocked) 700 if (preroll || !priv->o) return;
698 eina_condition_signal(&priv->c); 701
702 if (!priv->unlocked)
703 eina_condition_signal(&priv->c);
704 }
699} 705}
700 706
701static void 707static void
@@ -1076,7 +1082,7 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
1076 evas_render_method_list_free(engines); 1082 evas_render_method_list_free(engines);
1077 } 1083 }
1078#else 1084#else
1079# warning "no ecore_x or xoverlay" 1085# warning "missing: ecore_x OR xoverlay"
1080#endif 1086#endif
1081 1087
1082 esink = gst_element_factory_make("emotion-sink", "sink"); 1088 esink = gst_element_factory_make("emotion-sink", "sink");