Skip to content

V
vlc
Commit 176465d2 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * ./configure.in: fix for obscure architectures like hppa where target_os
    isn't properly detected.
  * ./include/video_output.h: got rid of pf_setpalette; I'll find a nicer way.
  * ./plugins/mga.c: fixed MGA module compilation. Doesn't work yet, though.
parent aea6698d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 673 additions and 739 deletions
configure
View file @ 176465d2
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.in
View file @ 176465d2
......@@ -292,7 +292,17 @@ if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
fi
ARCH=${target_cpu}
dnl
dnl Check the CPU
dnl
case x"${target_cpu}" in
x)
ARCH=unknown
;;
*)
ARCH=${target_cpu}
;;
esac
dnl
dnl default modules
......@@ -396,39 +406,43 @@ AC_CACHE_CHECK([if linker needs -framework vecLib],
if test x"$ac_cv_ld_altivec" != x"no"; then
LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib"
LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib"
LIB="${LIB} -framework vecLib"
fi
dnl
dnl Check the operating system
dnl
case ${target_os} in
linux*)
case x"${target_os}" in
x)
SYS=unknown
;;
xlinux*)
SYS=linux
;;
bsdi*)
xbsdi*)
SYS=bsdi
;;
darwin*)
xdarwin*)
SYS=darwin
;;
*mingw32*)
x*mingw32*)
SYS=mingw32
AC_CHECK_TOOL(WINDRES, windres, :)
LIB_MPEG_TS="-lws2_32"
LIB_RC="-lws2_32"
;;
*nto*)
x*nto*)
SYS=nto
LIB_X11="${LIB_X11} -lsocket"
LIB_XVIDEO="${LIB_XVIDEO} -lsocket"
;;
beos)
xbeos)
SYS=beos
LIB="${LIB} -lbe"
LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
PLDFLAGS="${PLDFLAGS} -nostart"
;;
*)
x*)
SYS=${target_os}
;;
esac
......@@ -927,6 +941,16 @@ AC_ARG_ENABLE(fb,
PLUGINS="${PLUGINS} fb"
fi ])
dnl
dnl Linux MGA module
dnl
AC_ARG_ENABLE(mga,
[ --enable-mga Linux kernel Matrox support (default disabled)],
[ if test x$enable_mga = xyes
then
PLUGINS="${PLUGINS} mga"
fi ])
dnl
dnl GGI module
dnl
......
include/modules.h
View file @ 176465d2
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.39 2002/01/04 14:01:34 sam Exp $
* $Id: modules.h,v 1.40 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -260,8 +260,6 @@ typedef struct function_list_s
struct picture_s * );
void ( * pf_display ) ( struct vout_thread_s *,
struct picture_s * );
void ( * pf_setpalette ) ( struct vout_thread_s *,
u16 *, u16 *, u16 * );
} vout;
/* Motion compensation plugin */
......
include/video_output.h
View file @ 176465d2
......@@ -5,7 +5,7 @@
* thread, and destroy a previously opened video output thread.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_output.h,v 1.70 2002/01/04 14:01:34 sam Exp $
* $Id: video_output.h,v 1.71 2002/01/05 03:49:18 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -132,8 +132,6 @@ typedef struct vout_thread_s
struct picture_s * );
void ( *pf_display ) ( struct vout_thread_s *,
struct picture_s * );
void ( *pf_setpalette ) ( struct vout_thread_s *,
u16 *, u16 *, u16 * );
/* Statistics - these numbers are not supposed to be accurate, but are a
* good indication of the thread status */
......
plugins/dummy/vout_dummy.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* vout_dummy.c: Dummy video output display method for testing purposes
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: vout_dummy.c,v 1.15 2002/01/04 14:01:34 sam Exp $
* $Id: vout_dummy.c,v 1.16 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -77,7 +77,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......
plugins/filter/deinterlace.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: deinterlace.c,v 1.3 2002/01/04 14:01:34 sam Exp $
* $Id: deinterlace.c,v 1.4 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -106,7 +106,6 @@ static void vout_getfunctions( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......
plugins/filter/distort.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: distort.c,v 1.5 2002/01/04 14:01:34 sam Exp $
* $Id: distort.c,v 1.6 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -114,7 +114,6 @@ static void vout_getfunctions( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......
plugins/filter/invert.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* invert.c : Invert video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: invert.c,v 1.5 2002/01/04 14:01:34 sam Exp $
* $Id: invert.c,v 1.6 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -99,7 +99,6 @@ static void vout_getfunctions( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......
plugins/filter/transform.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* transform.c : transform image plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: transform.c,v 1.4 2002/01/04 14:01:34 sam Exp $
* $Id: transform.c,v 1.5 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -107,7 +107,6 @@ static void vout_getfunctions( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......
plugins/filter/wall.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: wall.c,v 1.6 2002/01/04 14:01:34 sam Exp $
* $Id: wall.c,v 1.7 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -109,7 +109,6 @@ static void vout_getfunctions( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......
plugins/mga/Makefile
View file @ 176465d2
mga_SOURCES = mga.c vout_mga.c
mga_SOURCES = mga.c
plugins/mga/mga.c
View file @ 176465d2
This diff is collapsed.
plugins/mga/vout_mga.c deleted 100644 → 0
View file @ aea6698d
This diff is collapsed.
plugins/mga/vout_mga.h deleted 100644 → 0
View file @ aea6698d
/*****************************************************************************
* vout_mga.h: MGA video output display method headers
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: vout_mga.h,v 1.3 2001/03/21 13:42:34 sam Exp $
*
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Boston, MA 02111-1307, USA.
*****************************************************************************/
#ifndef __LINUX_MGAVID_H
#define __LINUX_MGAVID_H
typedef struct mga_vid_config_s
{
u32 card_type;
u32 ram_size;
u32 src_width;
u32 src_height;
u32 dest_width;
u32 dest_height;
u32 x_org;
u32 y_org;
u8 colkey_on;
u8 colkey_red;
u8 colkey_green;
u8 colkey_blue;
} mga_vid_config_t;
#define MGA_VID_CONFIG _IOR('J', 1, mga_vid_config_t)
#define MGA_VID_ON _IO ('J', 2)
#define MGA_VID_OFF _IO ('J', 3)
#define MGA_G200 0x1234
#define MGA_G400 0x5678
#endif
plugins/sdl/vout_sdl.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: vout_sdl.c,v 1.77 2002/01/05 02:22:03 sam Exp $
* $Id: vout_sdl.c,v 1.78 2002/01/05 03:49:18 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
......@@ -140,7 +140,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......@@ -596,12 +595,9 @@ static int SDLOpenDisplay( vout_thread_t *p_vout )
SDL_LockSurface( p_vout->p_sys->p_display );
/* Choose the chroma we will try first. */
switch( p_vout->render.i_chroma )
{
case FOURCC_I420:
case FOURCC_IYUV:
p_vout->output.i_chroma = SDL_IYUV_OVERLAY;
break;
case FOURCC_YUY2:
case FOURCC_YUNV:
p_vout->output.i_chroma = SDL_YUY2_OVERLAY;
......@@ -615,6 +611,8 @@ static int SDLOpenDisplay( vout_thread_t *p_vout )
p_vout->output.i_chroma = SDL_YVYU_OVERLAY;
break;
case FOURCC_YV12:
case FOURCC_I420:
case FOURCC_IYUV:
default:
p_vout->output.i_chroma = SDL_YV12_OVERLAY;
break;
......@@ -624,6 +622,10 @@ static int SDLOpenDisplay( vout_thread_t *p_vout )
SDL_CreateYUVOverlay( 32, 32, p_vout->output.i_chroma,
p_vout->p_sys->p_display );
/* FIXME: if the first overlay we find is software, don't stop,
* because we may find a hardware one later ... */
/* If this best choice failed, fall back to other chromas */
if( p_vout->p_sys->p_overlay == NULL )
{
p_vout->output.i_chroma = SDL_IYUV_OVERLAY;
......
plugins/x11/xcommon.c
View file @ 176465d2
......@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.6 2002/01/05 02:22:03 sam Exp $
* $Id: xcommon.c,v 1.7 2002/01/05 03:49:18 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -249,7 +249,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
p_function_list->functions.vout.pf_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
p_function_list->functions.vout.pf_setpalette = NULL;
}
/*****************************************************************************
......
src/video_output/video_output.c
View file @ 176465d2
......@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: video_output.c,v 1.153 2002/01/05 02:22:03 sam Exp $
* $Id: video_output.c,v 1.154 2002/01/05 03:49:18 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -132,7 +132,6 @@ vout_thread_t * vout_CreateThread ( int *pi_status,
p_vout->pf_manage = f.pf_manage;
p_vout->pf_render = f.pf_render;
p_vout->pf_display = f.pf_display;
p_vout->pf_setpalette = f.pf_setpalette;
#undef f
/* Initialize thread properties - thread id and locks will be initialized
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment