diff options
Diffstat (limited to 'src/video_out/video_out_none.c')
-rw-r--r-- | src/video_out/video_out_none.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index 0de6e34e8..15bc52abe 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -72,7 +72,7 @@ static void free_framedata(none_frame_t* frame) { static void none_frame_dispose(vo_frame_t *vo_frame) { none_frame_t *frame = (none_frame_t *)vo_frame; - free_framedata(frame); + free_framedata(frame); free (frame); } @@ -87,7 +87,7 @@ static uint32_t none_get_capabilities(vo_driver_t *vo_driver) { static vo_frame_t *none_alloc_frame(vo_driver_t *vo_driver) { /* none_driver_t *this = (none_driver_t *) vo_driver; */ none_frame_t *frame; - + frame = calloc(1, sizeof(none_frame_t)); if(!frame) return NULL; @@ -97,43 +97,43 @@ static vo_frame_t *none_alloc_frame(vo_driver_t *vo_driver) { frame->vo_frame.base[0] = NULL; frame->vo_frame.base[1] = NULL; frame->vo_frame.base[2] = NULL; - + frame->vo_frame.proc_slice = NULL; frame->vo_frame.proc_frame = NULL; frame->vo_frame.field = none_frame_field; frame->vo_frame.dispose = none_frame_dispose; frame->vo_frame.driver = vo_driver; - + return (vo_frame_t *)frame; } static void none_update_frame_format(vo_driver_t *vo_driver, vo_frame_t *vo_frame, - uint32_t width, uint32_t height, + uint32_t width, uint32_t height, double ratio, int format, int flags) { none_driver_t *this = (none_driver_t *) vo_driver; none_frame_t *frame = (none_frame_t *) vo_frame; if((frame->width != width) || (frame->height != height) || (frame->format != format)) { - + free_framedata(frame); - + frame->width = width; frame->height = height; frame->format = format; - + switch(format) { - case XINE_IMGFMT_YV12: + case XINE_IMGFMT_YV12: { int y_size, uv_size; - + frame->vo_frame.pitches[0] = 8*((width + 7) / 8); frame->vo_frame.pitches[1] = 8*((width + 15) / 16); frame->vo_frame.pitches[2] = 8*((width + 15) / 16); - + y_size = frame->vo_frame.pitches[0] * height; uv_size = frame->vo_frame.pitches[1] * ((height+1)/2); - + frame->vo_frame.base[0] = malloc (y_size + 2*uv_size); frame->vo_frame.base[1] = frame->vo_frame.base[0]+y_size+uv_size; frame->vo_frame.base[2] = frame->vo_frame.base[0]+y_size; @@ -152,14 +152,14 @@ static void none_update_frame_format(vo_driver_t *vo_driver, vo_frame_t *vo_fram break; } - - if((format == XINE_IMGFMT_YV12 - && (frame->vo_frame.base[0] == NULL - || frame->vo_frame.base[1] == NULL + + if((format == XINE_IMGFMT_YV12 + && (frame->vo_frame.base[0] == NULL + || frame->vo_frame.base[1] == NULL || frame->vo_frame.base[2] == NULL)) || (format == XINE_IMGFMT_YUY2 && frame->vo_frame.base[0] == NULL)) { xprintf (this->xine, XINE_VERBOSITY_DEBUG, - "video_out_none: error. (framedata allocation failed: out of memory)\n"); + "video_out_none: error. (framedata allocation failed: out of memory)\n"); free_framedata(frame); } } @@ -170,19 +170,19 @@ static void none_update_frame_format(vo_driver_t *vo_driver, vo_frame_t *vo_fram static void none_display_frame(vo_driver_t *vo_driver, vo_frame_t *vo_frame) { /* none_driver_t *driver = (none_driver_t *)vo_driver; */ none_frame_t *frame = (none_frame_t *)vo_frame; - + frame->vo_frame.free(&frame->vo_frame); } static int none_get_property(vo_driver_t *vo_driver, int property) { none_driver_t *driver = (none_driver_t *)vo_driver; - + switch(property) { case VO_PROP_ASPECT_RATIO: return driver->ratio; break; - + default: break; } @@ -192,7 +192,7 @@ static int none_get_property(vo_driver_t *vo_driver, int property) { static int none_set_property(vo_driver_t *vo_driver, int property, int value) { none_driver_t *driver = (none_driver_t *)vo_driver; - + switch(property) { case VO_PROP_ASPECT_RATIO: @@ -208,7 +208,7 @@ static int none_set_property(vo_driver_t *vo_driver, int property, int value) { return value; } -static void none_get_property_min_max(vo_driver_t *vo_driver, +static void none_get_property_min_max(vo_driver_t *vo_driver, int property, int *min, int *max) { *min = 0; *max = 0; @@ -242,13 +242,13 @@ static int none_redraw_needed(vo_driver_t *vo_driver) { static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *visual) { none_class_t *class = (none_class_t *) driver_class; none_driver_t *driver; - + driver = calloc(1, sizeof(none_driver_t)); - + driver->config = class->config; driver->xine = class->xine; driver->ratio = XINE_VO_ASPECT_AUTO; - + driver->vo_driver.get_capabilities = none_get_capabilities; driver->vo_driver.alloc_frame = none_alloc_frame ; driver->vo_driver.update_frame_format = none_update_frame_format; @@ -262,9 +262,9 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * driver->vo_driver.gui_data_exchange = none_gui_data_exchange; driver->vo_driver.dispose = none_dispose; driver->vo_driver.redraw_needed = none_redraw_needed; - + return &driver->vo_driver; -} +} /* * Class related functions. @@ -279,13 +279,13 @@ static char* get_description (video_driver_class_t *driver_class) { static void dispose_class (video_driver_class_t *driver_class) { none_class_t *this = (none_class_t *) driver_class; - + free (this); } static void *init_class (xine_t *xine, void *visual) { none_class_t *this; - + this = calloc(1, sizeof(none_class_t)); this->driver_class.open_plugin = open_plugin; @@ -305,7 +305,7 @@ static const vo_info_t vo_info_none = { }; const plugin_info_t xine_plugin_info[] EXPORTED = { - /* type, API, "name", version, special_info, init_function */ + /* type, API, "name", version, special_info, init_function */ { PLUGIN_VIDEO_OUT, 21, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |