Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c emotion_xine.h emotion_xine_vo_out.c
Log Message:
there is a deadlock between the video out deocder thread and the main process
(emotion) thread as it continues while the main thread is stopped tyring to
stop the video playback - this ends up in a deadlock. this tries to eliminate
that by havng a much more limited framequeue.
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- emotion_xine.c 19 Dec 2006 14:15:17 -0000 1.30
+++ emotion_xine.c 3 Jan 2007 06:24:25 -0000 1.31
@@ -276,7 +276,7 @@
// pthread_mutex_lock(&(ev->seek_mutex));
if (!ev->seek_thread_deleted)
{
- printf("closing seek thread\n");
+ printf("closing seek thread %p\n", ev);
pthread_cond_broadcast(&(ev->seek_cond));
while (ev->seek_to);
}
@@ -284,20 +284,20 @@
// pthread_mutex_lock(&(ev->get_pos_len_mutex));
if (!ev->get_pos_thread_deleted)
{
- printf("closing get_pos thread\n");
+ printf("closing get_pos thread, %p\n", ev);
pthread_cond_broadcast(&(ev->get_pos_len_cond));
while (ev->get_poslen);
}
- printf("EX dispose\n");
+ printf("EX dispose %p\n", ev);
xine_dispose(ev->stream);
- printf("EX dispose evq\n");
+ printf("EX dispose evq %p\n", ev);
xine_event_dispose_queue(ev->queue);
- printf("EX close video drv\n");
+ printf("EX close video drv %p\n", ev);
if (ev->video) xine_close_video_driver(ev->decoder, ev->video);
- printf("EX close audio drv\n");
+ printf("EX close audio drv %p\n", ev);
if (ev->audio) xine_close_audio_driver(ev->decoder, ev->audio);
- printf("EX del fds\n");
+ printf("EX del fds %p\n", ev);
ecore_main_fd_handler_del(ev->fd_handler);
close(ev->fd_write);
close(ev->fd_read);
@@ -365,18 +365,24 @@
ev = (Emotion_Xine_Video *)ef;
if (!ev) return;
- printf("EX pause end...\n");
+ printf("EX pause end... %p\n", ev);
if (!emotion_object_play_get(ev->obj))
// if (xine_get_param(ev->stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
{
- printf(" ... unpause\n");
+ printf(" ... unpause %p\n", ev);
xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
}
- printf("EX stop\n");
+// xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+ printf("EX done %p\n", ev);
+ em_frame_done(ev);
+// printf("EX seek 0 %p\n", ev);
+// xine_play(ev->stream, 0, 0);
+ printf("EX: fq %i %p\n", ev->fq, ev);
+ printf("EX stop %p\n", ev);
xine_stop(ev->stream);
- printf("EX close\n");
+ printf("EX close %p\n", ev);
xine_close(ev->stream);
- printf("EX del timer\n");
+ printf("EX del timer %p\n", ev);
if (ev->timer)
{
ecore_timer_del(ev->timer);
@@ -591,13 +597,15 @@
ev = (Emotion_Xine_Video *)ef;
if (ev->cur_frame)
{
+ ev->fq--;
if (ev->cur_frame->done_func)
ev->cur_frame->done_func(ev->cur_frame->done_data);
ev->cur_frame = NULL;
}
}
-static Emotion_Format em_format_get(void *ef)
+static Emotion_Format
+em_format_get(void *ef)
{
Emotion_Xine_Video *ev;
Emotion_Xine_Video_Frame *fr;
@@ -605,8 +613,7 @@
ev = (Emotion_Xine_Video *)ef;
fr = ev->cur_frame;
- if (fr)
- return fr->format;
+ if (fr) return fr->format;
return EMOTION_FORMAT_YV12;
}
@@ -660,7 +667,7 @@
if (!fr) return 0;
if (fr->bgra_data)
{
- *bgra_data = fr->bgra_data;
+ *bgra_data = fr->bgra_data;
return 1;
}
return 0;
@@ -1154,25 +1161,14 @@
ev = _emotion_video_get(fr->obj);
if (ev)
{
- if (ev->cur_frame)
- {
- if (ev->cur_frame->done_func)
- ev->cur_frame->done_func(ev->cur_frame->done_data);
- }
+ em_frame_done(ev);
ev->cur_frame = fr;
_em_get_pos_len(ev);
if ((xine_get_stream_info(ev->stream,
XINE_STREAM_INFO_HAS_VIDEO)) &&
(xine_get_stream_info(ev->stream,
XINE_STREAM_INFO_VIDEO_HANDLED)))
{
-
- if (ev->video_mute)
- {
- if (ev->cur_frame->done_func)
-
ev->cur_frame->done_func(ev->cur_frame->done_data);
- ev->cur_frame = NULL;
- }
- else
- _emotion_frame_new(fr->obj);
+ if (ev->video_mute) em_frame_done(ev);
+ else _emotion_frame_new(fr->obj);
}
_emotion_frame_resize(fr->obj, fr->w, fr->h, fr->ratio);
_emotion_video_pos_update(fr->obj, ev->pos, ev->len);
@@ -1274,7 +1270,7 @@
xine_audio_level_data_t *e;
e = (xine_audio_level_data_t *)eev->xine_event;
- _emotion_audio_level_change(ev->obj);
+ _emotion_audio_level_change(ev->obj);
printf("EV: Audio Level [FIXME: break this out to
emotion api]\n");
// e->left (0->100)
// e->right
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- emotion_xine.h 12 Mar 2006 09:56:13 -0000 1.13
+++ emotion_xine.h 3 Jan 2007 06:24:25 -0000 1.14
@@ -25,10 +25,11 @@
double ratio;
int w, h;
Evas_Object *obj;
- Emotion_Xine_Video_Frame *cur_frame;
+ volatile Emotion_Xine_Video_Frame *cur_frame;
volatile int seek_to;
volatile int get_poslen;
volatile double seek_to_pos;
+ volatile int fq;
Emotion_Vis vis;
Ecore_Timer *timer;
int fd_read;
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine_vo_out.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_xine_vo_out.c 19 Dec 2006 14:15:17 -0000 1.3
+++ emotion_xine_vo_out.c 3 Jan 2007 06:24:25 -0000 1.4
@@ -436,6 +436,10 @@
dv = (Emotion_Driver *)vo_driver;
fr = (Emotion_Frame *)vo_frame;
// printf("emotion: _emotion_frame_display()\n");
+// printf("EX VO: fq %i %p\n", dv->ev->fq, dv->ev);
+// if my frame queue is too deep ( > 4 frames) simply block and wait for them
+// to drain
+ while (dv->ev->fq > 4) usleep(1);
if (dv->ev)
{
void *buf;
@@ -450,9 +454,11 @@
fr->frame.timestamp = (double)fr->vo_frame.vpts / 90000.0;
fr->frame.done_func = _emotion_frame_data_unlock;
fr->frame.done_data = fr;
+// printf("FRAME FOR %p\n", dv->ev);
ret = write(dv->ev->fd, &buf, sizeof(void *));
// printf("-- FRAME DEC %p == %i\n", fr->frame.obj, ret);
fr->in_use = 1;
+ dv->ev->fq++;
}
/* hmm - must find a way to sanely copy data out... FIXME problem */
// fr->vo_frame.free(&fr->vo_frame);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
