Diffstat (limited to 'noncore/multimedia/opieplayer2/nullvideo.c') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 391 |
1 files changed, 143 insertions, 248 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index ceda333..dcdfae6 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c @@ -4,3 +4,3 @@ Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> - Copyright (c) 2002 L. Potter <ljp@llornkcor.com> + Copyright (c) 2002 LJP <> Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> @@ -21,3 +21,3 @@ _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU -..}^=.= = ; General Public License for more +..}^=.= = ; Library General Public License for more ++= -. .` .: details. @@ -25,3 +25,3 @@ -. .:....=;==+<; You should have received a copy of the GNU - -_. . . )=. = General Public License along with + -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. @@ -33,3 +33,2 @@ -/*#include <xine.h>*/ #include <stdlib.h> @@ -39,2 +38,3 @@ +#include <xine.h> #include <xine/video_out.h> @@ -42,3 +42,3 @@ #include <xine/xineutils.h> -#include <xine/configfile.h> +#include <xine/vo_scale.h> @@ -50,2 +50,6 @@ +/* +#define LOG +*/ + /* the caller for our event draw handler */ @@ -57,3 +61,4 @@ typedef struct null_driver_s null_driver_t; struct null_driver_s { - vo_driver_t vo_driver; + xine_vo_driver_t vo_driver; + uint32_t m_capabilities; @@ -62,2 +67,3 @@ struct null_driver_s { int m_is_scaling; + int depth, bpp, bytes_per_pixel; @@ -68,7 +74,6 @@ struct null_driver_s { yuv2rgb_factory_t *yuv2rgb_factory; + vo_overlay_t *overlay; - int user_ratio; - double output_scale_factor; - int last_frame_output_width; - int last_frame_output_height; + vo_scale_t sc; + int gui_width; @@ -76,2 +81,3 @@ struct null_driver_s { int gui_changed; + double display_ratio; @@ -79,5 +85,4 @@ struct null_driver_s { display_xine_frame_t frameDis; - - }; + typedef struct opie_frame_s opie_frame_t; @@ -85,18 +90,13 @@ struct opie_frame_s { vo_frame_t frame; - char* name; - int version; - int width; - int height; - int ratio_code; + int format; int flags; - int user_ratio; - double ratio_factor; - int ideal_width; - int ideal_height; - int output_width, output_height; - int gui_width, gui_height; + vo_scale_t sc; + uint8_t *chunk[3]; + uint8_t *data; /* rgb */ + int bytes_per_line; + yuv2rgb_t *yuv2rgb; @@ -106,6 +106,2 @@ struct opie_frame_s { - int bytes_per_line; - uint8_t *data; - -// int show_video; null_driver_t *output; @@ -113,5 +109,4 @@ struct opie_frame_s { -static uint32_t null_get_capabilities(vo_driver_t *self ){ +static uint32_t null_get_capabilities( xine_vo_driver_t *self ){ null_driver_t* this = (null_driver_t*)self; - printf("capabilities\n"); return this->m_capabilities; @@ -121,6 +116,9 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { opie_frame_t *frame = (opie_frame_t *) vo_img ; - printf("frame copy\n"); - if(!frame->output->m_show_video ){ printf("no video\n"); return; } // no video - if (frame->format == IMGFMT_YV12) { + if (!frame->output->m_show_video) { + /* printf("nullvideo: no video\n"); */ + return; + } + + if (frame->format == XINE_IMGFMT_YV12) { frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst, @@ -134,3 +132,2 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { frame->rgb_dst += frame->stripe_inc; - printf("returning\n"); } @@ -140,3 +137,2 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { opie_frame_t *frame = (opie_frame_t *) vo_img ; - printf("field\n\n"); @@ -161,3 +157,3 @@ static void null_frame_dispose( vo_frame_t* vo_img){ opie_frame_t* frame = (opie_frame_t*)vo_img; - printf("frame_dispose\n"); + if( frame->data ) @@ -169,5 +165,11 @@ static void null_frame_dispose( vo_frame_t* vo_img){ -static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ +static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){ + null_driver_t* this = (null_driver_t*)self; opie_frame_t* frame; + +#ifdef LOG + fprintf (stderr, "nullvideo: alloc_frame\n"); +#endif + frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); @@ -175,12 +177,10 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ memset( frame, 0, sizeof( opie_frame_t) ); + memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t)); + pthread_mutex_init (&frame->frame.mutex, NULL); - printf("alloc_frame\n"); - frame->name = "opie\0"; - frame->version = 1; frame->output = this; -// frame->show_video = this->m_show_video; + /* initialize the frame*/ frame->frame.driver = self; - /*frame.frame.free = null_frame_free;*/ frame->frame.copy = null_frame_copy; @@ -188,3 +188,3 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ frame->frame.dispose = null_frame_dispose; - frame->yuv2rgb = 0; + /* @@ -194,3 +194,2 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ - return (vo_frame_t*) frame; @@ -198,115 +197,3 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ -// size specific -static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) { - - if (!this->m_is_scaling /*|| !this->m_show_video*/) { - printf("Not scaling\n"); - frame->ideal_width = frame->width; - frame->ideal_height = frame->height; - frame->ratio_factor = 1.0; - - } else { - - double image_ratio, desired_ratio, corr_factor; - - image_ratio = (double) frame->width / (double) frame->height; - - switch (frame->user_ratio) { - case ASPECT_AUTO: - switch (frame->ratio_code) { - case XINE_ASPECT_RATIO_ANAMORPHIC: /* anamorphic */ - case XINE_ASPECT_RATIO_PAN_SCAN: - desired_ratio = 16.0 /9.0; - break; - case XINE_ASPECT_RATIO_211_1: /* 2.11:1 */ - desired_ratio = 2.11/1.0; - break; - case XINE_ASPECT_RATIO_SQUARE: /* square pels */ - case XINE_ASPECT_RATIO_DONT_TOUCH: /* probably non-mpeg stream => don't touch aspect ratio */ - desired_ratio = image_ratio; - break; - case 0: /* forbidden -> 4:3 */ - printf ("video_out_fb: invalid ratio, using 4:3\n"); - default: - printf ("video_out_fb: unknown aspect ratio (%d) in stream => using 4:3\n", - frame->ratio_code); - case XINE_ASPECT_RATIO_4_3: /* 4:3 */ - desired_ratio = 4.0 / 3.0; - break; - } - break; - case ASPECT_ANAMORPHIC: - desired_ratio = 16.0 / 9.0; - break; - case ASPECT_DVB: - desired_ratio = 2.0 / 1.0; - break; - case ASPECT_SQUARE: - desired_ratio = image_ratio; - break; - case ASPECT_FULL: - default: - desired_ratio = 4.0 / 3.0; - } - - frame->ratio_factor = this->display_ratio * desired_ratio; - - corr_factor = frame->ratio_factor / image_ratio ; - - if (fabs(corr_factor - 1.0) < 0.005) { - frame->ideal_width = frame->width; - frame->ideal_height = frame->height; - - } else { - - if (corr_factor >= 1.0) { - frame->ideal_width = frame->width * corr_factor + 0.5; - frame->ideal_height = frame->height; - } else { - frame->ideal_width = frame->width; - frame->ideal_height = frame->height / corr_factor + 0.5; - } - - } - } - printf("return from helper\n"); -} - -static void null_compute_rgb_size (null_driver_t *this, opie_frame_t *frame) { - - double x_factor, y_factor; - - /* - * make the frame fit into the given destination area - */ - - x_factor = (double) this->gui_width / (double) frame->ideal_width; - y_factor = (double) this->gui_height / (double) frame->ideal_height; - - if ( x_factor < y_factor ) { - frame->output_width = (double) frame->ideal_width * x_factor ; - frame->output_height = (double) frame->ideal_height * x_factor ; - } else { - frame->output_width = (double) frame->ideal_width * y_factor ; - frame->output_height = (double) frame->ideal_height * y_factor ; - } - -#define LOG 1 -#ifdef LOG - printf("video_out_fb: frame source %d x %d => screen output %d x %d%s\n", - frame->width, frame->height, - frame->output_width, frame->output_height, - ( frame->width != frame->output_width - || frame->height != frame->output_height - ? ", software scaling" - : "" ) - ); -#endif -} - - -// size specific - - -static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, +static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, uint32_t width, uint32_t height, @@ -316,4 +203,6 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, /* not needed now */ - printf("update_frame_format\n"); - printf("al crash aye?\n"); + +#ifdef LOG + fprintf (stderr, "nullvideo: update_frame_format\n"); +#endif @@ -323,24 +212,30 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, - if ((width != frame->width) - || (height != frame->height) - || (ratio_code != frame->ratio_code) + if ((width != frame->sc.delivered_width) + || (height != frame->sc.delivered_height) + || (ratio_code != frame->sc.delivered_ratio_code) || (flags != frame->flags) || (format != frame->format) - || (this->user_ratio != frame->user_ratio) - || (this->gui_width != frame-> gui_width ) - || (this-> gui_height != frame-> gui_height)) { + || (this->sc.user_ratio != frame->sc.user_ratio) + || (this->gui_width != frame->sc.gui_width) + || (this->gui_height != frame->sc.gui_height)) { - frame->width = width; - frame->height = height; - frame->ratio_code = ratio_code; + frame->sc.delivered_width = width; + frame->sc.delivered_height = height; + frame->sc.delivered_ratio_code = ratio_code; frame->flags = flags; frame->format = format; - frame->user_ratio = this->user_ratio; - this->gui_changed = 0; -// frame->show_video = this->m_show_video; - frame->gui_width = this->gui_width; - frame->gui_height = this->gui_height; + frame->sc.user_ratio = this->sc.user_ratio; + frame->sc.gui_width = this->gui_width; + frame->sc.gui_height = this->gui_height; + frame->sc.gui_pixel_aspect = 1.0; + + vo_scale_compute_ideal_size ( &frame->sc ); + vo_scale_compute_output_size( &frame->sc ); - null_compute_ideal_size (this, frame); - null_compute_rgb_size (this, frame); +#ifdef LOG + fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n", + frame->sc.gui_width, frame->sc.gui_height, + frame->sc.delivered_width, frame->sc.delivered_height, + frame->sc.output_width, frame->sc.output_height); +#endif @@ -364,7 +259,8 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, } - printf("after freeing\n"); - frame->data = xine_xmalloc (frame->output_width * frame->output_height * - this->bytes_per_pixel ); - if( format == IMGFMT_YV12 ) { + frame->data = xine_xmalloc (frame->sc.output_width + * frame->sc.output_height + * this->bytes_per_pixel ); + + if( format == XINE_IMGFMT_YV12 ) { frame->frame.pitches[0] = 8*((width + 7) / 8); @@ -385,8 +281,4 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, - frame->format = format; - frame->width = width; - frame->height = height; - - frame->stripe_height = 16 * frame->output_height / frame->height; - frame->bytes_per_line = frame->output_width * this->bytes_per_pixel; + frame->stripe_height = 16 * frame->sc.output_height / frame->sc.delivered_height; + frame->bytes_per_line = frame->sc.output_width * this->bytes_per_pixel; @@ -395,4 +287,2 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, */ - if(1 /*this->m_show_video*/ ){ - printf("showing video\n"); @@ -402,3 +292,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->yuv2rgb->configure (frame->yuv2rgb, - frame->width, + frame->sc.delivered_width, 16, @@ -406,3 +296,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, 2*frame->frame.pitches[1], - frame->output_width, + frame->sc.output_width, frame->stripe_height, @@ -413,3 +303,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->yuv2rgb->configure (frame->yuv2rgb, - frame->width, + frame->sc.delivered_width, 16, @@ -417,3 +307,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->frame.pitches[1], - frame->output_width, + frame->sc.output_width, frame->stripe_height, @@ -423,5 +313,7 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, } +#ifdef LOG + fprintf (stderr, "nullvideo: colorspace converter configured.\n"); +#endif } - } - printf("after gui changed\n"); + /* @@ -446,5 +338,5 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, } - printf("done\n"); } -static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ + +static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){ null_driver_t* this = (null_driver_t*) self; @@ -453,12 +345,10 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ - printf("display frame\n"); -// if( this->m_show_video ) { // return if not displaying - printf("calling home aye\n" ); + if (!this->m_show_video) + return; + if( display != NULL ) { (*display)(this->caller, frame->data, - frame->output_width, frame->output_height, + frame->sc.output_width, frame->sc.output_height, frame->bytes_per_line ); - printf("display done hope you enyoyed the frame"); } -// } @@ -468,6 +358,5 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ -// blending related - - -static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overlay, +/* blending related */ +static void null_overlay_clut_yuv2rgb (null_driver_t *this, + vo_overlay_t *overlay, opie_frame_t *frame) { @@ -494,3 +383,3 @@ static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overla -static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { null_driver_t *this = (null_driver_t *) this_gen; @@ -498,4 +387,4 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo - printf("overlay blend\n"); - if(!this->m_show_video || frame->output_width == 0 || frame->output_height== 0) + if(!this->m_show_video || frame->sc.output_width == 0 + || frame->sc.output_height== 0) return; @@ -510,4 +399,4 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo blend_rgb16( (uint8_t *)frame->data, overlay, - frame->output_width, frame->output_height, - frame->width, frame->height); + frame->sc.output_width, frame->sc.output_height, + frame->sc.delivered_width, frame->sc.delivered_height); break; @@ -515,4 +404,4 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo blend_rgb24( (uint8_t *)frame->data, overlay, - frame->output_width, frame->output_height, - frame->width, frame->height); + frame->sc.output_width, frame->sc.output_height, + frame->sc.delivered_width, frame->sc.delivered_height); break; @@ -520,4 +409,4 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo blend_rgb32( (uint8_t *)frame->data, overlay, - frame->output_width, frame->output_height, - frame->width, frame->height); + frame->sc.output_width, frame->sc.output_height, + frame->sc.delivered_width, frame->sc.delivered_height); break; @@ -531,17 +420,14 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo -static int null_get_property( vo_driver_t* self, +static int null_get_property( xine_vo_driver_t* self, int property ){ - printf("property get\n"); return 0; } -static int null_set_property( vo_driver_t* self, +static int null_set_property( xine_vo_driver_t* self, int property, int value ){ - printf("set property\n"); return value; } -static void null_get_property_min_max( vo_driver_t* self, +static void null_get_property_min_max( xine_vo_driver_t* self, int property, int *min, int *max ){ - printf("min max\n"); *max = 0; @@ -549,3 +435,3 @@ static void null_get_property_min_max( vo_driver_t* self, } -static int null_gui_data_exchange( vo_driver_t* self, +static int null_gui_data_exchange( xine_vo_driver_t* self, int data_type, @@ -554,3 +440,4 @@ static int null_gui_data_exchange( vo_driver_t* self, } -static void null_exit( vo_driver_t* self ){ + +static void null_exit( xine_vo_driver_t* self ){ null_driver_t* this = (null_driver_t*)self; @@ -558,3 +445,3 @@ static void null_exit( vo_driver_t* self ){ } -static int null_redraw_needed( vo_driver_t* self ){ +static int null_redraw_needed( xine_vo_driver_t* self ){ return 0; @@ -563,3 +450,3 @@ static int null_redraw_needed( vo_driver_t* self ){ -vo_driver_t* init_video_out_plugin( config_values_t* conf, +xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video ){ @@ -570,2 +457,7 @@ vo_driver_t* init_video_out_plugin( config_values_t* conf, memset(vo,0, sizeof(null_driver_t ) ); + + vo_scale_init (&vo->sc, 0, 0); + + vo->sc.gui_pixel_aspect = 1.0; + vo->m_show_video = 0; // false @@ -573,3 +465,2 @@ vo_driver_t* init_video_out_plugin( config_values_t* conf, vo->m_is_scaling = 0; - vo->user_ratio = ASPECT_AUTO; vo->display_ratio = 1.0; @@ -597,4 +488,4 @@ vo_driver_t* init_video_out_plugin( config_values_t* conf, vo->yuv2rgb_cmap); - printf("done initialisation\n"); - return (vo_driver_t*) vo; + + return ( xine_vo_driver_t*) vo; } @@ -604,5 +495,3 @@ static vo_info_t vo_info_null = { "null plugin", - NULL, - VISUAL_TYPE_FB, - 5 + XINE_VISUAL_TYPE_FB }; @@ -622,3 +511,3 @@ vo_info_t *get_video_out_plugin_info(){ */ -int null_is_showing_video( vo_driver_t* self ){ +int null_is_showing_video( xine_vo_driver_t* self ){ null_driver_t* this = (null_driver_t*)self; @@ -626,3 +515,3 @@ int null_is_showing_video( vo_driver_t* self ){ } -void null_set_show_video( vo_driver_t* self, int show ) { +void null_set_show_video( xine_vo_driver_t* self, int show ) { ((null_driver_t*)self)->m_show_video = show; @@ -630,9 +519,9 @@ void null_set_show_video( vo_driver_t* self, int show ) { -int null_is_fullscreen( vo_driver_t* self ){ +int null_is_fullscreen( xine_vo_driver_t* self ){ return ((null_driver_t*)self)->m_video_fullscreen; } -void null_set_fullscreen( vo_driver_t* self, int screen ){ +void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ ((null_driver_t*)self)->m_video_fullscreen = screen; } -int null_is_scaling( vo_driver_t* self ){ +int null_is_scaling( xine_vo_driver_t* self ){ return ((null_driver_t*)self)->m_is_scaling; @@ -640,3 +529,3 @@ int null_is_scaling( vo_driver_t* self ){ -void null_set_videoGamma( vo_driver_t* self , int value ) { +void null_set_videoGamma( xine_vo_driver_t* self , int value ) { ((null_driver_t*) self) ->yuv2rgb_gamma = value; @@ -645,3 +534,3 @@ void null_set_videoGamma( vo_driver_t* self , int value ) { -void null_set_scaling( vo_driver_t* self, int scale ){ +void null_set_scaling( xine_vo_driver_t* self, int scale ) { ((null_driver_t*)self)->m_is_scaling = scale; @@ -649,6 +538,6 @@ void null_set_scaling( vo_driver_t* self, int scale ){ -void null_set_gui_width( vo_driver_t* self, int width ){ +void null_set_gui_width( xine_vo_driver_t* self, int width ) { ((null_driver_t*)self)->gui_width = width; } -void null_set_gui_height( vo_driver_t* self, int height ){ +void null_set_gui_height( xine_vo_driver_t* self, int height ) { ((null_driver_t*)self)->gui_height = height; @@ -657,3 +546,3 @@ void null_set_gui_height( vo_driver_t* self, int height ){ -void null_set_mode( vo_driver_t* self, int depth, int rgb ){ +void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { null_driver_t* this = (null_driver_t*)self; @@ -673,6 +562,7 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){ if( this->bpp == 32 ) { - if(rgb == 0 ) + if( rgb == 0 ) { this->yuv2rgb_mode = MODE_32_RGB; - else + } else { this->yuv2rgb_mode = MODE_32_BGR; + } }else{ @@ -685,18 +575,21 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){ case 16: - if( rgb == 0 ) + if( rgb == 0 ) { this->yuv2rgb_mode = MODE_16_RGB; - else + } else { this->yuv2rgb_mode = MODE_16_BGR; + } break; case 15: - if( rgb == 0 ) + if( rgb == 0 ) { this->yuv2rgb_mode = MODE_15_RGB; - else + } else { this->yuv2rgb_mode = MODE_15_BGR; + } break; case 8: - if( rgb == 0 ) + if( rgb == 0 ) { this->yuv2rgb_mode = MODE_8_RGB; - else + } else { this->yuv2rgb_mode = MODE_8_BGR; + } break; @@ -707,3 +600,5 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){ }; -void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data) { + +void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, + void* user_data ) { null_driver_t* this = (null_driver_t*) self; |