summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-10-11 08:25:34 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-10-11 08:25:34 +0000
commit371b00dae2d8254fb1e9a59f55d6b27fbe3a5b23 (patch)
treeeffd8aadb91502a58794b62782f8a34024360a74
parent2c3e27ca427dc8e06a26e756186939ebbcc0fd47 (diff)
emotion: call the right render function.
SVN revision: 77853
-rw-r--r--legacy/emotion/ChangeLog4
-rw-r--r--legacy/emotion/NEWS1
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_sink.c8
3 files changed, 12 insertions, 1 deletions
diff --git a/legacy/emotion/ChangeLog b/legacy/emotion/ChangeLog
index 9cc78bb163..36a608d761 100644
--- a/legacy/emotion/ChangeLog
+++ b/legacy/emotion/ChangeLog
@@ -54,3 +54,7 @@
542012-09-06 Sohyun Kim 542012-09-06 Sohyun Kim
55 55
56 * Add capsfilter to limit format and size for fimc on device. 56 * Add capsfilter to limit format and size for fimc on device.
57
582012-10-11 Sohyun Kim
59
60 * Fix to call correct render function based on the format.
diff --git a/legacy/emotion/NEWS b/legacy/emotion/NEWS
index 2a1358bbb2..5ea5054dae 100644
--- a/legacy/emotion/NEWS
+++ b/legacy/emotion/NEWS
@@ -18,6 +18,7 @@ Fixes:
18 - fix priority set/get for gstreamer. 18 - fix priority set/get for gstreamer.
19 - reset VLC pipeline on EOS. 19 - reset VLC pipeline on EOS.
20 - fix race condition on shutdown when still saving a file position. 20 - fix race condition on shutdown when still saving a file position.
21 - fix to call correct render function.
21 22
22Improvements: 23Improvements:
23 24
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index 433d8dca50..17a1bc56cd 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
@@ -962,13 +962,19 @@ _video_update_pixels(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_S
962{ 962{
963 Emotion_Gstreamer_Video *ev = data; 963 Emotion_Gstreamer_Video *ev = data;
964 Emotion_Gstreamer_Buffer *send; 964 Emotion_Gstreamer_Buffer *send;
965 EvasVideoSinkPrivate *priv = NULL;
965 966
966 if (!ev->send) return ; 967 if (!ev->send) return ;
967 968
968 send = ev->send; 969 send = ev->send;
970 priv = send->sink;
969 send->force = EINA_TRUE; 971 send->force = EINA_TRUE;
970 ev->send = NULL; 972 ev->send = NULL;
971 evas_video_sink_main_render(send); 973
974 if (priv->samsung)
975 evas_video_sink_samsung_main_render(send);
976 else
977 evas_video_sink_main_render(send);
972} 978}
973 979
974static void 980static void