-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 877e49a..5224862 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c @@ -1,105 +1,105 @@ /*#include <xine.h>*/ #include <stdlib.h> #include <stdio.h> -#include <video_out.h> -#include <xine_internal.h> -#include <xineutils.h> -#include <configfile.h> +#include <xine/video_out.h> +#include <xine/xine_internal.h> +#include <xine/xineutils.h> +#include <xine/configfile.h> typedef struct null_driver_s null_driver_t; struct null_driver_s { vo_driver_t vo_driver; uint32_t m_capabilities; }; typedef struct opie_frame_s opie_frame_t; struct opie_frame_s { vo_frame_t frame; char* name; int version; int m_width; int m_height; uint8_t *chunk[3]; null_driver_t *output; }; static uint32_t null_get_capabilities(vo_driver_t *self ){ null_driver_t* this = (null_driver_t*)self; printf("capabilities\n"); return this->m_capabilities; } /* take care of the frame*/ static void null_frame_dispose( vo_frame_t* vo_img){ opie_frame_t* frame = (opie_frame_t*)vo_img; printf("frame_dispose\n"); free (frame); } static void null_frame_field( vo_frame_t* frame, int inti ){ printf("frame_field\n"); /* not needed */ } /* end take care of frames*/ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ null_driver_t* this = (null_driver_t*)self; opie_frame_t* frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); memset( frame, 0, sizeof( opie_frame_t) ); printf("alloc_frame\n"); frame->name = "opie\0"; frame->version = 1; frame->output = this; /* initialize the frame*/ frame->frame.driver = self; /*frame.frame.free = null_frame_free;*/ frame->frame.copy = NULL; frame->frame.field = null_frame_field; frame->frame.dispose = null_frame_dispose; return (vo_frame_t*) frame; } static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, uint32_t width, uint32_t height, int ratio_code, int format, int flags ){ null_driver_t* this = (null_driver_t*) self; opie_frame_t* frame = (opie_frame_t*)img; /* not needed now */ printf("update_frame_format\n"); printf("al crash aye?\n"); if(frame->chunk[0] ){ free( frame->chunk[0] ); frame->chunk[0] = NULL; } if(frame->chunk[1] ){ free ( frame->chunk[1] ); frame->chunk[1] = NULL; } if(frame->chunk[2] ){ free ( frame->chunk[2] ); frame->chunk[2] = NULL; } if( format == IMGFMT_YV12 ) { int image_size = width * height; /* cast ouch*/ frame->frame.base[0] = xine_xmalloc_aligned(16, image_size, (void **)&frame->chunk[0] ); frame->frame.base[1] = xine_xmalloc_aligned(16, image_size, (void **)&frame->chunk[1] ); frame->frame.base[2] = xine_xmalloc_aligned(16, image_size, (void **)&frame->chunk[2] ); }else{ int image_size = width * height; /* cast ouch*/ frame->frame.base[0] = xine_xmalloc_aligned(16, image_size, (void **)&frame->chunk[0] ); frame->chunk[1] = NULL; frame->chunk[2] = NULL; } |