summaryrefslogtreecommitdiffstats
path: root/libvo/vo_tdfx_vid.c
diff options
context:
space:
mode:
Diffstat (limited to 'libvo/vo_tdfx_vid.c')
-rw-r--r--libvo/vo_tdfx_vid.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/libvo/vo_tdfx_vid.c b/libvo/vo_tdfx_vid.c
index 5c7f917d4e..fcd00969d2 100644
--- a/libvo/vo_tdfx_vid.c
+++ b/libvo/vo_tdfx_vid.c
@@ -39,7 +39,7 @@
#include "drivers/tdfx_vid.h"
-static const vo_info_t info =
+static const vo_info_t info =
{
"tdfx vid",
"tdfx_vid",
@@ -78,7 +78,7 @@ static void clear_screen(void) {
tdfx_vid_agp_move_t mov;
memset(agp_mem,0,tdfx_cfg.screen_width*dst_bpp*tdfx_cfg.screen_height);
-
+
mov.move2 = TDFX_VID_MOVE_2_PACKED;
mov.width = tdfx_cfg.screen_width*dst_bpp;
mov.height = tdfx_cfg.screen_height;
@@ -91,7 +91,7 @@ static void clear_screen(void) {
if(ioctl(tdfx_fd,TDFX_VID_AGP_MOVE,&mov))
mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_TDFXVID_AGPMoveFailedToClearTheScreen);
-
+
}
#endif
@@ -111,7 +111,7 @@ static int draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
case IMGFMT_BGR32:
// copy :( to agp_mem
// still faster than tdfxfb wich directly copy to the video mem :)
- mem2agpcpy_pic(agp_mem + current_buffer * buffer_size +
+ mem2agpcpy_pic(agp_mem + current_buffer * buffer_size +
y*buffer_stride[0] + x * src_bpp,
image[0],
src_bpp*w,h,buffer_stride[0],stride[0]);
@@ -131,7 +131,7 @@ static int draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
buffer_stride[2],stride[2]);
return 0;
}
-
+
return 1;
}
@@ -167,7 +167,7 @@ flip_page(void)
blit.src_w = src_width;
blit.src_h = src_height;
blit.src_format = src_fmt;
-
+
blit.dst = front_buffer;
blit.dst_stride = dst_stride;
blit.dst_x = 0;
@@ -243,11 +243,11 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
vo_screenwidth = tdfx_cfg.screen_width;
if(!vo_screenheight)
vo_screenheight = tdfx_cfg.screen_height;
-
+
aspect_save_orig(width,height);
aspect_save_prescale(d_width,d_height);
aspect_save_screenres(vo_screenwidth,vo_screenheight);
-
+
if(flags&VOFLAG_FULLSCREEN) { /* -fs */
aspect(&d_width,&d_height,A_ZOOM);
vo_fs = VO_TRUE;
@@ -269,7 +269,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_TDFXVID_NonNativeOverlayFormatNeedConversion);
case IMGFMT_BGR15:
case IMGFMT_BGR16:
- src_bpp = ((format & 0x3F)+7)/8;
+ src_bpp = ((format & 0x3F)+7)/8;
break;
case IMGFMT_YV12:
case IMGFMT_I420:
@@ -278,7 +278,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
buffer_stride[1] = buffer_stride[2] = buffer_stride[0]/2;
src_fmt = TDFX_VID_FORMAT_YUY2;
case IMGFMT_YUY2:
- case IMGFMT_UYVY:
+ case IMGFMT_UYVY:
src_bpp = 2;
break;
default:
@@ -351,7 +351,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
}
use_overlay++;
}
-
+
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_TDFXVID_OverlayReady,
src_width,src_stride,src_height,src_bpp,
dst_width,dst_stride,dst_height,dst_bpp);
@@ -362,7 +362,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_TDFXVID_TextureBlitReady,
src_width,src_stride,src_height,src_bpp,
dst_width,dst_stride,dst_height,dst_bpp);
-
+
return 0;
}
@@ -385,7 +385,7 @@ static void check_events(void)
static int preinit(const char *arg)
{
-
+
tdfx_fd = open(arg ? arg : "/dev/tdfx_vid", O_RDWR);
if(tdfx_fd < 0) {
mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_TDFXVID_CantOpen,arg ? arg : "/dev/tdfx_vid",
@@ -416,7 +416,7 @@ static int preinit(const char *arg)
mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_TDFXVID_MemmapFailed);
return 1;
}
-
+
memset(agp_mem,0,1024*768*4);
return 0;
@@ -470,7 +470,7 @@ static uint32_t get_image(mp_image_t *mpi) {
}
mpi->flags |= MP_IMGFLAG_DIRECT;
mpi->priv = (void*)buf;
-
+
return VO_TRUE;
}
@@ -526,10 +526,10 @@ static uint32_t draw_image(mp_image_t *mpi){
mov.height = mpi->height;
mov.src = planes[0] - agp_mem;
mov.src_stride = buffer_stride[0];
-
+
mov.dst = back_buffer;
mov.dst_stride = src_stride;
-
+
if(ioctl(tdfx_fd,TDFX_VID_AGP_MOVE,&mov))
mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_TDFXVID_AgpMoveFailed);
break;
@@ -563,7 +563,7 @@ static uint32_t draw_image(mp_image_t *mpi){
mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_TDFXVID_SetYuvFailed);
break;
}
-
+
// Now agp move that
// Y