summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/emotion/src/bin/emotion_test_main.c133
-rw-r--r--legacy/emotion/src/lib/emotion_private.h1
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c2
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c2
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c6
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine.c2
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine_vo_out.c2
7 files changed, 43 insertions, 105 deletions
diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c
index 1d020d4f97..9625e8882c 100644
--- a/legacy/emotion/src/bin/emotion_test_main.c
+++ b/legacy/emotion/src/bin/emotion_test_main.c
@@ -70,12 +70,12 @@ main_resize(Ecore_Evas *ee)
70{ 70{
71 Evas_Coord w, h; 71 Evas_Coord w, h;
72 72
73 evas_output_viewport_get(evas, NULL, NULL, &w, &h); 73 evas_output_viewport_get(ecore_evas_get(ee), NULL, NULL, &w, &h);
74 bg_resize(w, h); 74 bg_resize(w, h);
75} 75}
76 76
77static Eina_Bool 77static Eina_Bool
78main_signal_exit(void *data, int ev_type, void *ev) 78main_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
79{ 79{
80 ecore_main_loop_quit(); 80 ecore_main_loop_quit();
81 while (video_objs) 81 while (video_objs)
@@ -89,7 +89,7 @@ main_signal_exit(void *data, int ev_type, void *ev)
89} 89}
90 90
91static void 91static void
92main_delete_request(Ecore_Evas *ee) 92main_delete_request(Ecore_Evas *ee __UNUSED__)
93{ 93{
94 ecore_main_loop_quit(); 94 ecore_main_loop_quit();
95} 95}
@@ -127,13 +127,12 @@ broadcast_event(Emotion_Event ev)
127} 127}
128 128
129static void 129static void
130bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info) 130bg_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
131{ 131{
132 Evas_Event_Key_Down *ev; 132 Evas_Event_Key_Down *ev = event_info;
133 Eina_List *l; 133 Eina_List *l;
134 Evas_Object *o; 134 Evas_Object *o;
135 135
136 ev = (Evas_Event_Key_Down *)event_info;
137 if (!strcmp(ev->keyname, "Escape")) 136 if (!strcmp(ev->keyname, "Escape"))
138 ecore_main_loop_quit(); 137 ecore_main_loop_quit();
139 else if (!strcmp(ev->keyname, "Up")) 138 else if (!strcmp(ev->keyname, "Up"))
@@ -294,60 +293,6 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
294} 293}
295 294
296static void 295static void
297video_obj_in_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
298{
299// evas_object_color_set(obj, 255, 255, 255, 100);
300}
301
302static void
303video_obj_out_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
304{
305// evas_object_color_set(obj, 255, 255, 255, 200);
306}
307
308static void
309video_obj_down_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
310{
311 Evas_Event_Mouse_Down *e;
312
313 e = event_info;
314 evas_object_color_set(obj, 200, 50, 40, 200);
315 evas_object_raise(obj);
316}
317
318static void
319video_obj_up_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
320{
321 evas_object_color_set(obj, 100, 100, 100, 100);
322}
323
324static void
325video_obj_move_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
326{
327 Evas_Event_Mouse_Move *e;
328
329 e = event_info;
330 if (e->buttons & 0x1)
331 {
332 Evas_Coord x, y;
333
334 evas_object_geometry_get(obj, &x, &y, NULL, NULL);
335 x += e->cur.canvas.x - e->prev.canvas.x;
336 y += e->cur.canvas.y - e->prev.canvas.y;
337 evas_object_move(obj, x, y);
338 }
339 else if (e->buttons & 0x4)
340 {
341 Evas_Coord w, h;
342
343 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
344 w += e->cur.canvas.x - e->prev.canvas.x;
345 h += e->cur.canvas.y - e->prev.canvas.y;
346 evas_object_resize(obj, w, h);
347 }
348}
349
350static void
351video_obj_time_changed(Evas_Object *obj, Evas_Object *edje) 296video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
352{ 297{
353 double pos, len, scale; 298 double pos, len, scale;
@@ -372,7 +317,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
372} 317}
373 318
374static void 319static void
375video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info) 320video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
376{ 321{
377 video_obj_time_changed(obj, data); 322 video_obj_time_changed(obj, data);
378 323
@@ -387,7 +332,7 @@ video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info)
387} 332}
388 333
389static void 334static void
390video_obj_frame_resize_cb(void *data, Evas_Object *obj, void *event_info) 335video_obj_frame_resize_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
391{ 336{
392 Evas_Object *oe; 337 Evas_Object *oe;
393 int iw, ih; 338 int iw, ih;
@@ -408,19 +353,19 @@ video_obj_frame_resize_cb(void *data, Evas_Object *obj, void *event_info)
408} 353}
409 354
410static void 355static void
411video_obj_length_change_cb(void *data, Evas_Object *obj, void *event_info) 356video_obj_length_change_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
412{ 357{
413 video_obj_time_changed(obj, data); 358 video_obj_time_changed(obj, data);
414} 359}
415 360
416static void 361static void
417video_obj_position_update_cb(void *data, Evas_Object *obj, void *event_info) 362video_obj_position_update_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
418{ 363{
419 video_obj_time_changed(obj, data); 364 video_obj_time_changed(obj, data);
420} 365}
421 366
422static void 367static void
423video_obj_stopped_cb(void *data, Evas_Object *obj, void *event_info) 368video_obj_stopped_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
424{ 369{
425 printf("video stopped!\n"); 370 printf("video stopped!\n");
426 emotion_object_position_set(obj, 0.0); 371 emotion_object_position_set(obj, 0.0);
@@ -428,7 +373,7 @@ video_obj_stopped_cb(void *data, Evas_Object *obj, void *event_info)
428} 373}
429 374
430static void 375static void
431video_obj_channels_cb(void *data, Evas_Object *obj, void *event_info) 376video_obj_channels_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
432{ 377{
433 printf("channels changed: [AUD %i][VID %i][SPU %i]\n", 378 printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
434 emotion_object_audio_channel_count(obj), 379 emotion_object_audio_channel_count(obj),
@@ -437,13 +382,13 @@ video_obj_channels_cb(void *data, Evas_Object *obj, void *event_info)
437} 382}
438 383
439static void 384static void
440video_obj_title_cb(void *data, Evas_Object *obj, void *event_info) 385video_obj_title_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
441{ 386{
442 printf("video title to: \"%s\"\n", emotion_object_title_get(obj)); 387 printf("video title to: \"%s\"\n", emotion_object_title_get(obj));
443} 388}
444 389
445static void 390static void
446video_obj_progress_cb(void *data, Evas_Object *obj, void *event_info) 391video_obj_progress_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
447{ 392{
448 printf("progress: \"%s\" %3.3f\n", 393 printf("progress: \"%s\" %3.3f\n",
449 emotion_object_progress_info_get(obj), 394 emotion_object_progress_info_get(obj),
@@ -451,7 +396,7 @@ video_obj_progress_cb(void *data, Evas_Object *obj, void *event_info)
451} 396}
452 397
453static void 398static void
454video_obj_ref_cb(void *data, Evas_Object *obj, void *event_info) 399video_obj_ref_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
455{ 400{
456 printf("video ref to: \"%s\" %i\n", 401 printf("video ref to: \"%s\" %i\n",
457 emotion_object_ref_file_get(obj), 402 emotion_object_ref_file_get(obj),
@@ -459,14 +404,14 @@ video_obj_ref_cb(void *data, Evas_Object *obj, void *event_info)
459} 404}
460 405
461static void 406static void
462video_obj_button_num_cb(void *data, Evas_Object *obj, void *event_info) 407video_obj_button_num_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
463{ 408{
464 printf("video spu buttons to: %i\n", 409 printf("video spu buttons to: %i\n",
465 emotion_object_spu_button_count_get(obj)); 410 emotion_object_spu_button_count_get(obj));
466} 411}
467 412
468static void 413static void
469video_obj_button_cb(void *data, Evas_Object *obj, void *event_info) 414video_obj_button_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
470{ 415{
471 printf("video selected spu button: %i\n", 416 printf("video selected spu button: %i\n",
472 emotion_object_spu_button_get(obj)); 417 emotion_object_spu_button_get(obj));
@@ -475,58 +420,50 @@ video_obj_button_cb(void *data, Evas_Object *obj, void *event_info)
475 420
476 421
477static void 422static void
478video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission, const char *source) 423video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
479{ 424{
480 Evas_Object *ov; 425 Evas_Object *ov = data;
481
482 ov = data;
483 emotion_object_play_set(ov, 1); 426 emotion_object_play_set(ov, 1);
484 edje_object_signal_emit(o, "video_state", "play"); 427 edje_object_signal_emit(o, "video_state", "play");
485} 428}
486 429
487static void 430static void
488video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission, const char *source) 431video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
489{ 432{
490 Evas_Object *ov; 433 Evas_Object *ov = data;
491
492 ov = data;
493 emotion_object_play_set(ov, 0); 434 emotion_object_play_set(ov, 0);
494 edje_object_signal_emit(o, "video_state", "pause"); 435 edje_object_signal_emit(o, "video_state", "pause");
495} 436}
496 437
497static void 438static void
498video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source) 439video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
499{ 440{
500 Evas_Object *ov; 441 Evas_Object *ov = data;
501
502 ov = data;
503 emotion_object_play_set(ov, 0); 442 emotion_object_play_set(ov, 0);
504 emotion_object_position_set(ov, 0); 443 emotion_object_position_set(ov, 0);
505 edje_object_signal_emit(o, "video_state", "stop"); 444 edje_object_signal_emit(o, "video_state", "stop");
506} 445}
507 446
508static void 447static void
509video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission, const char *source) 448video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
510{ 449{
511 Evas_Object *ov; 450 Evas_Object *ov = data;
512 double len; 451 double len;
513 double x, y; 452 double x, y;
514 453
515 ov = data;
516 edje_object_part_drag_value_get(o, source, &x, &y); 454 edje_object_part_drag_value_get(o, source, &x, &y);
517 len = emotion_object_play_length_get(ov); 455 len = emotion_object_play_length_get(ov);
518 emotion_object_position_set(ov, x * len); 456 emotion_object_position_set(ov, x * len);
519} 457}
520 458
521static void 459static void
522video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission, const char *source) 460video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
523{ 461{
524 Evas_Object *ov; 462 Evas_Object *ov = data;
525 double spd; 463 double spd;
526 double x, y; 464 double x, y;
527 char buf[256]; 465 char buf[256];
528 466
529 ov = data;
530 edje_object_part_drag_value_get(o, source, &x, &y); 467 edje_object_part_drag_value_get(o, source, &x, &y);
531 spd = 255 * y; 468 spd = 255 * y;
532 evas_object_color_set(ov, spd, spd, spd, spd); 469 evas_object_color_set(ov, spd, spd, spd, spd);
@@ -535,7 +472,7 @@ video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission, cons
535} 472}
536 473
537static void 474static void
538video_obj_signal_frame_move_start_cb(void *data, Evas_Object *o, const char *emission, const char *source) 475video_obj_signal_frame_move_start_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
539{ 476{
540 Frame_Data *fd; 477 Frame_Data *fd;
541 Evas_Coord x, y; 478 Evas_Coord x, y;
@@ -549,7 +486,7 @@ video_obj_signal_frame_move_start_cb(void *data, Evas_Object *o, const char *emi
549} 486}
550 487
551static void 488static void
552video_obj_signal_frame_move_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source) 489video_obj_signal_frame_move_stop_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
553{ 490{
554 Frame_Data *fd; 491 Frame_Data *fd;
555 492
@@ -558,7 +495,7 @@ video_obj_signal_frame_move_stop_cb(void *data, Evas_Object *o, const char *emis
558} 495}
559 496
560static void 497static void
561video_obj_signal_frame_resize_start_cb(void *data, Evas_Object *o, const char *emission, const char *source) 498video_obj_signal_frame_resize_start_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
562{ 499{
563 Frame_Data *fd; 500 Frame_Data *fd;
564 Evas_Coord x, y; 501 Evas_Coord x, y;
@@ -572,7 +509,7 @@ video_obj_signal_frame_resize_start_cb(void *data, Evas_Object *o, const char *e
572} 509}
573 510
574static void 511static void
575video_obj_signal_frame_resize_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source) 512video_obj_signal_frame_resize_stop_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
576{ 513{
577 Frame_Data *fd; 514 Frame_Data *fd;
578 515
@@ -581,7 +518,7 @@ video_obj_signal_frame_resize_stop_cb(void *data, Evas_Object *o, const char *em
581} 518}
582 519
583static void 520static void
584video_obj_signal_frame_move_cb(void *data, Evas_Object *o, const char *emission, const char *source) 521video_obj_signal_frame_move_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
585{ 522{
586 Frame_Data *fd; 523 Frame_Data *fd;
587 524
@@ -610,7 +547,7 @@ video_obj_signal_frame_move_cb(void *data, Evas_Object *o, const char *emission,
610 547
611 548
612static void 549static void
613init_video_object(char *module_filename, char *filename) 550init_video_object(const char *module_filename, const char *filename)
614{ 551{
615 Evas_Object *o, *oe; 552 Evas_Object *o, *oe;
616 int iw, ih; 553 int iw, ih;
@@ -687,8 +624,8 @@ init_video_object(char *module_filename, char *filename)
687 evas_object_show(oe); 624 evas_object_show(oe);
688} 625}
689 626
690static Eina_Bool 627static Eina_Bool
691enter_idle(void *data) 628enter_idle(void *data __UNUSED__)
692{ 629{
693 double t; 630 double t;
694 static double pt = 0.0; 631 static double pt = 0.0;
@@ -706,7 +643,7 @@ enter_idle(void *data)
706} 643}
707 644
708static Eina_Bool 645static Eina_Bool
709check_positions(void *data) 646check_positions(void *data __UNUSED__)
710{ 647{
711 const Eina_List *lst; 648 const Eina_List *lst;
712 Evas_Object *o; 649 Evas_Object *o;
diff --git a/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index aefde1298f..65ea4c7ed4 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -128,6 +128,7 @@ EAPI void _emotion_progress_set(Evas_Object *obj, char *info, double stat);
128EAPI void _emotion_file_ref_set(Evas_Object *obj, const char *file, int num); 128EAPI void _emotion_file_ref_set(Evas_Object *obj, const char *file, int num);
129EAPI void _emotion_spu_button_num_set(Evas_Object *obj, int num); 129EAPI void _emotion_spu_button_num_set(Evas_Object *obj, int num);
130EAPI void _emotion_spu_button_set(Evas_Object *obj, int button); 130EAPI void _emotion_spu_button_set(Evas_Object *obj, int button);
131EAPI void _emotion_seek_done(Evas_Object *obj);
131 132
132EAPI Eina_Bool _emotion_module_register(const char *name, Emotion_Module_Open open, Emotion_Module_Close close); 133EAPI Eina_Bool _emotion_module_register(const char *name, Emotion_Module_Open open, Emotion_Module_Close close);
133EAPI Eina_Bool _emotion_module_unregister(const char *name); 134EAPI Eina_Bool _emotion_module_unregister(const char *name);
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index ad649707e7..87f8929ee6 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -319,7 +319,7 @@ emotion_object_file_set(Evas_Object *obj, const char *file)
319{ 319{
320 Smart_Data *sd; 320 Smart_Data *sd;
321 321
322 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 322 E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, EINA_FALSE);
323 323
324 DBG("file=%s", file); 324 DBG("file=%s", file);
325 if (!sd->module) return EINA_FALSE; 325 if (!sd->module) return EINA_FALSE;
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index d4705689bd..5c414d5aa1 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -1280,7 +1280,7 @@ _free_metadata(Emotion_Gstreamer_Metadata *m)
1280} 1280}
1281 1281
1282static void 1282static void
1283_em_buffer_read(void *data, void *buf, unsigned int nbyte __UNUSED__) 1283_em_buffer_read(void *data, void *buf __UNUSED__, unsigned int nbyte __UNUSED__)
1284{ 1284{
1285 Emotion_Gstreamer_Video *ev; 1285 Emotion_Gstreamer_Video *ev;
1286 Emotion_Video_Stream *vstream; 1286 Emotion_Video_Stream *vstream;
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
index a5208cb261..be2a612676 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
@@ -118,12 +118,12 @@ _emotion_pipeline_build(Emotion_Gstreamer_Video *ev, const char *file)
118 gchar *str; 118 gchar *str;
119 Eina_Bool build_stream = EINA_FALSE; 119 Eina_Bool build_stream = EINA_FALSE;
120 120
121 gdouble length_time; 121 gdouble length_time = 0.0;
122 gint width; 122 gint width;
123 gint height; 123 gint height;
124 gint fps_num; 124 gint fps_num;
125 gint fps_den; 125 gint fps_den;
126 guint32 fourcc; 126 guint32 fourcc = 0;
127 127
128 g_signal_emit_by_name(ev->pipeline, "get-video-pad", i, &pad); 128 g_signal_emit_by_name(ev->pipeline, "get-video-pad", i, &pad);
129 if (!pad) 129 if (!pad)
@@ -198,7 +198,7 @@ _emotion_pipeline_build(Emotion_Gstreamer_Video *ev, const char *file)
198 GstQuery *query; 198 GstQuery *query;
199 Eina_Bool build_stream = EINA_FALSE; 199 Eina_Bool build_stream = EINA_FALSE;
200 200
201 gdouble length_time; 201 gdouble length_time = 0.0;
202 gint channels; 202 gint channels;
203 gint samplerate; 203 gint samplerate;
204 204
diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c
index 874270f621..d07f1b6aac 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine.c
@@ -1238,7 +1238,7 @@ _em_audio_only_poller(void *data)
1238} 1238}
1239 1239
1240static Eina_Bool 1240static Eina_Bool
1241_em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh) 1241_em_fd_ev_active(void *data __UNUSED__, Ecore_Fd_Handler *fdh)
1242{ 1242{
1243 int fd, len; 1243 int fd, len;
1244 void *buf[2]; 1244 void *buf[2];
diff --git a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
index 6ecb947bba..7358f8ce57 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
@@ -327,7 +327,7 @@ _emotion_frame_format_update(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint3
327 dv = (Emotion_Driver *)vo_driver; 327 dv = (Emotion_Driver *)vo_driver;
328 fr = (Emotion_Frame *)vo_frame; 328 fr = (Emotion_Frame *)vo_frame;
329 329
330 if ((fr->width != width) || (fr->height != height) || 330 if ((fr->width != (int)width) || (fr->height != (int)height) ||
331 (fr->format != format) || (!fr->vo_frame.base[0])) 331 (fr->format != format) || (!fr->vo_frame.base[0]))
332 { 332 {
333// DBG(""); 333// DBG("");