[Mplayer-cvslog] CVS: main/libvo video_out.h,1.40,1.41 video_out_internal.h,1.11,1.12 vo_3dfx.c,1.14,1.15 vo_aa.c,1.31,1.32 vo_dga.c,1.45,1.46 vo_directfb.c,1.22,1.23 vo_dxr2.c,1.7,1.8 vo_dxr3.c,1.95,1.96 vo_fbdev.c,1.67,1.68 vo_fsdga.c,1.12,1.13 vo_ggi.c,1.24,1.25 vo_gif89a.c,1.3,1.4 vo_gl.c,1.29,1.30 vo_gl2.c,1.22,1.23 vo_jpeg.c,1.4,1.5 vo_md5.c,1.12,1.13 vo_mga.c,1.31,1.32 vo_mpegpes.c,1.33,1.34 vo_null.c,1.9,1.10 vo_odivx.c,1.12,1.13 vo_pgm.c,1.12,1.13 vo_png.c,1.17,1.18 vo_sdl.c,1.89,1.90 vo_svga.c,1.49,1.50 vo_syncfb.c,1.12,1.13 vo_tdfxfb.c,1.16,1.17 vo_vesa.c,1.76,1.77 vo_x11.c,1.115,1.116 vo_xmga.c,1.75,1.76 vo_xv.c,1.114,1.115 vo_xvidix.c,1.50,1.51 vo_yuv4mpeg.c,1.10,1.11 vo_zr.c,1.18,1.19 vosub_vidix.c,1.52,1.53 vosub_vidix.h,1.8,1.9
Alex Beregszaszi
alex at mplayerhq.hu
Wed Aug 28 23:32:35 CEST 2002
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv14174/libvo
Modified Files:
video_out.h video_out_internal.h vo_3dfx.c vo_aa.c vo_dga.c
vo_directfb.c vo_dxr2.c vo_dxr3.c vo_fbdev.c vo_fsdga.c
vo_ggi.c vo_gif89a.c vo_gl.c vo_gl2.c vo_jpeg.c vo_md5.c
vo_mga.c vo_mpegpes.c vo_null.c vo_odivx.c vo_pgm.c vo_png.c
vo_sdl.c vo_svga.c vo_syncfb.c vo_tdfxfb.c vo_vesa.c vo_x11.c
vo_xmga.c vo_xv.c vo_xvidix.c vo_yuv4mpeg.c vo_zr.c
vosub_vidix.c vosub_vidix.h
Log Message:
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- video_out.h 22 Aug 2002 23:03:50 -0000 1.40
+++ video_out.h 28 Aug 2002 21:32:31 -0000 1.41
@@ -21,8 +21,7 @@
#define VO_EVENT_RESIZE 2
#define VO_EVENT_KEYPRESS 4
-/* takes a pointer to a vo_vaa_s struct */
-#define VOCTRL_QUERY_VAA 1
+/* Obsolete: VOCTRL_QUERY_VAA 1 */
/* does the device support the required format */
#define VOCTRL_QUERY_FORMAT 2
/* signal a device reset seek */
@@ -76,49 +75,6 @@
const char *comment;
} vo_info_t;
-/* Direct access to BES */
-typedef struct bes_da_s
-{
- vidix_rect_t dest; /* This field should be filled by x,y,w,h
- from vidix:src but pitches from
- vidix:dest */
- int flags; /* Probably will work only when flag == 0 */
- /* memory model */
- unsigned frame_size; /* destination frame size */
- unsigned num_frames; /* number of available frames */
- unsigned offsets[VID_PLAY_MAXFRAMES]; /* relative offset of each frame from begin of video memory */
- vidix_yuv_t offset; /* relative offsets within frame for yuv planes */
- void* dga_addr; /* linear address of BES */
-}bes_da_t;
-
-/*
- Video Accelearted Architecture.
- Every field of this structure can be set to NULL that means that
- features is not supported
-*/
-typedef struct vo_vaa_s
-{
- uint32_t flags; /* currently undefined */
- /*
- * Query Direct Access to BES
- * info - information to be filled
- * returns: 0 on success errno on error.
- */
- int (*query_bes_da)(bes_da_t *info);
- int (*get_video_eq)(vidix_video_eq_t *info);
- int (*set_video_eq)(const vidix_video_eq_t *info);
- int (*get_num_fx)(unsigned *info);
- int (*get_oem_fx)(vidix_oem_fx_t *info);
- int (*set_oem_fx)(const vidix_oem_fx_t *info);
- int (*set_deint)(const vidix_deinterlace_t *info);
-}vo_vaa_t;
-
-/* Misc info to tuneup vo driver */
-typedef struct vo_tune_info_s
-{
- int pitch[3]; /* Should be 0 if unknown else power of 2 */
-}vo_tune_info_t;
-
typedef struct vo_functions_s
{
/*
@@ -139,7 +95,7 @@
*/
uint32_t (*config)(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *);
+ uint32_t format);
/*
* Control interface
Index: video_out_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- video_out_internal.h 13 Apr 2002 19:14:33 -0000 1.11
+++ video_out_internal.h 28 Aug 2002 21:32:31 -0000 1.12
@@ -27,7 +27,7 @@
static uint32_t control(uint32_t request, void *data, ...);
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *);
+ uint32_t format);
static const vo_info_t* get_info(void);
static uint32_t draw_frame(uint8_t *src[]);
static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y);
@@ -37,7 +37,6 @@
static void uninit(void);
static uint32_t query_format(uint32_t format);
static uint32_t preinit(const char *);
-static void query_vaa(vo_vaa_t *);
#define LIBVO_EXTERN(x) vo_functions_t video_out_##x =\
{\
Index: vo_3dfx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_3dfx.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_3dfx.c 27 May 2002 17:18:06 -0000 1.14
+++ vo_3dfx.c 28 Aug 2002 21:32:31 -0000 1.15
@@ -312,7 +312,7 @@
}
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
int fd;
char *name = ":0.0";
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vo_aa.c 26 Jul 2002 02:04:11 -0000 1.31
+++ vo_aa.c 28 Aug 2002 21:32:31 -0000 1.32
@@ -229,7 +229,7 @@
static uint32_t
config(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *info) {
+ uint32_t format) {
/*
* main init
* called by mplayer
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- vo_dga.c 27 May 2002 17:14:13 -0000 1.45
+++ vo_dga.c 28 Aug 2002 21:32:31 -0000 1.46
@@ -21,6 +21,9 @@
* BGR_32_24_888
*
* $Log$
+ * Revision 1.46 2002/08/28 21:32:31 alex
+ * finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
+ *
* Revision 1.45 2002/05/27 17:14:13 alex
* revised query_format. added support for native/conversion detection
*
@@ -795,7 +798,7 @@
static uint32_t config( uint32_t width, uint32_t height,
uint32_t d_width,uint32_t d_height,
- uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info )
+ uint32_t flags,char *title,uint32_t format)
{
int x_off, y_off;
Index: vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vo_directfb.c 9 Aug 2002 17:20:46 -0000 1.22
+++ vo_directfb.c 28 Aug 2002 21:32:32 -0000 1.23
@@ -529,7 +529,7 @@
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *info)
+ uint32_t format)
{
/*
* (Locals)
Index: vo_dxr2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_dxr2.c 26 Jul 2002 12:42:43 -0000 1.7
+++ vo_dxr2.c 28 Aug 2002 21:32:32 -0000 1.8
@@ -583,7 +583,7 @@
}
-static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format, const vo_tune_info_t *info)
+static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format)
{
int arg;
dxr2_threeArg_t arg3;
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- vo_dxr3.c 27 Aug 2002 08:33:05 -0000 1.95
+++ vo_dxr3.c 28 Aug 2002 21:32:32 -0000 1.96
@@ -237,7 +237,7 @@
return VO_NOTIMPL;
}
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format, const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
int tmp1, tmp2, size;
em8300_register_t reg;
Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vo_fbdev.c 22 Aug 2002 23:03:50 -0000 1.67
+++ vo_fbdev.c 28 Aug 2002 21:32:32 -0000 1.68
@@ -840,7 +840,7 @@
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t flags, char *title,
- uint32_t format,const vo_tune_info_t *info)
+ uint32_t format)
{
struct fb_cmap *cmap;
int vm = flags & 0x02;
@@ -1043,7 +1043,7 @@
else y_offset = 0;
if(vidix_init(width,height,x_offset,y_offset,image_width,
image_height,format,fb_bpp,
- fb_xres,fb_yres,info) != 0)
+ fb_xres,fb_yres) != 0)
{
printf(FBDEV "Can't initialize VIDIX driver\n");
vidix_name = NULL;
Index: vo_fsdga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fsdga.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_fsdga.c 27 May 2002 17:56:52 -0000 1.12
+++ vo_fsdga.c 28 Aug 2002 21:32:32 -0000 1.13
@@ -302,7 +302,7 @@
static uint32_t config( uint32_t width, uint32_t height,
uint32_t d_width,uint32_t d_height,
- uint32_t fullscreen,char *title,uint32_t format,const vo_tune_info_t *info )
+ uint32_t fullscreen,char *title,uint32_t format)
{
int bank, ram;
Index: vo_ggi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vo_ggi.c 26 Jul 2002 12:42:43 -0000 1.24
+++ vo_ggi.c 28 Aug 2002 21:32:32 -0000 1.25
@@ -85,7 +85,7 @@
static void flip_page_directbuffer(void);
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+ uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
ggi_mode mode =
{
Index: vo_gif89a.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gif89a.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vo_gif89a.c 27 May 2002 17:44:32 -0000 1.3
+++ vo_gif89a.c 28 Aug 2002 21:32:32 -0000 1.4
@@ -50,7 +50,7 @@
static uint32_t config
(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height,
- uint32_t fullscreen, char *title, uint32_t format, const vo_tune_info_t *info) {
+ uint32_t fullscreen, char *title, uint32_t format) {
char filename[] = "out.gif";
ColorMapObject *Cmap;
#ifdef HAVE_GIF_4
Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vo_gl.c 28 Aug 2002 15:55:58 -0000 1.29
+++ vo_gl.c 28 Aug 2002 21:32:32 -0000 1.30
@@ -95,7 +95,7 @@
* allocate colors and (shared) memory
*/
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
// int screen;
unsigned int fg, bg;
Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vo_gl2.c 28 Aug 2002 15:55:58 -0000 1.22
+++ vo_gl2.c 28 Aug 2002 21:32:32 -0000 1.23
@@ -602,7 +602,7 @@
* allocate colors and (shared) memory
*/
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
// int screen;
unsigned int fg, bg;
Index: vo_jpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_jpeg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_jpeg.c 18 Jul 2002 22:44:31 -0000 1.4
+++ vo_jpeg.c 28 Aug 2002 21:32:32 -0000 1.5
@@ -58,7 +58,7 @@
vo_draw_alpha_rgb24(w, h, src, srca, stride, image_data + 3 * (y0 * image_width + x0), 3 * image_width);
}
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
if ( fullscreen&0x04 && ( width != d_width || height != d_height )&&( ( format == IMGFMT_YV12 ) ) )
{
Index: vo_md5.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_md5.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_md5.c 17 Feb 2002 08:24:43 -0000 1.12
+++ vo_md5.c 28 Aug 2002 21:32:32 -0000 1.13
@@ -38,10 +38,10 @@
static FILE * md5_file;
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
md5_file = fopen ("md5", "w");
- return video_out_pgm.config (width, height, d_width,d_height,fullscreen, title, format,info);
+ return video_out_pgm.config (width, height, d_width,d_height,fullscreen, title, format);
}
static const vo_info_t*
Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vo_mga.c 5 May 2002 18:58:42 -0000 1.31
+++ vo_mga.c 28 Aug 2002 21:32:32 -0000 1.32
@@ -58,7 +58,7 @@
#define FBDEV "/dev/fb0"
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
// if (f >= 0) mga_uninit();
Index: vo_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vo_mpegpes.c 2 Jun 2002 21:00:38 -0000 1.33
+++ vo_mpegpes.c 28 Aug 2002 21:32:32 -0000 1.34
@@ -65,7 +65,7 @@
};
static uint32_t
-config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)
{
#ifdef HAVE_DVB
switch(s_height){
Index: vo_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_null.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vo_null.c 13 Apr 2002 19:14:33 -0000 1.9
+++ vo_null.c 28 Aug 2002 21:32:32 -0000 1.10
@@ -70,7 +70,7 @@
}
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
image_width = width;
image_height = height;
Index: vo_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_odivx.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_odivx.c 17 Feb 2002 08:24:43 -0000 1.12
+++ vo_odivx.c 28 Aug 2002 21:32:32 -0000 1.13
@@ -200,7 +200,7 @@
extern int encode_bitrate;
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
uint32_t frame_size;
ENC_PARAM enc_param;
Index: vo_pgm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_pgm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_pgm.c 17 Feb 2002 08:24:43 -0000 1.12
+++ vo_pgm.c 28 Aug 2002 21:32:32 -0000 1.13
@@ -42,7 +42,7 @@
char vo_pgm_filename[24];
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
image_height = height;
image_width = width;
Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vo_png.c 20 May 2002 00:25:44 -0000 1.17
+++ vo_png.c 28 Aug 2002 21:32:32 -0000 1.18
@@ -60,7 +60,7 @@
}
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
image_height = height;
image_width = width;
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- vo_sdl.c 28 Aug 2002 15:55:58 -0000 1.89
+++ vo_sdl.c 28 Aug 2002 21:32:32 -0000 1.90
@@ -759,7 +759,7 @@
**/
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
//static int sdl_setup (int width, int height)
{
struct sdl_priv_s *priv = &sdl_priv;
Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- vo_svga.c 27 Jun 2002 18:09:32 -0000 1.49
+++ vo_svga.c 28 Aug 2002 21:32:32 -0000 1.50
@@ -110,7 +110,7 @@
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *info) {
+ uint32_t format) {
uint32_t req_w = (d_width > 0 ? d_width : width);
uint32_t req_h = (d_height > 0 ? d_height : height);
uint16_t vid_mode = 0;
Index: vo_syncfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_syncfb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_syncfb.c 17 Feb 2002 08:24:43 -0000 1.12
+++ vo_syncfb.c 28 Aug 2002 21:32:32 -0000 1.13
@@ -347,7 +347,7 @@
return 0;
}
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
uint_32 frame_size;
Index: vo_tdfxfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tdfxfb.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vo_tdfxfb.c 28 Aug 2002 18:38:41 -0000 1.16
+++ vo_tdfxfb.c 28 Aug 2002 21:32:32 -0000 1.17
@@ -159,7 +159,8 @@
since it actually checks the status of the card.
*/
/* first wait for the card to be ready, do not try to write every time - alex */
- do {} while((reg_IO->status & 0x1f) < 1);
+// do {} while((reg_IO->status & 0x1f) < 1);
+ usec_sleep(10*1000);
memset(vidpage, 0, screenwidth * screenheight * screendepth);
if(vo_doublebuffering) {
@@ -203,7 +204,7 @@
}
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height,
- uint32_t flags, char *title, uint32_t format, const vo_tune_info_t *info)
+ uint32_t flags, char *title, uint32_t format)
{
screenwidth = fb_vinfo.xres;
screenheight = fb_vinfo.yres;
Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- vo_vesa.c 22 Aug 2002 23:03:50 -0000 1.76
+++ vo_vesa.c 28 Aug 2002 21:32:32 -0000 1.77
@@ -585,7 +585,7 @@
*/
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
struct VbeInfoBlock vib;
struct VesaModeInfoBlock vmib;
@@ -930,7 +930,7 @@
{
if(vidix_init(width,height,x_offset,y_offset,dstW,
dstH,format,dstBpp,
- video_mode_info.XResolution,video_mode_info.YResolution,info) != 0)
+ video_mode_info.XResolution,video_mode_info.YResolution) != 0)
{
printf("vo_vesa: Can't initialize VIDIX driver\n");
vidix_name = NULL;
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- vo_x11.c 9 Aug 2002 17:43:49 -0000 1.115
+++ vo_x11.c 28 Aug 2002 21:32:32 -0000 1.116
@@ -229,7 +229,7 @@
myximage=NULL;
}
-static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info)
+static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format)
{
// int screen;
int fullscreen=0;
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- vo_xmga.c 9 Aug 2002 17:43:49 -0000 1.75
+++ vo_xmga.c 28 Aug 2002 21:32:32 -0000 1.76
@@ -203,7 +203,7 @@
vo_mga_flip_page();
}
-static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t* info)
+static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
char * mTitle=(title == NULL) ? "XMGA render" : title;
XVisualInfo vinfo;
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- vo_xv.c 28 Aug 2002 15:55:58 -0000 1.114
+++ vo_xv.c 28 Aug 2002 21:32:32 -0000 1.115
@@ -272,7 +272,7 @@
* connect to server, create and map window,
* allocate colors and (shared) memory
*/
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
// int screen;
char *hello = (title == NULL) ? "Xv render" : title;
Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- vo_xvidix.c 9 Aug 2002 17:43:49 -0000 1.50
+++ vo_xvidix.c 28 Aug 2002 21:32:32 -0000 1.51
@@ -58,7 +58,6 @@
/* VIDIX related */
static char *vidix_name;
-static vo_tune_info_t vtune;
/* Image parameters */
static uint32_t image_width;
@@ -75,7 +74,7 @@
extern void set_video_eq( int cap );
-static void set_window(int force_update,const vo_tune_info_t *info)
+static void set_window(int force_update)
{
Window mRoot;
if ( WinID )
@@ -164,7 +163,7 @@
vidix_stop();
if (vidix_init(image_width, image_height, vo_dx, vo_dy,
window_width, window_height, image_format, vo_depthonscreen,
- vo_screenwidth, vo_screenheight,info) != 0)
+ vo_screenwidth, vo_screenheight) != 0)
{
mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno));
exit_player("vidix error"); /* !!! */
@@ -193,7 +192,7 @@
* allocate colors and (shared) memory
*/
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+ uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
XVisualInfo vinfo;
XSizeHints hint;
@@ -333,10 +332,8 @@
vidix_grkey_set(&gr_key);
}
- set_window(1,info);
+ set_window(1);
- if(info) memcpy(&vtune,info,sizeof(vo_tune_info_t));
- else memset(&vtune,0,sizeof(vo_tune_info_t));
XFlush(mDisplay);
XSync(mDisplay, False);
@@ -359,7 +356,7 @@
const int event = vo_x11_check_events(mDisplay);
if ((event & VO_EVENT_RESIZE) || (event & VO_EVENT_EXPOSE))
- set_window(0,&vtune);
+ set_window(0);
return;
}
@@ -445,7 +442,7 @@
if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )
{
panscan_calc();
- set_window( 0,&vtune );
+ set_window(0);
}
return VO_TRUE;
case VOCTRL_SET_EQUALIZER:
Index: vo_yuv4mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_yuv4mpeg.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_yuv4mpeg.c 6 Jul 2002 15:20:34 -0000 1.10
+++ vo_yuv4mpeg.c 28 Aug 2002 21:32:32 -0000 1.11
@@ -72,7 +72,7 @@
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format, const vo_tune_info_t *tuneinfo)
+ uint32_t format)
{
image_height = height;
image_width = width;
Index: vo_zr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vo_zr.c 5 Aug 2002 20:49:58 -0000 1.18
+++ vo_zr.c 28 Aug 2002 21:32:32 -0000 1.19
@@ -290,7 +290,7 @@
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+ uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
int i, tmp, stretchx, stretchy;
framenum = 0;
Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vosub_vidix.c 16 Aug 2002 22:25:45 -0000 1.52
+++ vosub_vidix.c 28 Aug 2002 21:32:32 -0000 1.53
@@ -51,7 +51,6 @@
static vidix_yuv_t dstrides;
static uint32_t (*server_control)(uint32_t request, void *data, ...);
-static int vidix_get_bes_da(bes_da_t *);
static int vidix_get_video_eq(vidix_video_eq_t *info);
static int vidix_set_video_eq(const vidix_video_eq_t *info);
static int vidix_get_num_fx(unsigned *info);
@@ -389,24 +388,6 @@
return(vdlSetGrKeys(vidix_handler, gr_key));
}
-static int vidix_get_bes_da(bes_da_t *info)
-{
- if(!video_on) return EPERM;
- info->dest.x = vidix_play.src.x;
- info->dest.y = vidix_play.src.y;
- info->dest.w = vidix_play.src.w;
- info->dest.h = vidix_play.src.h;
- info->dest.pitch.y = vidix_play.dest.pitch.y;
- info->dest.pitch.u = vidix_play.dest.pitch.u;
- info->dest.pitch.v = vidix_play.dest.pitch.v;
- info->flags = vidix_play.flags;
- info->frame_size = vidix_play.frame_size;
- info->num_frames = vidix_play.num_frames;
- memcpy(info->offsets,vidix_play.offsets,sizeof(unsigned)*vidix_play.num_frames);
- memcpy(&info->offset,&vidix_play.offset,sizeof(vidix_yuv_t));
- info->dga_addr = vidix_play.dga_addr;
- return 0;
-}
static int vidix_get_video_eq(vidix_video_eq_t *info)
{
@@ -448,7 +429,7 @@
int vidix_init(unsigned src_width,unsigned src_height,
unsigned x_org,unsigned y_org,unsigned dst_width,
unsigned dst_height,unsigned format,unsigned dest_bpp,
- unsigned vid_w,unsigned vid_h,const void *info)
+ unsigned vid_w,unsigned vid_h)
{
size_t i;
int err;
@@ -529,48 +510,7 @@
vidix_play.dest.h = dst_height;
vidix_play.num_frames=vo_doublebuffering?NUM_FRAMES-1:1;
vidix_play.src.pitch.y = vidix_play.src.pitch.u = vidix_play.src.pitch.v = 0;
- if(info)
- {
- switch(((const vo_tune_info_t *)info)->pitch[0])
- {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: vidix_play.src.pitch.y = ((const vo_tune_info_t *)info)->pitch[0];
- break;
- default: break;
- }
- switch(((const vo_tune_info_t *)info)->pitch[1])
- {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: vidix_play.src.pitch.u = ((const vo_tune_info_t *)info)->pitch[1];
- break;
- default: break;
- }
- switch(((const vo_tune_info_t *)info)->pitch[2])
- {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: vidix_play.src.pitch.v = ((const vo_tune_info_t *)info)->pitch[2];
- break;
- default: break;
- }
- }
+
if((err=vdlConfigPlayback(vidix_handler,&vidix_play))!=0)
{
printf("vosub_vidix: Can't configure playback: %s\n",strerror(err));
Index: vosub_vidix.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vosub_vidix.h 31 Jan 2002 10:23:39 -0000 1.8
+++ vosub_vidix.h 28 Aug 2002 21:32:32 -0000 1.9
@@ -17,7 +17,7 @@
int vidix_init(unsigned src_width,unsigned src_height,
unsigned dest_x,unsigned dest_y,unsigned dst_width,
unsigned dst_height,unsigned format,unsigned dest_bpp,
- unsigned vid_w,unsigned vid_h,const void *info);
+ unsigned vid_w,unsigned vid_h);
int vidix_start(void);
int vidix_stop(void);
void vidix_term( void );
More information about the MPlayer-cvslog
mailing list