[Mplayer-cvslog] CVS: main/libvo video_out.h,1.14,1.15 video_out_internal.h,1.7,1.8 vo_3dfx.c,1.9,1.10 vo_aa.c,1.18,1.19 vo_dga.c,1.37,1.38 vo_directfb.c,1.8,1.9 vo_dxr3.c,1.39,1.40 vo_fbdev.c,1.57,1.58 vo_fsdga.c,1.6,1.7 vo_ggi.c,1.12,1.13 vo_gl.c,1.17,1.18 vo_gl2.c,1.11,1.12 vo_md5.c,1.7,1.8 vo_mga.c,1.20,1.21 vo_mpegpes.c,1.17,1.18 vo_null.c,1.4,1.5 vo_odivx.c,1.8,1.9 vo_pgm.c,1.8,1.9 vo_png.c,1.10,1.11 vo_sdl.c,1.61,1.62 vo_svga.c,1.40,1.41 vo_syncfb.c,1.8,1.9 vo_tdfxfb.c,1.4,1.5 vo_vesa.c,1.58,1.59 vo_x11.c,1.53,1.54 vo_xmga.c,1.41,1.42 vo_xv.c,1.50,1.51 vo_xvidix.c,1.13,1.14 vo_zr.c,1.6,1.7
Nick Kurshev
nick at mplayer.dev.hu
Thu Jan 31 10:52:48 CET 2002
- Previous message: [Mplayer-cvslog] CVS: main/input lirc.c,NONE,1.1 lirc.h,NONE,1.1 input.c,1.1,1.2 Makefile,1.1,1.2
- Next message: [Mplayer-cvslog] CVS: main mplayer.c,1.380,1.381 tvision.c,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv16352/libvo
Modified Files:
video_out.h video_out_internal.h vo_3dfx.c vo_aa.c vo_dga.c
vo_directfb.c vo_dxr3.c vo_fbdev.c vo_fsdga.c vo_ggi.c vo_gl.c
vo_gl2.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_zr.c
Log Message:
new info for tuning
Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- video_out.h 26 Jan 2002 16:01:26 -0000 1.14
+++ video_out.h 31 Jan 2002 09:52:45 -0000 1.15
@@ -65,6 +65,12 @@
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
{
/*
@@ -83,7 +89,9 @@
* format: fourcc of pixel format
* returns : zero on successful initialization, non-zero on error.
*/
- uint32_t (*init)(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format);
+ 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 *);
/*
* Query that given pixel format is supported or not.
Index: video_out_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- video_out_internal.h 26 Jan 2002 16:01:26 -0000 1.7
+++ video_out_internal.h 31 Jan 2002 09:52:45 -0000 1.8
@@ -21,7 +21,9 @@
*
*/
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format);
+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 *);
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);
@@ -36,7 +38,7 @@
#define LIBVO_EXTERN(x) vo_functions_t video_out_##x =\
{\
preinit,\
- init,\
+ config,\
query_format,\
get_info,\
draw_frame,\
Index: vo_3dfx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_3dfx.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vo_3dfx.c 26 Jan 2002 16:01:26 -0000 1.9
+++ vo_3dfx.c 31 Jan 2002 09:52:45 -0000 1.10
@@ -312,7 +312,7 @@
}
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
int fd;
char *name = ":0.0";
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vo_aa.c 26 Jan 2002 16:01:26 -0000 1.18
+++ vo_aa.c 31 Jan 2002 09:52:45 -0000 1.19
@@ -205,9 +205,9 @@
}
}
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width,
+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 format,const vo_tune_info_t *info) {
/*
* main init
* called by mplayer
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- vo_dga.c 26 Jan 2002 16:01:26 -0000 1.37
+++ vo_dga.c 31 Jan 2002 09:52:45 -0000 1.38
@@ -23,8 +23,8 @@
* - works only on x86 architectures
*
* $Log$
- * Revision 1.37 2002/01/26 16:01:26 nick
- * Extensions for video accelerated architecture
+ * Revision 1.38 2002/01/31 09:52:45 nick
+ * new info for tuning
*
* Revision 1.35 2001/12/28 20:52:54 alex
* use XF86VidMode later in init (at line 1031) only if we've got support (if have_vm==1)
@@ -803,9 +803,9 @@
//---------------------------------------------------------
-static uint32_t init( uint32_t width, uint32_t height,
+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 )
+ uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info )
{
int x_off, y_off;
Index: vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_directfb.c 26 Jan 2002 18:35:29 -0000 1.8
+++ vo_directfb.c 31 Jan 2002 09:52:45 -0000 1.9
@@ -326,9 +326,9 @@
}
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_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)
+ uint32_t format,const vo_tune_info_t *info)
{
/*
* (Locals)
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- vo_dxr3.c 26 Jan 2002 16:01:26 -0000 1.39
+++ vo_dxr3.c 31 Jan 2002 09:52:45 -0000 1.40
@@ -96,7 +96,7 @@
}
#endif
-static uint32_t init(uint32_t scr_width, uint32_t scr_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t scr_width, uint32_t scr_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
{
int tmp1, tmp2;
em8300_register_t reg;
Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- vo_fbdev.c 27 Jan 2002 18:06:56 -0000 1.57
+++ vo_fbdev.c 31 Jan 2002 09:52:45 -0000 1.58
@@ -896,9 +896,9 @@
fflush(vt_fp);
}
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_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)
+ uint32_t format,const vo_tune_info_t *info)
{
struct fb_cmap *cmap;
int vm = fullscreen & 0x02;
Index: vo_fsdga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fsdga.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_fsdga.c 26 Jan 2002 16:01:26 -0000 1.6
+++ vo_fsdga.c 31 Jan 2002 09:52:45 -0000 1.7
@@ -307,9 +307,9 @@
-static uint32_t init( uint32_t width, uint32_t height,
+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 )
+ uint32_t fullscreen,char *title,uint32_t format,const vo_tune_info_t *info )
{
int bank, ram;
Index: vo_ggi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_ggi.c 26 Jan 2002 16:01:26 -0000 1.12
+++ vo_ggi.c 31 Jan 2002 09:52:45 -0000 1.13
@@ -235,8 +235,8 @@
return(ret);
}
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
vo_depthonscreen = 32;
printf("ggi-init: This driver has got bugs, if you can, fix them.\n");
Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vo_gl.c 26 Jan 2002 16:01:26 -0000 1.17
+++ vo_gl.c 31 Jan 2002 09:52:45 -0000 1.18
@@ -96,7 +96,7 @@
* allocate colors and (shared) memory
*/
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+init(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)
{
// int screen;
unsigned int fg, bg;
Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vo_gl2.c 26 Jan 2002 16:01:26 -0000 1.11
+++ vo_gl2.c 31 Jan 2002 09:52:45 -0000 1.12
@@ -602,7 +602,7 @@
* allocate colors and (shared) memory
*/
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+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)
{
// int screen;
unsigned int fg, bg;
Index: vo_md5.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_md5.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_md5.c 26 Jan 2002 16:01:26 -0000 1.7
+++ vo_md5.c 31 Jan 2002 09:52:45 -0000 1.8
@@ -37,10 +37,10 @@
static FILE * md5_file;
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+init(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)
{
md5_file = fopen ("md5", "w");
- return video_out_pgm.init (width, height, d_width,d_height,fullscreen, title, format);
+ return video_out_pgm.config (width, height, d_width,d_height,fullscreen, title, format,info);
}
static const vo_info_t*
Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_mga.c 26 Jan 2002 16:01:26 -0000 1.20
+++ vo_mga.c 31 Jan 2002 09:52:45 -0000 1.21
@@ -55,7 +55,7 @@
#include "mga_common.c"
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+init(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)
{
char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
Index: vo_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vo_mpegpes.c 26 Jan 2002 16:01:26 -0000 1.17
+++ vo_mpegpes.c 31 Jan 2002 09:52:45 -0000 1.18
@@ -85,7 +85,7 @@
};
static uint32_t
-init(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
#ifdef HAVE_DVB
//|O_NONBLOCK
Index: vo_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_null.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_null.c 26 Jan 2002 16:01:26 -0000 1.4
+++ vo_null.c 31 Jan 2002 09:52:45 -0000 1.5
@@ -67,7 +67,7 @@
}
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
image_width = width;
image_height = height;
Index: vo_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_odivx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_odivx.c 26 Jan 2002 16:01:26 -0000 1.8
+++ vo_odivx.c 31 Jan 2002 09:52:45 -0000 1.9
@@ -199,7 +199,7 @@
extern int encode_bitrate;
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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 frame_size;
ENC_PARAM enc_param;
Index: vo_pgm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_pgm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_pgm.c 26 Jan 2002 16:01:26 -0000 1.8
+++ vo_pgm.c 31 Jan 2002 09:52:45 -0000 1.9
@@ -41,7 +41,7 @@
char vo_pgm_filename[24];
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
image_height = height;
image_width = width;
Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_png.c 26 Jan 2002 16:30:43 -0000 1.10
+++ vo_png.c 31 Jan 2002 09:52:45 -0000 1.11
@@ -63,7 +63,7 @@
}
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
if (fullscreen&0x04 && (width != d_width || height != d_height) &&
((format==IMGFMT_YV12) /*|| (format == IMGFMT_I420) || (format == IMGFMT_IYUV)*/)) {
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- vo_sdl.c 26 Jan 2002 16:01:26 -0000 1.61
+++ vo_sdl.c 31 Jan 2002 09:52:45 -0000 1.62
@@ -609,7 +609,7 @@
**/
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+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 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vo_svga.c 26 Jan 2002 16:01:26 -0000 1.40
+++ vo_svga.c 31 Jan 2002 09:52:45 -0000 1.41
@@ -121,9 +121,9 @@
return(0);
}
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_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) {
+ uint32_t format,const vo_tune_info_t *info) {
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_syncfb.c 26 Jan 2002 16:01:26 -0000 1.8
+++ vo_syncfb.c 31 Jan 2002 09:52:45 -0000 1.9
@@ -60,7 +60,7 @@
static int vo_conf_cinemode = 0;
-static syncfb_config_t config;
+static syncfb_config_t _config;
static syncfb_capability_t sfb_caps;
static syncfb_buffer_info_t bufinfo;
@@ -90,26 +90,26 @@
uint_32 bespitch,h,w;
- bespitch = config.src_pitch;
+ bespitch = _config.src_pitch;
dest32 = (uint_32 *)vid_data;
- for(h=0; h < config.src_height/2; h++)
+ for(h=0; h < _config.src_height/2; h++)
{
cbp = cb;
crp = cr;
- for(w=0; w < config.src_width/2; w++)
+ for(w=0; w < _config.src_width/2; w++)
{
*dest32++ = (*y) + ((*cr)<<8) + ((*(y+1))<<16) + ((*cb)<<24);
y++; y++; cb++; cr++;
}
- dest32 += (bespitch - config.src_width) / 2;
+ dest32 += (bespitch - _config.src_width) / 2;
- for(w=0; w < config.src_width/2; w++)
+ for(w=0; w < _config.src_width/2; w++)
{
*dest32++ = (*y) + ((*crp)<<8) + ((*(y+1))<<16) + ((*cbp)<<24);
y++; y++; cbp++; crp++;
}
- dest32 += (bespitch - config.src_width) / 2;
+ dest32 += (bespitch - _config.src_width) / 2;
}
}
@@ -120,21 +120,21 @@
uint_8 *dest, *tmp;
uint_32 bespitch,h,w;
- bespitch = config.src_pitch;
+ bespitch = _config.src_pitch;
dest = frame_mem + bufinfo.offset;
- for(h=0; h < config.src_height; h++)
+ for(h=0; h < _config.src_height; h++)
{
- memcpy(dest, y, config.src_width);
- y += config.src_width;
+ memcpy(dest, y, _config.src_width);
+ y += _config.src_width;
dest += bespitch;
}
dest = frame_mem + bufinfo.offset_p2;
- for(h=0; h < config.src_height/2; h++)
+ for(h=0; h < _config.src_height/2; h++)
{
tmp = dest;
- for(w=0; w < config.src_width/2; w++)
+ for(w=0; w < _config.src_width/2; w++)
{
*tmp++ = *cr++;
*tmp++ = *cb++;
@@ -154,13 +154,13 @@
uint_8 *dest, *tmp;
uint_32 bespitch,h,w;
- bespitch = config.src_pitch;
+ bespitch = _config.src_pitch;
dest = frame_mem + bufinfo.offset + (bespitch * 16 * slice_num);
for(h=0; h < 16; h++)
{
- memcpy(dest, y, config.src_width);
- y += config.src_width;
+ memcpy(dest, y, _config.src_width);
+ y += _config.src_width;
dest += bespitch;
}
@@ -168,7 +168,7 @@
for(h=0; h < 8; h++)
{
tmp = dest;
- for(w=0; w < config.src_width/2; w++)
+ for(w=0; w < _config.src_width/2; w++)
{
*tmp++ = *cr++;
*tmp++ = *cb++;
@@ -183,7 +183,7 @@
uint_8 *dest;
uint_32 bespitch,h;
- bespitch = config.src_pitch;
+ bespitch = _config.src_pitch;
dest = frame_mem + bufinfo.offset + (bespitch * ypos);
for(h=0; h < ysize; h++)
@@ -224,26 +224,26 @@
uint_32 bespitch,h,w;
- bespitch = config.src_pitch;
+ bespitch = _config.src_pitch;
dest32 = (uint_32 *)(vid_data + (bespitch * 16 * slice_num) * 2);
for(h=0; h < 8; h++)
{
cbp = cb;
crp = cr;
- for(w=0; w < config.src_width/2; w++)
+ for(w=0; w < _config.src_width/2; w++)
{
*dest32++ = (*y) + ((*cr)<<8) + ((*(y+1))<<16) + ((*cb)<<24);
y++; y++; cb++; cr++;
}
- dest32 += (bespitch - config.src_width) / 2;
+ dest32 += (bespitch - _config.src_width) / 2;
- for(w=0; w < config.src_width/2; w++)
+ for(w=0; w < _config.src_width/2; w++)
{
*dest32++ = (*y) + ((*crp)<<8) + ((*(y+1))<<16) + ((*cbp)<<24);
y++; y++; cbp++; crp++;
}
- dest32 += (bespitch - config.src_width) / 2;
+ dest32 += (bespitch - _config.src_width) / 2;
}
}
@@ -280,7 +280,7 @@
flip_page(void)
{
-// memset(frame_mem + bufinfo.offset_p2, 0x80, config.src_width*config.src_height);
+// memset(frame_mem + bufinfo.offset_p2, 0x80, _config.src_width*config.src_height);
ioctl(f,SYNCFB_COMMIT_BUFFER,&bufinfo);
if ( dbg_singleframe ) {
@@ -346,7 +346,7 @@
return 0;
}
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
uint_32 frame_size;
@@ -366,54 +366,54 @@
if (ioctl(f,SYNCFB_GET_CONFIG,&config)) perror("Error in mga_vid_config ioctl");
if (sfb_caps.palettes & (1<<VIDEO_PALETTE_YUV420P3) ) {
- config.src_palette= VIDEO_PALETTE_YUV420P3;
+ _config.src_palette= VIDEO_PALETTE_YUV420P3;
printf("using palette yuv420p3\n");
}else if ( sfb_caps.palettes & (1<<VIDEO_PALETTE_YUV420P2) ) {
- config.src_palette= VIDEO_PALETTE_YUV420P2;
+ _config.src_palette= VIDEO_PALETTE_YUV420P2;
printf("using palette yuv420p2\n");
} else if ( sfb_caps.palettes & (1<<VIDEO_PALETTE_YUV422) ) {
- config.src_palette= VIDEO_PALETTE_YUV422;
+ _config.src_palette= VIDEO_PALETTE_YUV422;
printf("using palette yuv422\n");
} else {
printf("no supported palette found\n");
return -1;
}
- // config.src_palette= VIDEO_PALETTE_YUV422;
+ // _config.src_palette= VIDEO_PALETTE_YUV422;
if ( vo_conf_cinemode ) {
- config.default_repeat = 3;
+ _config.default_repeat = 3;
} else {
- config.default_repeat = 2;
+ _config.default_repeat = 2;
}
- conf_palette = config.src_palette;
+ conf_palette = _config.src_palette;
if ( vo_conf_deinterlace ) {
- config.syncfb_mode = SYNCFB_FEATURE_SCALE | SYNCFB_FEATURE_BLOCK_REQUEST | SYNCFB_FEATURE_DEINTERLACE;
- config.default_repeat = 1;
+ _config.syncfb_mode = SYNCFB_FEATURE_SCALE | SYNCFB_FEATURE_BLOCK_REQUEST | SYNCFB_FEATURE_DEINTERLACE;
+ _config.default_repeat = 1;
} else {
- config.syncfb_mode = SYNCFB_FEATURE_SCALE | SYNCFB_FEATURE_BLOCK_REQUEST;
+ _config.syncfb_mode = SYNCFB_FEATURE_SCALE | SYNCFB_FEATURE_BLOCK_REQUEST;
}
- config.fb_screen_size = (RAM_SIZE-4)*0x100000; //(1280 * 1024 * 32) / 8;
- config.src_width = width;
- config.src_height= height;
+ _config.fb_screen_size = (RAM_SIZE-4)*0x100000; //(1280 * 1024 * 32) / 8;
+ _config.src_width = width;
+ _config.src_height= height;
- config.image_width = d_width;
- config.image_height= d_height;
- //config.image_width = 1024;
- //config.image_height= 576;
+ _config.image_width = d_width;
+ _config.image_height= d_height;
+ //_config.image_width = 1024;
+ //_config.image_height= 576;
- config.image_xorg= 0;
- config.image_yorg= 0;
+ _config.image_xorg= 0;
+ _config.image_yorg= 0;
printf ("BES Sourcer size: %d x %d\n", width, height);
ioctl(f,SYNCFB_ON,0);
- if (ioctl(f,SYNCFB_SET_CONFIG,&config)) perror("Error in mga_vid_config ioctl");
+ if (ioctl(f,SYNCFB_SET_CONFIG,&_config)) perror("Error in mga_vid_config ioctl");
- printf ("Framebuffer memory: %ld in %ld buffers\n", sfb_caps.memory_size, config.buffers);
+ printf ("Framebuffer memory: %ld in %ld buffers\n", sfb_caps.memory_size, _config.buffers);
frame_size = ((width + 31) & ~31) * height + (((width + 31) & ~31) * height) / 2;
frame_mem = (uint_8*)mmap(0,sfb_caps.memory_size,PROT_WRITE,MAP_SHARED,f,0);
Index: vo_tdfxfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tdfxfb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_tdfxfb.c 26 Jan 2002 16:01:26 -0000 1.4
+++ vo_tdfxfb.c 31 Jan 2002 09:52:45 -0000 1.5
@@ -298,8 +298,8 @@
#endif
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height,
- uint32_t fullscreen, char *title, uint32_t format)
+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)
{
if (verbose) {
Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- vo_vesa.c 26 Jan 2002 19:12:49 -0000 1.58
+++ vo_vesa.c 31 Jan 2002 09:52:45 -0000 1.59
@@ -542,7 +542,7 @@
* bit 3 (0x08) enables flipping (-flip) (NK: and for what?)
*/
static uint32_t
-init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+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)
{
struct VbeInfoBlock vib;
struct VesaModeInfoBlock vmib;
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vo_x11.c 31 Jan 2002 00:37:59 -0000 1.53
+++ vo_x11.c 31 Jan 2002 09:52:45 -0000 1.54
@@ -237,7 +237,7 @@
}
}
-static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format )
+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)
{
// int screen;
int fullscreen=0;
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- vo_xmga.c 26 Jan 2002 16:01:26 -0000 1.41
+++ vo_xmga.c 31 Jan 2002 09:52:45 -0000 1.42
@@ -200,7 +200,7 @@
vo_mga_flip_page();
}
-static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format )
+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)
{
char * frame_mem;
// uint32_t frame_size;
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- vo_xv.c 31 Jan 2002 00:37:59 -0000 1.50
+++ vo_xv.c 31 Jan 2002 09:52:45 -0000 1.51
@@ -308,7 +308,7 @@
* connect to server, create and map window,
* allocate colors and (shared) memory
*/
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+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)
{
// 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_xvidix.c 26 Jan 2002 19:42:21 -0000 1.13
+++ vo_xvidix.c 31 Jan 2002 09:52:45 -0000 1.14
@@ -183,8 +183,8 @@
/* connect to server, create and map window,
* allocate colors and (shared) memory
*/
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+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)
{
XVisualInfo vinfo;
XSizeHints hint;
Index: vo_zr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_zr.c 26 Jan 2002 19:01:32 -0000 1.6
+++ vo_zr.c 31 Jan 2002 09:52:45 -0000 1.7
@@ -194,8 +194,8 @@
close(vdes);
}
-static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+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)
{
int j, stretchx, stretchy;
/* this allows to crop parts from incoming picture,
- Previous message: [Mplayer-cvslog] CVS: main/input lirc.c,NONE,1.1 lirc.h,NONE,1.1 input.c,1.1,1.2 Makefile,1.1,1.2
- Next message: [Mplayer-cvslog] CVS: main mplayer.c,1.380,1.381 tvision.c,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list