Diffstat (limited to 'noncore/multimedia/opieplayer2/nullvideo.c') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 220 |
1 files changed, 90 insertions, 130 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 6769a37..99fa329 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c @@ -4,3 +4,2 @@ Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> - Copyright (c) 2002 LJP <> Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> @@ -42,3 +41,2 @@ #include <xine/xine_internal.h> -//#include <xine/xineutils.h> #include <xine/vo_scale.h> @@ -53,3 +51,3 @@ /* -#define LOG + * #define LOG */ @@ -59,2 +57,6 @@ typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, int width, int height,int bytes ); +typedef void (*vo_scale_cb) (void*, int, int, double, + int*, int*, int*, double*, int*, int* ); +typedef void (*dest_size_cb) (void*, int, int, double, int*, int*, double*); + @@ -65,6 +67,4 @@ struct null_driver_s { - uint32_t m_capabilities; int m_show_video; int m_video_fullscreen; - int m_is_scaling; @@ -73,3 +73,3 @@ struct null_driver_s { int yuv2rgb_swap; - int yuv2rgb_gamma; + int yuv2rgb_brightness; uint8_t *yuv2rgb_cmap; @@ -80,9 +80,10 @@ struct null_driver_s { - int gui_width; - int gui_height; - int gui_changed; - - double display_ratio; - void* caller; + /* + * DISPLAY to widget... + */ display_xine_frame_t frameDis; + void *userData; + + xine_t *xine; + alphablend_t alphablend_extra_data; }; @@ -112,4 +113,4 @@ struct opie_frame_s { static uint32_t null_get_capabilities( vo_driver_t *self ){ - null_driver_t* this = (null_driver_t*)self; - return this->m_capabilities; + self = self; + return VO_CAP_YUY2 | VO_CAP_YV12; } @@ -121,4 +122,14 @@ static void null_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) { - if (!frame->output->m_show_video) { - /* printf("nullvideo: no video\n"); */ + /* + * drop hard if we don't show the video + */ + if (!frame->output->m_show_video) + return; + + if( frame->frame.crop_left || frame->frame.crop_top || + frame->frame.crop_right || frame->frame.crop_bottom ) + { + /* we don't support crop, so don't even waste cpu cycles. + * cropping will be performed by video_out.c + */ return; @@ -144,3 +155,3 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { case VO_TOP_FIELD: - frame->rgb_dst = (uint8_t *)frame->data; + frame->rgb_dst = frame->data; frame->stripe_inc = 2*frame->stripe_height * frame->bytes_per_line; @@ -148,3 +159,3 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { case VO_BOTTOM_FIELD: - frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ; + frame->rgb_dst = frame->data + frame->bytes_per_line ; frame->stripe_inc = 2*frame->stripe_height * frame->bytes_per_line; @@ -152,3 +163,3 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { case VO_BOTH_FIELDS: - frame->rgb_dst = (uint8_t *)frame->data; + frame->rgb_dst = frame->data; break; @@ -179,2 +190,4 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ frame = (opie_frame_t*)xine_xmalloc ( sizeof(opie_frame_t) ); + if(!frame) + return NULL; @@ -189,2 +202,3 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ frame->frame.proc_slice = null_frame_proc_slice; + frame->frame.proc_frame = NULL; frame->frame.field = null_frame_field; @@ -231,3 +245,2 @@ static void null_frame_reallocate( null_driver_t *this, opie_frame_t *frame, */ - if( frame->data ) { if( frame->chunk[0] ){ @@ -244,4 +257,4 @@ static void null_frame_reallocate( null_driver_t *this, opie_frame_t *frame, } + if(frame->data) free ( frame->data ); - } @@ -312,6 +325,13 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, + int gui_width = 0; + int gui_height = 0; + double gui_pixel_aspect = 0.0; + flags &= VO_BOTH_FIELDS; - /* find out if we need to adapt this frame */ + frame->sc.dest_size_cb(frame->sc.user_data, width, height, + frame->sc.video_pixel_aspect, + &gui_width, &gui_height, &gui_pixel_aspect); + /* find out if we need to adapt this frame */ if ((width != frame->sc.delivered_width) @@ -322,5 +342,4 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, || (this->sc.user_ratio != frame->sc.user_ratio) - || (this->gui_width != frame->sc.gui_width) - || (this->gui_height != frame->sc.gui_height)) { - + || (gui_width != frame->sc.gui_width) + || (gui_height != frame->sc.gui_height)) { frame->sc.delivered_width = width; @@ -331,5 +350,4 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, 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; + frame->sc.gui_width = gui_width; + frame->sc.gui_height = gui_height; @@ -365,3 +383,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, case VO_TOP_FIELD: - frame->rgb_dst = (uint8_t *)frame->data; + frame->rgb_dst = frame->data; frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line; @@ -369,3 +387,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, case VO_BOTTOM_FIELD: - frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ; + frame->rgb_dst = frame->data + frame->bytes_per_line ; frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line; @@ -373,3 +391,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, case VO_BOTH_FIELDS: - frame->rgb_dst = (uint8_t *)frame->data; + frame->rgb_dst = frame->data; frame->stripe_inc = frame->stripe_height * frame->bytes_per_line; @@ -389,3 +407,3 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ if( display != NULL ) { - (*display)(this->caller, frame->data, + (*display)(this->userData, frame->data, frame->sc.output_width, frame->sc.output_height, @@ -444,3 +462,3 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, case 16: - blend_rgb16((uint8_t *)frame->data, + blend_rgb16(frame->data, overlay, @@ -449,6 +467,7 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, frame->sc.delivered_width, - frame->sc.delivered_height); + frame->sc.delivered_height, + &this->alphablend_extra_data); break; case 24: - blend_rgb24((uint8_t *)frame->data, + blend_rgb24(frame->data, overlay, @@ -457,6 +476,7 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, frame->sc.delivered_width, - frame->sc.delivered_height); + frame->sc.delivered_height, + &this->alphablend_extra_data); break; case 32: - blend_rgb32((uint8_t *)frame->data, + blend_rgb32(frame->data, overlay, @@ -465,3 +485,4 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, frame->sc.delivered_width, - frame->sc.delivered_height); + frame->sc.delivered_height, + &this->alphablend_extra_data); break; @@ -476,3 +497,2 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, static int null_get_property( vo_driver_t* self, int property ){ -#if 0 null_driver_t *this = (null_driver_t *)self; @@ -492,6 +512,2 @@ static int null_get_property( vo_driver_t* self, int property ){ } -#else - property = property; - self = self; -#endif @@ -501,3 +517,2 @@ static int null_set_property( vo_driver_t* self, int property, int value ){ -#if 0 null_driver_t *this = (null_driver_t *)self; @@ -519,6 +534,2 @@ static int null_set_property( vo_driver_t* self, int property, } -#else - self = self; - property = property; -#endif @@ -529,7 +540,9 @@ static void null_get_property_min_max( vo_driver_t* self, int *max ){ - self = self; - property = property; - - *max = 0; + if(property == VO_PROP_BRIGHTNESS) { + *min = -100; + *max = +100; + }else { *min = 0; + *max = 0; + } } @@ -538,6 +551,2 @@ static int null_gui_data_exchange( vo_driver_t* self, void *data ){ - self = self; - data_type = data_type; - data = data; - return 0; @@ -547,2 +556,3 @@ static void null_dispose ( vo_driver_t* self ){ null_driver_t* this = (null_driver_t*)self; + _x_alphablend_free(&this->alphablend_extra_data); free ( this ); @@ -550,5 +560,4 @@ static void null_dispose ( vo_driver_t* self ){ static int null_redraw_needed( vo_driver_t* self ){ - self = self; - - return 0; + null_driver_t *this = (null_driver_t*)self; + return _x_vo_scale_redraw_needed(&this->sc); } @@ -559,23 +568,19 @@ xine_video_port_t* init_video_out_plugin( xine_t *xine, display_xine_frame_t frameDisplayFunc, - void *userData ){ - video = video; - - + void *userData, vo_scale_cb frame_cb, + dest_size_cb dest_cb) { null_driver_t *vo; - vo = (null_driver_t*)malloc( sizeof(null_driver_t ) ); - - /* memset? */ - memset(vo,0, sizeof(null_driver_t ) ); + vo = (null_driver_t*)xine_xmalloc(sizeof(null_driver_t )); + vo->xine = xine; + _x_alphablend_init(&vo->alphablend_extra_data, xine); _x_vo_scale_init (&vo->sc, 0, 0, xine->config); + vo->sc.gui_width = 18; + vo->sc.gui_height = 6; + vo->sc.user_ratio = XINE_VO_ASPECT_AUTO; + vo->sc.user_data = userData; + vo->sc.frame_output_cb = frame_cb; + vo->sc.dest_size_cb = dest_cb; - vo->sc.gui_pixel_aspect = 1.0; vo->m_show_video = 0; // false - vo->m_video_fullscreen = 0; - vo->m_is_scaling = 0; - vo->display_ratio = 1.0; - vo->gui_width = 16; - vo->gui_height = 8; - vo->frameDis = NULL; @@ -586,3 +591,5 @@ xine_video_port_t* init_video_out_plugin( xine_t *xine, vo->vo_driver.display_frame = null_display_frame; + vo->vo_driver.overlay_begin = 0; vo->vo_driver.overlay_blend = null_overlay_blend; + vo->vo_driver.overlay_end = 0; vo->vo_driver.get_property = null_get_property; @@ -594,9 +601,13 @@ xine_video_port_t* init_video_out_plugin( xine_t *xine, - /* capabilities */ - vo->m_capabilities = VO_CAP_YUY2 | VO_CAP_YV12; - vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, + vo->yuv2rgb_mode = MODE_16_RGB; + vo->yuv2rgb_brightness = 0; + vo->yuv2rgb_factory = yuv2rgb_factory_init (vo->yuv2rgb_mode, + vo->yuv2rgb_swap, vo->yuv2rgb_cmap); + vo->yuv2rgb_factory->set_csc_levels(vo->yuv2rgb_factory, + vo->yuv2rgb_brightness, + 128,128); - vo->caller = userData; + vo->userData = userData; vo->frameDis = frameDisplayFunc; @@ -623,27 +634,2 @@ void null_set_show_video( xine_vo_driver_t* self, int show ) { -int null_is_fullscreen( xine_vo_driver_t* self ){ - return ((null_driver_t*)self->driver)->m_video_fullscreen; -} -void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ - ((null_driver_t*)self->driver)->m_video_fullscreen = screen; -} -int null_is_scaling( xine_vo_driver_t* self ){ - return ((null_driver_t*)self->driver)->m_is_scaling; -} - -void null_set_videoGamma( xine_vo_driver_t* self , int value ) { - ((null_driver_t*) self->driver) ->yuv2rgb_gamma = value; - ((null_driver_t*) self->driver) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self->driver) ->yuv2rgb_factory, value ); -} - -void null_set_scaling( xine_vo_driver_t* self, int scale ) { - ((null_driver_t*)self->driver)->m_is_scaling = scale; -} - -void null_set_gui_width( xine_vo_driver_t* self, int width ) { - ((null_driver_t*)self->driver)->gui_width = width; -} -void null_set_gui_height( xine_vo_driver_t* self, int height ) { - ((null_driver_t*)self->driver)->gui_height = height; -} @@ -699,5 +685,2 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { }; - //free(this->yuv2rgb_factory ); - // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, - // this->yuv2rgb_cmap); }; @@ -707,3 +690,3 @@ void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, null_driver_t* this = (null_driver_t*) self->driver; - this->caller = user_data; + this->userData = user_data; this->frameDis = t; @@ -711,25 +694,2 @@ void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, -void null_preload_decoders( xine_stream_t *stream ) -{ - static const uint32_t preloadedAudioDecoders[] = { BUF_AUDIO_MPEG, BUF_AUDIO_VORBIS }; - static const uint8_t preloadedAudioDecoderCount = sizeof( preloadedAudioDecoders ) / sizeof( preloadedAudioDecoders[ 0 ] ); - static const uint32_t preloadedVideoDecoders[] = { BUF_VIDEO_MPEG, BUF_VIDEO_MPEG4, BUF_VIDEO_DIVX5 }; - static const uint8_t preloadedVideoDecoderCount = sizeof( preloadedVideoDecoders ) / sizeof( preloadedVideoDecoders[ 0 ] ); - - uint8_t i; -#if 0 - - for ( i = 0; i < preloadedAudioDecoderCount; ++i ) { - audio_decoder_t *decoder = get_audio_decoder( stream, ( preloadedAudioDecoders[ i ] >> 16 ) & 0xff ); - decoder = decoder; -/* free_audio_decoder( stream, decoder ); */ - } - - for ( i = 0; i < preloadedVideoDecoderCount; ++i ) { - video_decoder_t *decoder = get_video_decoder( stream, ( preloadedVideoDecoders[ i ] >> 16 ) & 0xff ); - decoder = decoder; -/* free_video_decoder( stream, decoder ); */ - } -#endif -} |