author | simon <simon> | 2002-12-05 23:28:06 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-05 23:28:06 (UTC) |
commit | 8a1c4b4b84d8a8de87bb6adb4df3f09961854633 (patch) (unidiff) | |
tree | 2399c784b4d5e87c8bb834389837870353b4a43f /noncore/multimedia | |
parent | 15d4d1f2fc8b37d30694acc5765a822718af6c13 (diff) | |
download | opie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.zip opie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.tar.gz opie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.tar.bz2 |
- adapted to xine CVS HEAD
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 62 |
2 files changed, 37 insertions, 32 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 96bdb21..4a96408 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -39,29 +39,30 @@ | |||
39 | 39 | ||
40 | #include <qfile.h> | 40 | #include <qfile.h> |
41 | 41 | ||
42 | #include <qgfx_qws.h> | 42 | #include <qgfx_qws.h> |
43 | #include <qdirectpainter_qws.h> | 43 | #include <qdirectpainter_qws.h> |
44 | 44 | ||
45 | #include <assert.h> | 45 | #include <assert.h> |
46 | 46 | ||
47 | #include "xinevideowidget.h" | 47 | #include "xinevideowidget.h" |
48 | #include "frame.h" | 48 | #include "frame.h" |
49 | #include "lib.h" | 49 | #include "lib.h" |
50 | 50 | ||
51 | |||
51 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 52 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
52 | int width, int height,int bytes ); | 53 | int width, int height,int bytes ); |
53 | 54 | ||
54 | extern "C" { | 55 | extern "C" { |
55 | xine_vo_driver_t* init_video_out_plugin( xine_cfg_entry_t* conf, void* video); | 56 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * ); |
56 | int null_is_showing_video( const xine_vo_driver_t* self ); | 57 | int null_is_showing_video( const xine_vo_driver_t* self ); |
57 | void null_set_show_video( const xine_vo_driver_t* self, int show ); | 58 | void null_set_show_video( const xine_vo_driver_t* self, int show ); |
58 | int null_is_fullscreen( const xine_vo_driver_t* self ); | 59 | int null_is_fullscreen( const xine_vo_driver_t* self ); |
59 | void null_set_fullscreen( const xine_vo_driver_t* self, int screen ); | 60 | void null_set_fullscreen( const xine_vo_driver_t* self, int screen ); |
60 | int null_is_scaling( const xine_vo_driver_t* self ); | 61 | int null_is_scaling( const xine_vo_driver_t* self ); |
61 | void null_set_scaling( const xine_vo_driver_t* self, int scale ); | 62 | void null_set_scaling( const xine_vo_driver_t* self, int scale ); |
62 | void null_set_gui_width( const xine_vo_driver_t* self, int width ); | 63 | void null_set_gui_width( const xine_vo_driver_t* self, int width ); |
63 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); | 64 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); |
64 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); | 65 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); |
65 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); | 66 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); |
66 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); | 67 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); |
67 | } | 68 | } |
@@ -85,31 +86,31 @@ Lib::Lib( XineVideoWidget* widget ) { | |||
85 | f.close(); | 86 | f.close(); |
86 | } | 87 | } |
87 | 88 | ||
88 | m_xine = xine_new( ); | 89 | m_xine = xine_new( ); |
89 | 90 | ||
90 | xine_config_load( m_xine, str.data() ); | 91 | xine_config_load( m_xine, str.data() ); |
91 | 92 | ||
92 | xine_init( m_xine ); | 93 | xine_init( m_xine ); |
93 | 94 | ||
94 | // allocate oss for sound | 95 | // allocate oss for sound |
95 | // and fb for framebuffer | 96 | // and fb for framebuffer |
96 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); | 97 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); |
97 | m_videoOutput = ::init_video_out_plugin( m_config, NULL ); | 98 | m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); |
98 | 99 | ||
99 | 100 | ||
100 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); | 101 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); |
101 | 102 | ||
102 | 103 | ||
103 | null_display_handler( m_videoOutput, xine_display_frame, this ); | 104 | // null_display_handler( m_videoOutput, xine_display_frame, this ); |
104 | 105 | ||
105 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); | 106 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); |
106 | 107 | ||
107 | if (m_wid != 0 ) { | 108 | if (m_wid != 0 ) { |
108 | printf( "!0\n" ); | 109 | printf( "!0\n" ); |
109 | resize ( m_wid-> size ( ) ); | 110 | resize ( m_wid-> size ( ) ); |
110 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); | 111 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); |
111 | 112 | ||
112 | m_wid->repaint(); | 113 | m_wid->repaint(); |
113 | } | 114 | } |
114 | 115 | ||
115 | m_queue = xine_event_new_queue (m_stream); | 116 | m_queue = xine_event_new_queue (m_stream); |
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 9c285a0..1ebb854 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -50,25 +50,25 @@ | |||
50 | 50 | ||
51 | /* | 51 | /* |
52 | #define LOG | 52 | #define LOG |
53 | */ | 53 | */ |
54 | 54 | ||
55 | /* the caller for our event draw handler */ | 55 | /* the caller for our event draw handler */ |
56 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 56 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
57 | int width, int height,int bytes ); | 57 | int width, int height,int bytes ); |
58 | 58 | ||
59 | typedef struct null_driver_s null_driver_t; | 59 | typedef struct null_driver_s null_driver_t; |
60 | 60 | ||
61 | struct null_driver_s { | 61 | struct null_driver_s { |
62 | xine_vo_driver_t vo_driver; | 62 | vo_driver_t vo_driver; |
63 | 63 | ||
64 | uint32_t m_capabilities; | 64 | uint32_t m_capabilities; |
65 | int m_show_video; | 65 | int m_show_video; |
66 | int m_video_fullscreen; | 66 | int m_video_fullscreen; |
67 | int m_is_scaling; | 67 | int m_is_scaling; |
68 | 68 | ||
69 | int depth, bpp, bytes_per_pixel; | 69 | int depth, bpp, bytes_per_pixel; |
70 | int yuv2rgb_mode; | 70 | int yuv2rgb_mode; |
71 | int yuv2rgb_swap; | 71 | int yuv2rgb_swap; |
72 | int yuv2rgb_gamma; | 72 | int yuv2rgb_gamma; |
73 | uint8_t *yuv2rgb_cmap; | 73 | uint8_t *yuv2rgb_cmap; |
74 | yuv2rgb_factory_t *yuv2rgb_factory; | 74 | yuv2rgb_factory_t *yuv2rgb_factory; |
@@ -98,25 +98,25 @@ struct opie_frame_s { | |||
98 | 98 | ||
99 | uint8_t *data; /* rgb */ | 99 | uint8_t *data; /* rgb */ |
100 | int bytes_per_line; | 100 | int bytes_per_line; |
101 | 101 | ||
102 | yuv2rgb_t *yuv2rgb; | 102 | yuv2rgb_t *yuv2rgb; |
103 | uint8_t *rgb_dst; | 103 | uint8_t *rgb_dst; |
104 | int yuv_stride; | 104 | int yuv_stride; |
105 | int stripe_height, stripe_inc; | 105 | int stripe_height, stripe_inc; |
106 | 106 | ||
107 | null_driver_t *output; | 107 | null_driver_t *output; |
108 | }; | 108 | }; |
109 | 109 | ||
110 | static uint32_t null_get_capabilities( xine_vo_driver_t *self ){ | 110 | static uint32_t null_get_capabilities( vo_driver_t *self ){ |
111 | null_driver_t* this = (null_driver_t*)self; | 111 | null_driver_t* this = (null_driver_t*)self; |
112 | return this->m_capabilities; | 112 | return this->m_capabilities; |
113 | } | 113 | } |
114 | 114 | ||
115 | static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { | 115 | static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { |
116 | opie_frame_t *frame = (opie_frame_t *) vo_img ; | 116 | opie_frame_t *frame = (opie_frame_t *) vo_img ; |
117 | 117 | ||
118 | if (!frame->output->m_show_video) { | 118 | if (!frame->output->m_show_video) { |
119 | /* printf("nullvideo: no video\n"); */ | 119 | /* printf("nullvideo: no video\n"); */ |
120 | return; | 120 | return; |
121 | } | 121 | } |
122 | 122 | ||
@@ -154,25 +154,25 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { | |||
154 | 154 | ||
155 | /* take care of the frame*/ | 155 | /* take care of the frame*/ |
156 | static void null_frame_dispose( vo_frame_t* vo_img){ | 156 | static void null_frame_dispose( vo_frame_t* vo_img){ |
157 | opie_frame_t* frame = (opie_frame_t*)vo_img; | 157 | opie_frame_t* frame = (opie_frame_t*)vo_img; |
158 | 158 | ||
159 | if (frame->data) | 159 | if (frame->data) |
160 | free( frame->data ); | 160 | free( frame->data ); |
161 | free (frame); | 161 | free (frame); |
162 | } | 162 | } |
163 | 163 | ||
164 | /* end take care of frames*/ | 164 | /* end take care of frames*/ |
165 | 165 | ||
166 | static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){ | 166 | static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ |
167 | 167 | ||
168 | null_driver_t* this = (null_driver_t*)self; | 168 | null_driver_t* this = (null_driver_t*)self; |
169 | opie_frame_t* frame; | 169 | opie_frame_t* frame; |
170 | 170 | ||
171 | #ifdef LOG | 171 | #ifdef LOG |
172 | fprintf (stderr, "nullvideo: alloc_frame\n"); | 172 | fprintf (stderr, "nullvideo: alloc_frame\n"); |
173 | #endif | 173 | #endif |
174 | 174 | ||
175 | frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); | 175 | frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); |
176 | 176 | ||
177 | memset( frame, 0, sizeof( opie_frame_t) ); | 177 | memset( frame, 0, sizeof( opie_frame_t) ); |
178 | memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t)); | 178 | memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t)); |
@@ -186,25 +186,25 @@ static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){ | |||
186 | frame->frame.copy = null_frame_copy; | 186 | frame->frame.copy = null_frame_copy; |
187 | frame->frame.field = null_frame_field; | 187 | frame->frame.field = null_frame_field; |
188 | frame->frame.dispose = null_frame_dispose; | 188 | frame->frame.dispose = null_frame_dispose; |
189 | 189 | ||
190 | /* | 190 | /* |
191 | * colorspace converter for this frame | 191 | * colorspace converter for this frame |
192 | */ | 192 | */ |
193 | frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory); | 193 | frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory); |
194 | 194 | ||
195 | return (vo_frame_t*) frame; | 195 | return (vo_frame_t*) frame; |
196 | } | 196 | } |
197 | 197 | ||
198 | static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | 198 | static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, |
199 | uint32_t width, uint32_t height, | 199 | uint32_t width, uint32_t height, |
200 | int ratio_code, int format, int flags ){ | 200 | int ratio_code, int format, int flags ){ |
201 | null_driver_t* this = (null_driver_t*) self; | 201 | null_driver_t* this = (null_driver_t*) self; |
202 | opie_frame_t* frame = (opie_frame_t*)img; | 202 | opie_frame_t* frame = (opie_frame_t*)img; |
203 | /* not needed now */ | 203 | /* not needed now */ |
204 | 204 | ||
205 | #ifdef LOG | 205 | #ifdef LOG |
206 | fprintf (stderr, "nullvideo: update_frame_format\n"); | 206 | fprintf (stderr, "nullvideo: update_frame_format\n"); |
207 | #endif | 207 | #endif |
208 | 208 | ||
209 | flags &= VO_BOTH_FIELDS; | 209 | flags &= VO_BOTH_FIELDS; |
210 | 210 | ||
@@ -329,25 +329,25 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
329 | case VO_BOTTOM_FIELD: | 329 | case VO_BOTTOM_FIELD: |
330 | frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ; | 330 | frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ; |
331 | frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line; | 331 | frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line; |
332 | break; | 332 | break; |
333 | case VO_BOTH_FIELDS: | 333 | case VO_BOTH_FIELDS: |
334 | frame->rgb_dst = (uint8_t *)frame->data; | 334 | frame->rgb_dst = (uint8_t *)frame->data; |
335 | frame->stripe_inc = frame->stripe_height * frame->bytes_per_line; | 335 | frame->stripe_inc = frame->stripe_height * frame->bytes_per_line; |
336 | break; | 336 | break; |
337 | } | 337 | } |
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
341 | static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){ | 341 | static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ |
342 | null_driver_t* this = (null_driver_t*) self; | 342 | null_driver_t* this = (null_driver_t*) self; |
343 | opie_frame_t* frame = (opie_frame_t*)frame_gen; | 343 | opie_frame_t* frame = (opie_frame_t*)frame_gen; |
344 | display_xine_frame_t display = this->frameDis; | 344 | display_xine_frame_t display = this->frameDis; |
345 | 345 | ||
346 | if (!this->m_show_video) | 346 | if (!this->m_show_video) |
347 | return; | 347 | return; |
348 | 348 | ||
349 | if( display != NULL ) { | 349 | if( display != NULL ) { |
350 | (*display)(this->caller, frame->data, | 350 | (*display)(this->caller, frame->data, |
351 | frame->sc.output_width, frame->sc.output_height, | 351 | frame->sc.output_width, frame->sc.output_height, |
352 | frame->bytes_per_line ); | 352 | frame->bytes_per_line ); |
353 | } | 353 | } |
@@ -372,25 +372,25 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, | |||
372 | } | 372 | } |
373 | if (!overlay->clip_rgb_clut) { | 373 | if (!overlay->clip_rgb_clut) { |
374 | clut = (clut_t*) overlay->clip_color; | 374 | clut = (clut_t*) overlay->clip_color; |
375 | for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { | 375 | for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { |
376 | *((uint32_t *)&clut[i]) = | 376 | *((uint32_t *)&clut[i]) = |
377 | frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb, | 377 | frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb, |
378 | clut[i].y, clut[i].cb, clut[i].cr); | 378 | clut[i].y, clut[i].cb, clut[i].cr); |
379 | } | 379 | } |
380 | overlay->clip_rgb_clut++; | 380 | overlay->clip_rgb_clut++; |
381 | } | 381 | } |
382 | } | 382 | } |
383 | 383 | ||
384 | static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { | 384 | static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { |
385 | null_driver_t *this = (null_driver_t *) this_gen; | 385 | null_driver_t *this = (null_driver_t *) this_gen; |
386 | opie_frame_t *frame = (opie_frame_t *) frame_gen; | 386 | opie_frame_t *frame = (opie_frame_t *) frame_gen; |
387 | 387 | ||
388 | if(!this->m_show_video || frame->sc.output_width == 0 | 388 | if(!this->m_show_video || frame->sc.output_width == 0 |
389 | || frame->sc.output_height== 0) | 389 | || frame->sc.output_height== 0) |
390 | return; | 390 | return; |
391 | 391 | ||
392 | /* Alpha Blend here */ | 392 | /* Alpha Blend here */ |
393 | if (overlay->rle) { | 393 | if (overlay->rle) { |
394 | if( !overlay->rgb_clut || !overlay->clip_rgb_clut) | 394 | if( !overlay->rgb_clut || !overlay->clip_rgb_clut) |
395 | null_overlay_clut_yuv2rgb(this,overlay,frame); | 395 | null_overlay_clut_yuv2rgb(this,overlay,frame); |
396 | 396 | ||
@@ -409,63 +409,63 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g | |||
409 | blend_rgb32( (uint8_t *)frame->data, overlay, | 409 | blend_rgb32( (uint8_t *)frame->data, overlay, |
410 | frame->sc.output_width, frame->sc.output_height, | 410 | frame->sc.output_width, frame->sc.output_height, |
411 | frame->sc.delivered_width, frame->sc.delivered_height); | 411 | frame->sc.delivered_width, frame->sc.delivered_height); |
412 | break; | 412 | break; |
413 | default: | 413 | default: |
414 | /* It should never get here */ | 414 | /* It should never get here */ |
415 | break; | 415 | break; |
416 | } | 416 | } |
417 | } | 417 | } |
418 | } | 418 | } |
419 | 419 | ||
420 | 420 | ||
421 | static int null_get_property( xine_vo_driver_t* self, | 421 | static int null_get_property( vo_driver_t* self, |
422 | int property ){ | 422 | int property ){ |
423 | return 0; | 423 | return 0; |
424 | } | 424 | } |
425 | static int null_set_property( xine_vo_driver_t* self, | 425 | static int null_set_property( vo_driver_t* self, |
426 | int property, | 426 | int property, |
427 | int value ){ | 427 | int value ){ |
428 | return value; | 428 | return value; |
429 | } | 429 | } |
430 | static void null_get_property_min_max( xine_vo_driver_t* self, | 430 | static void null_get_property_min_max( vo_driver_t* self, |
431 | int property, int *min, | 431 | int property, int *min, |
432 | int *max ){ | 432 | int *max ){ |
433 | *max = 0; | 433 | *max = 0; |
434 | *min = 0; | 434 | *min = 0; |
435 | } | 435 | } |
436 | static int null_gui_data_exchange( xine_vo_driver_t* self, | 436 | static int null_gui_data_exchange( vo_driver_t* self, |
437 | int data_type, | 437 | int data_type, |
438 | void *data ){ | 438 | void *data ){ |
439 | return 0; | 439 | return 0; |
440 | } | 440 | } |
441 | 441 | ||
442 | static void null_dispose ( xine_vo_driver_t* self ){ | 442 | static void null_dispose ( vo_driver_t* self ){ |
443 | null_driver_t* this = (null_driver_t*)self; | 443 | null_driver_t* this = (null_driver_t*)self; |
444 | free ( this ); | 444 | free ( this ); |
445 | } | 445 | } |
446 | static int null_redraw_needed( xine_vo_driver_t* self ){ | 446 | static int null_redraw_needed( vo_driver_t* self ){ |
447 | return 0; | 447 | return 0; |
448 | } | 448 | } |
449 | 449 | ||
450 | 450 | ||
451 | xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | 451 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, |
452 | void* video ){ | 452 | void* video, display_xine_frame_t frameDisplayFunc, void *userData ){ |
453 | null_driver_t *vo; | 453 | null_driver_t *vo; |
454 | vo = (null_driver_t*)malloc( sizeof(null_driver_t ) ); | 454 | vo = (null_driver_t*)malloc( sizeof(null_driver_t ) ); |
455 | 455 | ||
456 | /* memset? */ | 456 | /* memset? */ |
457 | memset(vo,0, sizeof(null_driver_t ) ); | 457 | memset(vo,0, sizeof(null_driver_t ) ); |
458 | 458 | ||
459 | vo_scale_init (&vo->sc, 0, 0); | 459 | vo_scale_init (&vo->sc, 0, 0, xine->config); |
460 | 460 | ||
461 | vo->sc.gui_pixel_aspect = 1.0; | 461 | vo->sc.gui_pixel_aspect = 1.0; |
462 | 462 | ||
463 | vo->m_show_video = 0; // false | 463 | vo->m_show_video = 0; // false |
464 | vo->m_video_fullscreen = 0; | 464 | vo->m_video_fullscreen = 0; |
465 | vo->m_is_scaling = 0; | 465 | vo->m_is_scaling = 0; |
466 | vo->display_ratio = 1.0; | 466 | vo->display_ratio = 1.0; |
467 | vo->gui_width = 16; | 467 | vo->gui_width = 16; |
468 | vo->gui_height = 8; | 468 | vo->gui_height = 8; |
469 | vo->frameDis = NULL; | 469 | vo->frameDis = NULL; |
470 | 470 | ||
471 | /* install callback handlers*/ | 471 | /* install callback handlers*/ |
@@ -478,85 +478,89 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
478 | vo->vo_driver.set_property = null_set_property; | 478 | vo->vo_driver.set_property = null_set_property; |
479 | vo->vo_driver.get_property_min_max = null_get_property_min_max; | 479 | vo->vo_driver.get_property_min_max = null_get_property_min_max; |
480 | vo->vo_driver.gui_data_exchange = null_gui_data_exchange; | 480 | vo->vo_driver.gui_data_exchange = null_gui_data_exchange; |
481 | vo->vo_driver.dispose = null_dispose; | 481 | vo->vo_driver.dispose = null_dispose; |
482 | vo->vo_driver.redraw_needed = null_redraw_needed; | 482 | vo->vo_driver.redraw_needed = null_redraw_needed; |
483 | 483 | ||
484 | 484 | ||
485 | /* capabilities */ | 485 | /* capabilities */ |
486 | vo->m_capabilities = VO_CAP_COPIES_IMAGE | VO_CAP_YUY2 | VO_CAP_YV12; | 486 | vo->m_capabilities = VO_CAP_COPIES_IMAGE | VO_CAP_YUY2 | VO_CAP_YV12; |
487 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, | 487 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, |
488 | vo->yuv2rgb_cmap); | 488 | vo->yuv2rgb_cmap); |
489 | 489 | ||
490 | return ( xine_vo_driver_t*) vo; | 490 | vo->caller = userData; |
491 | vo->frameDis = frameDisplayFunc; | ||
492 | |||
493 | /* return ( vo_driver_t*) vo; */ | ||
494 | return vo_new_port( xine, ( vo_driver_t* )vo ); | ||
491 | } | 495 | } |
492 | 496 | ||
493 | #if 0 | 497 | #if 0 |
494 | static vo_info_t vo_info_null = { | 498 | static vo_info_t vo_info_null = { |
495 | 5, | 499 | 5, |
496 | XINE_VISUAL_TYPE_FB | 500 | XINE_VISUAL_TYPE_FB |
497 | }; | 501 | }; |
498 | 502 | ||
499 | vo_info_t *get_video_out_plugin_info(){ | 503 | vo_info_t *get_video_out_plugin_info(){ |
500 | vo_info_null.description = ("xine video output plugin using null device"); | 504 | vo_info_null.description = ("xine video output plugin using null device"); |
501 | return &vo_info_null; | 505 | return &vo_info_null; |
502 | } | 506 | } |
503 | 507 | ||
504 | #endif | 508 | #endif |
505 | 509 | ||
506 | /* this is special for this device */ | 510 | /* this is special for this device */ |
507 | /** | 511 | /** |
508 | * We know that we will be controled by the XINE LIB++ | 512 | * We know that we will be controled by the XINE LIB++ |
509 | */ | 513 | */ |
510 | 514 | ||
511 | /** | 515 | /** |
512 | * | 516 | * |
513 | */ | 517 | */ |
514 | int null_is_showing_video( xine_vo_driver_t* self ){ | 518 | int null_is_showing_video( xine_vo_driver_t* self ){ |
515 | null_driver_t* this = (null_driver_t*)self; | 519 | null_driver_t* this = (null_driver_t*)self->driver; |
516 | return this->m_show_video; | 520 | return this->m_show_video; |
517 | } | 521 | } |
518 | void null_set_show_video( xine_vo_driver_t* self, int show ) { | 522 | void null_set_show_video( xine_vo_driver_t* self, int show ) { |
519 | ((null_driver_t*)self)->m_show_video = show; | 523 | ((null_driver_t*)self->driver)->m_show_video = show; |
520 | } | 524 | } |
521 | 525 | ||
522 | int null_is_fullscreen( xine_vo_driver_t* self ){ | 526 | int null_is_fullscreen( xine_vo_driver_t* self ){ |
523 | return ((null_driver_t*)self)->m_video_fullscreen; | 527 | return ((null_driver_t*)self->driver)->m_video_fullscreen; |
524 | } | 528 | } |
525 | void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ | 529 | void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ |
526 | ((null_driver_t*)self)->m_video_fullscreen = screen; | 530 | ((null_driver_t*)self->driver)->m_video_fullscreen = screen; |
527 | } | 531 | } |
528 | int null_is_scaling( xine_vo_driver_t* self ){ | 532 | int null_is_scaling( xine_vo_driver_t* self ){ |
529 | return ((null_driver_t*)self)->m_is_scaling; | 533 | return ((null_driver_t*)self->driver)->m_is_scaling; |
530 | } | 534 | } |
531 | 535 | ||
532 | void null_set_videoGamma( xine_vo_driver_t* self , int value ) { | 536 | void null_set_videoGamma( xine_vo_driver_t* self , int value ) { |
533 | ((null_driver_t*) self) ->yuv2rgb_gamma = value; | 537 | ((null_driver_t*) self->driver) ->yuv2rgb_gamma = value; |
534 | ((null_driver_t*) self) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value ); | 538 | ((null_driver_t*) self->driver) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value ); |
535 | } | 539 | } |
536 | 540 | ||
537 | void null_set_scaling( xine_vo_driver_t* self, int scale ) { | 541 | void null_set_scaling( xine_vo_driver_t* self, int scale ) { |
538 | ((null_driver_t*)self)->m_is_scaling = scale; | 542 | ((null_driver_t*)self->driver)->m_is_scaling = scale; |
539 | } | 543 | } |
540 | 544 | ||
541 | void null_set_gui_width( xine_vo_driver_t* self, int width ) { | 545 | void null_set_gui_width( xine_vo_driver_t* self, int width ) { |
542 | ((null_driver_t*)self)->gui_width = width; | 546 | ((null_driver_t*)self->driver)->gui_width = width; |
543 | } | 547 | } |
544 | void null_set_gui_height( xine_vo_driver_t* self, int height ) { | 548 | void null_set_gui_height( xine_vo_driver_t* self, int height ) { |
545 | ((null_driver_t*)self)->gui_height = height; | 549 | ((null_driver_t*)self->driver)->gui_height = height; |
546 | } | 550 | } |
547 | 551 | ||
548 | 552 | ||
549 | void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { | 553 | void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { |
550 | null_driver_t* this = (null_driver_t*)self; | 554 | null_driver_t* this = (null_driver_t*)self->driver; |
551 | 555 | ||
552 | this->bytes_per_pixel = (depth + 7 ) / 8; | 556 | this->bytes_per_pixel = (depth + 7 ) / 8; |
553 | this->bpp = this->bytes_per_pixel * 8; | 557 | this->bpp = this->bytes_per_pixel * 8; |
554 | this->depth = depth; | 558 | this->depth = depth; |
555 | printf("depth %d %d\n", depth, this->bpp); | 559 | printf("depth %d %d\n", depth, this->bpp); |
556 | printf("pixeltype %d\n", rgb ); | 560 | printf("pixeltype %d\n", rgb ); |
557 | switch ( this->depth ) { | 561 | switch ( this->depth ) { |
558 | case 32: | 562 | case 32: |
559 | if( rgb == 0 ) | 563 | if( rgb == 0 ) |
560 | this->yuv2rgb_mode = MODE_32_RGB; | 564 | this->yuv2rgb_mode = MODE_32_RGB; |
561 | else | 565 | else |
562 | this->yuv2rgb_mode = MODE_32_BGR; | 566 | this->yuv2rgb_mode = MODE_32_BGR; |
@@ -594,17 +598,17 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { | |||
594 | } else { | 598 | } else { |
595 | this->yuv2rgb_mode = MODE_8_BGR; | 599 | this->yuv2rgb_mode = MODE_8_BGR; |
596 | } | 600 | } |
597 | break; | 601 | break; |
598 | }; | 602 | }; |
599 | //free(this->yuv2rgb_factory ); | 603 | //free(this->yuv2rgb_factory ); |
600 | // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, | 604 | // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, |
601 | // this->yuv2rgb_cmap); | 605 | // this->yuv2rgb_cmap); |
602 | }; | 606 | }; |
603 | 607 | ||
604 | void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, | 608 | void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, |
605 | void* user_data ) { | 609 | void* user_data ) { |
606 | null_driver_t* this = (null_driver_t*) self; | 610 | null_driver_t* this = (null_driver_t*) self->driver; |
607 | this->caller = user_data; | 611 | this->caller = user_data; |
608 | this->frameDis = t; | 612 | this->frameDis = t; |
609 | } | 613 | } |
610 | 614 | ||