summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/lib
diff options
context:
space:
mode:
authordoursse <doursse>2006-02-04 13:43:13 +0000
committerdoursse <doursse@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2006-02-04 13:43:13 +0000
commit7ecab55f5b806d03f15011a957ce59d7e7af0485 (patch)
tree92fc281ade6898e0a293f2dea21e58feac0c937d /legacy/emotion/src/lib
parent5d0432137401c269d091d15963ca0595c9ab9aae (diff)
gstreamer 0.10 port. There's a problem with the seek, no evas sink yet
SVN revision: 20273
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/lib/emotion_private.h10
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c4
2 files changed, 9 insertions, 5 deletions
diff --git a/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index 1b041fa622..4ad012caea 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -24,9 +24,11 @@ typedef struct _Emotion_Video_Module Emotion_Video_Module;
24 24
25enum _Emotion_Format 25enum _Emotion_Format
26{ 26{
27 EMOTION_YV12, 27 EMOTION_FORMAT_NONE,
28 EMOTION_YUY2, /* unused for now since evas does not support yuy2 format */ 28 EMOTION_FORMAT_I420,
29 EMOTION_BGRA 29 EMOTION_FORMAT_YV12,
30 EMOTION_FORMAT_YUY2, /* unused for now since evas does not support yuy2 format */
31 EMOTION_FORMAT_BGRA
30}; 32};
31 33
32struct _Emotion_Video_Module 34struct _Emotion_Video_Module
@@ -40,6 +42,8 @@ struct _Emotion_Video_Module
40 void (*size_get) (void *ef, int *w, int *h); 42 void (*size_get) (void *ef, int *w, int *h);
41 void (*pos_set) (void *ef, double pos); 43 void (*pos_set) (void *ef, double pos);
42 double (*len_get) (void *ef); 44 double (*len_get) (void *ef);
45 int (*fps_num_get) (void *ef);
46 int (*fps_den_get) (void *ef);
43 double (*fps_get) (void *ef); 47 double (*fps_get) (void *ef);
44 double (*pos_get) (void *ef); 48 double (*pos_get) (void *ef);
45 double (*ratio_get) (void *ef); 49 double (*ratio_get) (void *ef);
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index f66bb562a1..01326fea17 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -1003,7 +1003,7 @@ _pixels_get(void *data, Evas_Object *obj)
1003 ih = h; 1003 ih = h;
1004 } 1004 }
1005 format = sd->module->format_get(sd->video); 1005 format = sd->module->format_get(sd->video);
1006 if (format == EMOTION_YV12) 1006 if ((format == EMOTION_FORMAT_YV12) || (format == EMOTION_FORMAT_I420))
1007 { 1007 {
1008 unsigned char **rows; 1008 unsigned char **rows;
1009 Evas_Pixel_Import_Source ps; 1009 Evas_Pixel_Import_Source ps;
@@ -1029,7 +1029,7 @@ _pixels_get(void *data, Evas_Object *obj)
1029 evas_object_image_pixels_dirty_set(obj, 0); 1029 evas_object_image_pixels_dirty_set(obj, 0);
1030 free(ps.rows); 1030 free(ps.rows);
1031 } 1031 }
1032 else if (format == EMOTION_BGRA) 1032 else if (format == EMOTION_FORMAT_BGRA)
1033 { 1033 {
1034 unsigned char *bgra_data; 1034 unsigned char *bgra_data;
1035 if (sd->module->bgra_data_get(sd->video, &bgra_data)); 1035 if (sd->module->bgra_data_get(sd->video, &bgra_data));