github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7125 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2002-08-28 21:32:32 +00:00
parent 56e2afddf9
commit 64bedd9683
39 changed files with 52 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libmpcodecs/dec_video.c
View File

@ -34,7 +34,6 @@ extern int verbose; // defined in mplayer.c
extern double video_time_usage;
extern double vout_time_usage;
extern vo_vaa_t vo_vaa;
#include "postproc/postprocess.h"

5
libmpcodecs/vd.c
View File

@ -245,18 +245,17 @@ csp_again:
}
// Time to config libvo!
mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
sh->disp_w,sh->disp_h,
screen_size_x,screen_size_y,
fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
"MPlayer",out_fmt);
// memset(&vtune,0,sizeof(vo_tune_info_t));
if(vf->config(vf,sh->disp_w,sh->disp_h,
screen_size_x,screen_size_y,
fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
out_fmt)==0){
// "MPlayer",out_fmt,&vtune)){
// "MPlayer",out_fmt)){
mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO);
sh->vf_inited=-1;
return 0;

48
libvo/video_out.h
View File

@ -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 @@ typedef struct vo_info_s
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 @@ typedef struct vo_functions_s
*/
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

3
libvo/video_out_internal.h
View File

@ -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 check_events(void);
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 =\
{\

2
libvo/vo_3dfx.c
View File

@ -312,7 +312,7 @@ update_target(void)
}
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";

2
libvo/vo_aa.c
View File

@ -229,7 +229,7 @@ printosdprogbar(){
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

5
libvo/vo_dga.c
View File

@ -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 @@ int check_res( int num, int x, int y, int bpp,
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;

2
libvo/vo_directfb.c
View File

@ -529,7 +529,7 @@ if (verbose) printf("DirectFB: Preinit entered\n");
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)

2
libvo/vo_dxr2.c
View File

@ -583,7 +583,7 @@ static void dxr2_set_overlay_window(void) {
}
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;

2
libvo/vo_dxr3.c
View File

@ -237,7 +237,7 @@ uint32_t control(uint32_t request, void *data, ...)
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;

4
libvo/vo_fbdev.c
View File

@ -840,7 +840,7 @@ static void vt_set_textarea(int u, int l)
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 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
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;

2
libvo/vo_fsdga.c
View File

@ -302,7 +302,7 @@ uninit(void)
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;

2
libvo/vo_ggi.c
View File

@ -85,7 +85,7 @@ static void draw_osd_directbuffer(void);
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 =
{

2
libvo/vo_gif89a.c
View File

@ -50,7 +50,7 @@ GifFileType *newgif=NULL;
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

2
libvo/vo_gl.c
View File

@ -95,7 +95,7 @@ static void resize(int x,int y){
* 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;

2
libvo/vo_gl2.c
View File

@ -602,7 +602,7 @@ static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsi
* 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;

2
libvo/vo_jpeg.c
View File

@ -58,7 +58,7 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
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 ) ) )
{

4
libvo/vo_md5.c
View File

@ -38,10 +38,10 @@ extern char vo_pgm_filename[24];
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*

2
libvo/vo_mga.c
View File

@ -58,7 +58,7 @@ static vo_info_t vo_info =
#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();

2
libvo/vo_mpegpes.c
View File

@ -65,7 +65,7 @@ static vo_info_t vo_info =
};
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){

2
libvo/vo_null.c
View File

@ -70,7 +70,7 @@ query_format(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)
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;

2
libvo/vo_odivx.c
View File

@ -200,7 +200,7 @@ query_format(uint32_t format)
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;

2
libvo/vo_pgm.c
View File

@ -42,7 +42,7 @@ static uint8_t *image=NULL;
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;

2
libvo/vo_png.c
View File

@ -60,7 +60,7 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
}
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;

2
libvo/vo_sdl.c
View File

@ -759,7 +759,7 @@ static void set_fullmode (int mode) {
**/
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;

2
libvo/vo_svga.c
View File

@ -110,7 +110,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 *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;

2
libvo/vo_syncfb.c
View File

@ -347,7 +347,7 @@ query_format(uint32_t format)
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;

5
libvo/vo_tdfxfb.c
View File

@ -159,7 +159,8 @@ static void clear_screen()
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 void setup_screen(uint32_t full)
}
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;

4
libvo/vo_vesa.c
View File

@ -585,7 +585,7 @@ static int set_refresh(unsigned x, unsigned y, unsigned mode,struct VesaCRTCInfo
*/
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 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
{
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;

2
libvo/vo_x11.c
View File

@ -229,7 +229,7 @@ static void freeMyXImage()
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;

2
libvo/vo_xmga.c
View File

@ -203,7 +203,7 @@ static void flip_page(void){
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;

2
libvo/vo_xv.c
View File

@ -272,7 +272,7 @@ static int xv_get_eq(char *name, int *value)
* 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;

15
libvo/vo_xvidix.c
View File

@ -58,7 +58,6 @@ static vidix_grkey_t gr_key;
/* VIDIX related */
static char *vidix_name;
static vo_tune_info_t vtune;
/* Image parameters */
static uint32_t image_width;
@ -75,7 +74,7 @@ static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
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 @@ static void set_window(int force_update,const vo_tune_info_t *info)
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 @@ static void set_window(int force_update,const vo_tune_info_t *info)
* 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 @@ else
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 @@ static void check_events(void)
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 @@ static uint32_t control(uint32_t request, void *data, ...)
if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )
{
panscan_calc();
set_window( 0,&vtune );
set_window(0);
}
return VO_TRUE;
case VOCTRL_SET_EQUALIZER:

2
libvo/vo_yuv4mpeg.c
View File

@ -72,7 +72,7 @@ static int config_interlace = Y4M_ILACE_NONE;
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;

2
libvo/vo_zr.c
View File

@ -290,7 +290,7 @@ int zr_geometry_sane(geo_t *g, unsigned int width, unsigned int 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,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;

64
libvo/vosub_vidix.c
View File

@ -51,7 +51,6 @@ static vo_functions_t * vo_server;
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 @@ int vidix_grkey_set(const vidix_grkey_t *gr_key)
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 @@ static int is_422_planes_eq=0;
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 @@ int vidix_init(unsigned src_width,unsigned src_height,
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));

2
libvo/vosub_vidix.h
View File

@ -17,7 +17,7 @@ int vidix_preinit(const char *drvname,void *server);
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 );

4
mencoder.c
View File

@ -61,10 +61,6 @@ static char* banner_text=
#include "fastmemcpy.h"
/**************************************************************************
Video accelerated architecture
**************************************************************************/
vo_vaa_t vo_vaa; // FIXME! remove me!
int vo_doublebuffering=0;
int vo_directrendering=0;
int vo_config_count=0;

8
mplayer.c
View File

@ -105,11 +105,6 @@ play_tree_t* playtree;
m_config_t* mconfig;
/**************************************************************************
Video accelerated architecture
**************************************************************************/
vo_vaa_t vo_vaa;
//**************************************************************************//
// Config file
//**************************************************************************//
@ -510,13 +505,10 @@ int i;
int gui_no_filename=0;
//vo_tune_info_t vtune;
mp_msg_init();
mp_msg_set_level(MSGL_STATUS);
mp_msg(MSGT_CPLAYER,MSGL_INFO,banner_text);
// memset(&vtune,0,sizeof(vo_tune_info_t));
/* Test for cpu capabilities (and corresponding OS support) for optimizing */
#ifdef ARCH_X86
GetCpuCaps(&gCpuCaps);