| -rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 183 |
1 files changed, 94 insertions, 89 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 90f62f2..378bbd4 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c @@ -106,3 +106,3 @@ struct opie_frame_s { int stripe_height, stripe_inc; - + null_driver_t *output; @@ -110,3 +110,3 @@ struct opie_frame_s { -static uint32_t null_get_capabilities( vo_driver_t *self ){ +static uint32_t null_get_capabilities( vo_driver_t *self ){ null_driver_t* this = (null_driver_t*)self; @@ -117,9 +117,9 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { opie_frame_t *frame = (opie_frame_t *) vo_img ; - + vo_img->proc_called = 1; - if (!frame->output->m_show_video) { + if (!frame->output->m_show_video) { /* printf("nullvideo: no video\n"); */ - return; - } + return; + } @@ -127,3 +127,3 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst, - src[0], src[1], src[2]); + src[0], src[1], src[2]); } else { @@ -131,6 +131,6 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst, - src[0]); - } - - frame->rgb_dst += frame->stripe_inc; + src[0]); + } + + frame->rgb_dst += frame->stripe_inc; } @@ -158,3 +158,3 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { /* take care of the frame*/ -static void null_frame_dispose( vo_frame_t* vo_img){ +static void null_frame_dispose( vo_frame_t* vo_img){ opie_frame_t* frame = (opie_frame_t*)vo_img; @@ -168,3 +168,3 @@ 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( vo_driver_t* self ){ @@ -173,15 +173,15 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ -#ifdef LOG +#ifdef LOG fprintf (stderr, "nullvideo: alloc_frame\n"); -#endif +#endif frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); - + memset( frame, 0, sizeof( opie_frame_t) ); memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t)); - + pthread_mutex_init (&frame->frame.mutex, NULL); - + frame->output = this; - + /* initialize the frame*/ @@ -191,8 +191,8 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ frame->frame.dispose = null_frame_dispose; - + /* * colorspace converter for this frame - */ + */ frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory); - + return (vo_frame_t*) frame; @@ -201,4 +201,5 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, - uint32_t width, uint32_t height, - double ratio_code, int format, int flags ){ + uint32_t width, uint32_t height, + double ratio_code, int format, + int flags ){ null_driver_t* this = (null_driver_t*) self; @@ -237,3 +238,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, -#ifdef LOG +#ifdef LOG fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n", @@ -245,3 +246,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, /* - * (re-) allocate + * (re-) allocate */ @@ -249,12 +250,12 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, if( frame->chunk[0] ){ - free( frame->chunk[0] ); - frame->chunk[0] = NULL; - } + free( frame->chunk[0] ); + frame->chunk[0] = NULL; + } if( frame->chunk[1] ){ - free ( frame->chunk[1] ); - frame->chunk[1] = NULL; - } + free ( frame->chunk[1] ); + frame->chunk[1] = NULL; + } if( frame->chunk[2] ){ - free ( frame->chunk[2] ); - frame->chunk[2] = NULL; + free ( frame->chunk[2] ); + frame->chunk[2] = NULL; } @@ -263,5 +264,5 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, - frame->data = xine_xmalloc (frame->sc.output_width - * frame->sc.output_height - * this->bytes_per_pixel ); + frame->data = xine_xmalloc (frame->sc.output_width + * frame->sc.output_height + * this->bytes_per_pixel ); @@ -277,5 +278,5 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->frame.pitches[0] = 8*((width + 3) / 4); - + frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height, - (void **)&frame->chunk[0]); + (void **)&frame->chunk[0]); frame->chunk[1] = NULL; @@ -286,4 +287,4 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->bytes_per_line = frame->sc.output_width * this->bytes_per_pixel; - - /* + + /* * set up colorspace converter @@ -295,9 +296,9 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->yuv2rgb->configure (frame->yuv2rgb, - frame->sc.delivered_width, - 16, - 2*frame->frame.pitches[0], - 2*frame->frame.pitches[1], - frame->sc.output_width, - frame->stripe_height, - frame->bytes_per_line*2); + frame->sc.delivered_width, + 16, + 2*frame->frame.pitches[0], + 2*frame->frame.pitches[1], + frame->sc.output_width, + frame->stripe_height, + frame->bytes_per_line*2); frame->yuv_stride = frame->bytes_per_line*2; @@ -306,9 +307,9 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, frame->yuv2rgb->configure (frame->yuv2rgb, - frame->sc.delivered_width, - 16, - frame->frame.pitches[0], - frame->frame.pitches[1], - frame->sc.output_width, - frame->stripe_height, - frame->bytes_per_line); + frame->sc.delivered_width, + 16, + frame->frame.pitches[0], + frame->frame.pitches[1], + frame->sc.output_width, + frame->stripe_height, + frame->bytes_per_line); frame->yuv_stride = frame->bytes_per_line; @@ -340,6 +341,6 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, } - } + } } -static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ +static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ null_driver_t* this = (null_driver_t*) self; @@ -347,4 +348,4 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ display_xine_frame_t display = this->frameDis; - - if (!this->m_show_video) + + if (!this->m_show_video) return; @@ -353,6 +354,6 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ (*display)(this->caller, frame->data, - frame->sc.output_width, frame->sc.output_height, - frame->bytes_per_line ); + frame->sc.output_width, frame->sc.output_height, + frame->bytes_per_line ); } - + frame->frame.free(&frame->frame); @@ -362,5 +363,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, - opie_frame_t *frame) { +static void null_overlay_clut_yuv2rgb (null_driver_t *this, + vo_overlay_t *overlay, + opie_frame_t *frame) { int i; @@ -370,4 +371,5 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, *((uint32_t *)&clut[i]) = - frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb, - clut[i].y, clut[i].cb, clut[i].cr); + frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb, + clut[i].y, clut[i].cb, + clut[i].cr); } @@ -380,3 +382,3 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb, - clut[i].y, clut[i].cb, clut[i].cr); + clut[i].y, clut[i].cb, clut[i].cr); } @@ -386,3 +388,4 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, -static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, + vo_overlay_t *overlay) { null_driver_t *this = (null_driver_t *) this_gen; @@ -390,3 +393,3 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, v - if(!this->m_show_video || frame->sc.output_width == 0 + if(!this->m_show_video || frame->sc.output_width == 0 || frame->sc.output_height== 0) @@ -398,3 +401,3 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, v null_overlay_clut_yuv2rgb(this,overlay,frame); - + switch(this->bpp) { @@ -418,3 +421,3 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, v break; - } + } } @@ -424,3 +427,3 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, v static int null_get_property( vo_driver_t* self, - int property ){ + int property ){ return 0; @@ -428,4 +431,4 @@ static int null_get_property( vo_driver_t* self, static int null_set_property( vo_driver_t* self, - int property, - int value ){ + int property, + int value ){ return value; @@ -433,4 +436,4 @@ static int null_set_property( vo_driver_t* self, static void null_get_property_min_max( vo_driver_t* self, - int property, int *min, - int *max ){ + int property, int *min, + int *max ){ *max = 0; @@ -439,4 +442,4 @@ static void null_get_property_min_max( vo_driver_t* self, static int null_gui_data_exchange( vo_driver_t* self, - int data_type, - void *data ){ + int data_type, + void *data ){ return 0; @@ -451,6 +454,8 @@ static int null_redraw_needed( vo_driver_t* self ){ } - + xine_vo_driver_t* init_video_out_plugin( xine_t *xine, - void* video, display_xine_frame_t frameDisplayFunc, void *userData ){ + void* video, + display_xine_frame_t frameDisplayFunc, + void *userData ){ null_driver_t *vo; @@ -489,4 +494,4 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine, vo->m_capabilities = /* VO_CAP_COPIES_IMAGE | */ VO_CAP_YUY2 | VO_CAP_YV12; - vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, - vo->yuv2rgb_cmap); + vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, + vo->yuv2rgb_cmap); @@ -546,3 +551,3 @@ void null_set_scaling( xine_vo_driver_t* self, int scale ) { } - + void null_set_gui_width( xine_vo_driver_t* self, int width ) { @@ -557,3 +562,3 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { null_driver_t* this = (null_driver_t*)self->driver; - + this->bytes_per_pixel = (depth + 7 ) / 8; @@ -567,9 +572,9 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { this->yuv2rgb_mode = MODE_32_RGB; - else + else this->yuv2rgb_mode = MODE_32_BGR; - case 24: + case 24: if( this->bpp == 32 ) { - if( rgb == 0 ) { + if( rgb == 0 ) { this->yuv2rgb_mode = MODE_32_RGB; - } else { + } else { this->yuv2rgb_mode = MODE_32_BGR; |