Commit 22f2fa61 authored by Sam Hocevar's avatar Sam Hocevar

* ./evc/plugins.vcp.in: fixed plugin entry points for WinCE.

  * ./modules/*: fixed a bunch of modules so that they compile under WinCE,
    we now have access_file and the mpeg demux and video decoder working
    (http://zoy.org/~sam/vlc/pocketvlc2.png).
parent c3a40bca
......@@ -334,7 +334,7 @@
#define HAVE_STRUCT_TIMESPEC 1
/* Define to 1 if you have the `swab' function. */
#define HAVE_SWAB 1
/* #define HAVE_SWAB 1 */
/* Define to 1 if you have the <sys/int_types.h> header file. */
/* #undef HAVE_SYS_INT_TYPES_H */
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
* vlc.c: the vlc player, WinCE version
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: vlc.c,v 1.2 2002/11/13 20:51:04 sam Exp $
* $Id: vlc.c,v 1.3 2002/11/20 13:37:35 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -52,8 +52,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPTSTR lpCmdLine, int nCmdShow )
{
int i_ret;
int i_argc = 2;
char * ppsz_argv[] = { lpCmdLine, "-vv", NULL };
int i_argc = 5;
char * ppsz_argv[] = { lpCmdLine, "-vv", "--intf", "dummy", "shovel.mpeg", NULL };
HWND window;
MSG message;
......
......@@ -15,6 +15,42 @@ Package=<4>
###############################################################################
Project: "plugin_a52tospdif"=.\plugin_a52tospdif.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_access_file"=.\plugin_access_file.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_access_http"=.\plugin_access_http.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_dummy"=.\plugin_dummy.vcp - Package Owner=<4>
Package=<5>
......@@ -27,6 +63,186 @@ Package=<4>
###############################################################################
Project: "plugin_es"=.\plugin_es.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_i420_rgb"=.\plugin_i420_rgb.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_i420_yuy2"=.\plugin_i420_yuy2.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_i422_yuy2"=.\plugin_i422_yuy2.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_idct"=.\plugin_idct.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_idctclassic"=.\plugin_idctclassic.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_ipv4"=.\plugin_ipv4.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_memcpy"=.\plugin_memcpy.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_motion"=.\plugin_motion.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_mpeg_audio"=.\plugin_mpeg_audio.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_mpeg_system"=.\plugin_mpeg_system.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_mpeg_video"=.\plugin_mpeg_video.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_ps"=.\plugin_ps.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_spudec"=.\plugin_spudec.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_ts"=.\plugin_ts.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "vlc"=.\vlc.vcp - Package Owner=<4>
Package=<5>
......
......@@ -4,7 +4,7 @@
* includes all common video types and constants.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video.h,v 1.59 2002/11/19 20:45:08 gbazin Exp $
* $Id: video.h,v 1.60 2002/11/20 13:37:35 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -95,10 +95,10 @@ struct picture_heap_t
/* Picture static properties - those properties are fixed at initialization
* and should NOT be modified */
int i_width; /* picture width */
int i_height; /* picture height */
unsigned int i_width; /* picture width */
unsigned int i_height; /* picture height */
vlc_fourcc_t i_chroma; /* picture chroma */
int i_aspect; /* aspect ratio */
unsigned int i_aspect; /* aspect ratio */
/* Real pictures */
picture_t* pp_picture[VOUT_MAX_PICTURES]; /* pictures */
......
......@@ -5,7 +5,7 @@
* thread, and destroy a previously opened video output thread.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_output.h,v 1.86 2002/11/11 14:39:11 sam Exp $
* $Id: video_output.h,v 1.87 2002/11/20 13:37:35 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -142,7 +142,7 @@ struct vout_thread_t
* Prototypes
*****************************************************************************/
#define vout_CreateThread(a,b,c,d,e) __vout_CreateThread(VLC_OBJECT(a),b,c,d,e)
VLC_EXPORT( vout_thread_t *, __vout_CreateThread, ( vlc_object_t *, int, int, uint32_t, int ) );
VLC_EXPORT( vout_thread_t *, __vout_CreateThread, ( vlc_object_t *, unsigned int, unsigned int, uint32_t, unsigned int ) );
VLC_EXPORT( void, vout_DestroyThread, ( vout_thread_t * ) );
VLC_EXPORT( int, vout_ChromaCmp, ( uint32_t, uint32_t ) );
......@@ -154,7 +154,7 @@ VLC_EXPORT( void, vout_DisplayPicture, ( vout_thread_t *, picture_t *
VLC_EXPORT( void, vout_DatePicture, ( vout_thread_t *, picture_t *, mtime_t ) );
VLC_EXPORT( void, vout_LinkPicture, ( vout_thread_t *, picture_t * ) );
VLC_EXPORT( void, vout_UnlinkPicture, ( vout_thread_t *, picture_t * ) );
VLC_EXPORT( void, vout_PlacePicture, ( vout_thread_t *, int, int, int *, int *, int *, int * ) );
VLC_EXPORT( void, vout_PlacePicture, ( vout_thread_t *, unsigned int, unsigned int, unsigned int *, unsigned int *, unsigned int *, unsigned int * ) );
picture_t * vout_RenderPicture ( vout_thread_t *, picture_t *,
subpicture_t * );
......
......@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.3 2002/11/12 13:57:12 sam Exp $
* $Id: file.c,v 1.4 2002/11/20 13:37:35 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -24,16 +24,24 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#ifdef HAVE_ERRNO_H
# include <errno.h>
#endif
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
......@@ -67,8 +75,10 @@ static int Open( vlc_object_t *p_this )
{
input_thread_t * p_input = (input_thread_t *)p_this;
char * psz_name = p_input->psz_name;
#ifdef HAVE_SYS_STAT_H
int i_stat;
struct stat stat_info;
#endif
input_socket_t * p_access_data;
vlc_bool_t b_stdin;
......@@ -76,12 +86,18 @@ static int Open( vlc_object_t *p_this )
b_stdin = psz_name[0] == '-' && psz_name[1] == '\0';
#ifdef HAVE_SYS_STAT_H
if( !b_stdin && (i_stat = stat( psz_name, &stat_info )) == (-1) )
{
# ifdef HAVE_ERRNO_H
msg_Err( p_input, "cannot stat() file `%s' (%s)",
psz_name, strerror(errno));
# else
msg_Err( p_input, "cannot stat() file `%s'", psz_name );
# endif
return VLC_EGENERIC;
}
#endif
p_input->pf_read = Read;
p_input->pf_set_program = input_SetProgram;
......@@ -107,6 +123,7 @@ static int Open( vlc_object_t *p_this )
p_input->stream.b_seekable = 0;
p_input->stream.p_selected_area->i_size = 0;
}
#ifdef HAVE_SYS_STAT_H
else if( S_ISREG(stat_info.st_mode) || S_ISCHR(stat_info.st_mode)
|| S_ISBLK(stat_info.st_mode) )
{
......@@ -114,9 +131,9 @@ static int Open( vlc_object_t *p_this )
p_input->stream.p_selected_area->i_size = stat_info.st_size;
}
else if( S_ISFIFO(stat_info.st_mode)
#if !defined( SYS_BEOS ) && !defined( WIN32 )
# if !defined( SYS_BEOS ) && !defined( WIN32 )
|| S_ISSOCK(stat_info.st_mode)
#endif
# endif
)
{
p_input->stream.b_seekable = 0;
......@@ -128,6 +145,7 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_input, "unknown file type for `%s'", psz_name );
return VLC_EGENERIC;
}
#endif
}
p_input->stream.p_selected_area->i_tell = 0;
......@@ -147,14 +165,38 @@ static int Open( vlc_object_t *p_this )
{
p_access_data->i_handle = 0;
}
else if( (p_access_data->i_handle = open( psz_name,
/*O_NONBLOCK | O_LARGEFILE*/ 0 )) == (-1) )
else
{
#ifdef UNDER_CE
wchar_t psz_filename[MAX_PATH];
MultiByteToWideChar( CP_ACP, 0, psz_name, -1, psz_filename, MAX_PATH );
p_access_data->i_handle = (int)CreateFile( psz_filename,
GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL );
if( (HANDLE)p_access_data->i_handle == INVALID_HANDLE_VALUE )
{
msg_Err( p_input, "cannot open file %s", psz_name );
free( p_access_data );
return VLC_EGENERIC;
}
#else
p_access_data->i_handle = open( psz_name,
/*O_NONBLOCK | O_LARGEFILE*/ 0 );
if( p_access_data->i_handle == -1 )
{
# ifdef HAVE_ERRNO_H
msg_Err( p_input, "cannot open file %s (%s)", psz_name,
strerror(errno) );
# else
msg_Err( p_input, "cannot open file %s", psz_name );
# endif
free( p_access_data );
return VLC_EGENERIC;
}
#endif
}
return VLC_SUCCESS;
}
......@@ -189,7 +231,7 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
#ifdef UNDER_CE
if( !ReadFile( (HANDLE)p_access_data->i_handle, p_buffer, i_len,
(LPWORD)&i_ret, NULL ) )
(LPDWORD)&i_ret, NULL ) )
{
i_ret = -1;
}
......
......@@ -2,7 +2,7 @@
* a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: a52tospdif.c,v 1.13 2002/09/30 21:32:32 massiot Exp $
* $Id: a52tospdif.c,v 1.14 2002/11/20 13:37:35 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......@@ -25,7 +25,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <errno.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
......
......@@ -2,7 +2,7 @@
* video_decoder.c : video decoder thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: decoder.c,v 1.4 2002/08/29 23:53:22 massiot Exp $
* $Id: decoder.c,v 1.5 2002/11/20 13:37:35 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@zoy.org>
......@@ -27,12 +27,14 @@
*****************************************************************************/
#include <stdlib.h> /* free() */
#include <string.h> /* memcpy(), memset() */
#include <errno.h> /* errno */
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include <vlc/decoder.h>
#ifdef HAVE_ERRNO_H
# include <errno.h> /* errno */
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* getpid() */
#endif
......@@ -123,7 +125,11 @@ void vdec_InitThread( vdec_thread_t * p_vdec )
if( 0 )
#endif
{
#ifdef HAVE_ERRNO_H
msg_Warn( p_vdec, "couldn't nice() (%s)", strerror(errno) );
#else
msg_Warn( p_vdec, "couldn't nice()" );
#endif
}
p_vdec->p_idct_data = NULL;
......
......@@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: headers.c,v 1.4 2002/10/23 22:05:22 massiot Exp $
* $Id: headers.c,v 1.5 2002/11/20 13:37:35 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......@@ -207,7 +207,7 @@ static inline void LinkMatrix( quant_matrix_t * p_matrix, u8 * pi_array )
/*****************************************************************************
* ChromaToFourCC: Return a FourCC value used by the video output.
*****************************************************************************/
static inline u64 ChromaToFourCC( int i_chroma )
static inline vlc_fourcc_t ChromaToFourCC( int i_chroma )
{
switch( i_chroma )
{
......
......@@ -2,7 +2,7 @@
* idct.c : C IDCT module
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: idct.c,v 1.1 2002/08/04 17:23:42 sam Exp $
* $Id: idct.c,v 1.2 2002/11/20 13:37:35 sam Exp $
*
* Author: Gal Hendryckx <jimmy@via.ecp.fr>
*
......@@ -58,10 +58,10 @@ static void NormScan( u8 ppi_scan[2][64] )
*****************************************************************************/
static inline void IDCT( dctelem_t * p_block )
{
s32 tmp0, tmp1, tmp2, tmp3;
s32 tmp10, tmp11, tmp12, tmp13;
s32 z1, z2, z3, z4, z5;
s32 d0, d1, d2, d3, d4, d5, d6, d7;
int32_t tmp0, tmp1, tmp2, tmp3;
int32_t tmp10, tmp11, tmp12, tmp13;
int32_t z1, z2, z3, z4, z5;
int32_t d0, d1, d2, d3, d4, d5, d6, d7;
dctelem_t * dataptr;
int rowctr;
......
......@@ -2,7 +2,7 @@
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: parser.c,v 1.6 2002/10/28 22:23:23 gbazin Exp $
* $Id: parser.c,v 1.7 2002/11/20 13:37:35 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -35,9 +35,6 @@
#include <unistd.h> /* getpid() */
#endif
#include <errno.h>
#include <string.h>
#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
#endif
......
......@@ -2,7 +2,7 @@
* mpeg_es.c : Elementary Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: es.c,v 1.1 2002/08/04 17:23:42 sam Exp $
* $Id: es.c,v 1.2 2002/11/20 13:37:36 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -26,13 +26,10 @@
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */
#include <errno.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <sys/types.h>
/*****************************************************************************
* Constants
*****************************************************************************/
......
......@@ -2,7 +2,7 @@
* ps.c : Program Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: ps.c,v 1.5 2002/08/30 22:22:24 massiot Exp $
* $Id: ps.c,v 1.6 2002/11/20 13:37:36 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -26,13 +26,10 @@
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */
#include <errno.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <sys/types.h>
#include "system.h"
/*****************************************************************************
......
......@@ -2,7 +2,7 @@
* system.c: helper module for TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: system.c,v 1.6 2002/10/20 12:23:48 massiot Exp $
* $Id: system.c,v 1.7 2002/11/20 13:37:36 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -30,7 +30,6 @@
*****************************************************************************/
#include <stdlib.h>
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
#include <vlc/vlc.h>
#include <vlc/input.h>
......
......@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: ts.c,v 1.8 2002/10/20 12:23:48 massiot Exp $
* $Id: ts.c,v 1.9 2002/11/20 13:37:36 sam Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
......@@ -27,7 +27,6 @@
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#ifdef HAVE_STDINT_H
# include <stdint.h> /* uint8_t */
......
......@@ -2,7 +2,7 @@
* i420_rgb.c : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: i420_rgb.c,v 1.1 2002/08/04 17:23:43 sam Exp $
* $Id: i420_rgb.c,v 1.2 2002/11/20 13:37:36 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -25,7 +25,6 @@
* Preamble
*****************************************************************************/
#include <math.h> /* exp(), pow() */
#include <errno.h> /* ENOMEM */
#include <string.h> /* strerror() */
#include <stdlib.h> /* malloc(), free() */
......@@ -226,7 +225,7 @@ static void SetGammaTable( int *pi_table, double f_gamma )
/* Build gamma table */
for( i_y = 0; i_y < 256; i_y++ )
{
pi_table[ i_y ] = pow( (double)i_y / 256, f_gamma ) * 256;
pi_table[ i_y ] = (int)( pow( (double)i_y / 256, f_gamma ) * 256 );
}
}
......
......@@ -2,7 +2,7 @@
* i420_rgb16.c : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: i420_rgb16.c,v 1.1 2002/08/04 17:23:43 sam Exp $
* $Id: i420_rgb16.c,v 1.2 2002/11/20 13:37:36 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -24,7 +24,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <errno.h> /* ENOMEM */
#include <string.h> /* strerror() */
#include <stdlib.h> /* malloc(), free() */
......@@ -61,7 +60,8 @@ void E_(I420_RGB15)( vout_thread_t *p_vout, picture_t *p_src,
vlc_bool_t b_hscale; /* horizontal scaling type */
int i_vscale; /* vertical scaling type */
int i_x, i_y; /* horizontal and vertical indexes */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
......@@ -188,8 +188,9 @@ void E_(I420_RGB16)( vout_thread_t *p_vout, picture_t *p_src,
u8 *p_v = p_src->V_PIXELS;
vlc_bool_t b_hscale; /* horizontal scaling type */
int i_vscale; /* vertical scaling type */
int i_x, i_y; /* horizontal and vertical indexes */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
......@@ -316,8 +317,9 @@ void E_(I420_RGB32)( vout_thread_t *p_vout, picture_t *p_src,
u8 *p_v = p_src->V_PIXELS;
vlc_bool_t b_hscale; /* horizontal scaling type */
int i_vscale; /* vertical scaling type */
int i_x, i_y; /* horizontal and vertical indexes */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
......
......@@ -2,7 +2,7 @@
* i420_rgb8.c : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: i420_rgb8.c,v 1.1 2002/08/04 17:23:43 sam Exp $
* $Id: i420_rgb8.c,v 1.2 2002/11/20 13:37:36 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -24,7 +24,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <errno.h> /* ENOMEM */
#include <string.h> /* strerror() */
#include <stdlib.h> /* malloc(), free() */
......@@ -48,12 +47,12 @@ void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest )
u8 *p_v = p_src->V_PIXELS;
vlc_bool_t b_hscale; /* horizontal scaling type */
int i_vscale; /* vertical scaling type */
int i_x, i_y; /* horizontal and vertical indexes */
int i_real_y; /* y % 4 */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
unsigned int i_real_y; /* y % 4 */
int i_right_margin;
int i_scale_count; /* scale modulo counter */
int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
unsigned int i_chroma_width = p_vout->render.i_width / 2;/* chroma width */
/* Lookup table */
u8 * p_lookup = p_vout->chroma.p_sys->p_base;
......
......@@ -2,7 +2,7 @@
* i420_yuy2.c : YUV to YUV conversion module for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: i420_yuy2.c,v 1.1 2002/08/04 17:23:43 sam Exp $
* $Id: i420_yuy2.c,v 1.2 2002/11/20 13:37:36 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -24,7 +24,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <errno.h> /* ENOMEM */
#include <string.h> /* strerror() */
#include <stdlib.h> /* malloc(), free() */
......
......@@ -2,7 +2,7 @@
* i422_yuy2.c : YUV to YUV conversion module for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: i422_yuy2.c,v 1.1 2002/08/04 17:23:43 sam Exp $
* $Id: i422_yuy2.c,v 1.2 2002/11/20 13:37:36 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -24,7 +24,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <errno.h> /* ENOMEM */
#include <string.h> /* strerror() */
#include <stdlib.h> /* malloc(), free() */
......
......@@ -30,6 +30,9 @@
#define _NO_PROTO
#endif
/* Overkill. */
#include <vlc/vlc.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
......
......@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: video_output.c,v 1.199 2002/11/20 01:49:15 gbazin Exp $
* $Id: video_output.c,v 1.200 2002/11/20 13:37:36 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -63,8 +63,10 @@ static void InitWindowSize ( vout_thread_t *, int *, int * );
* to its description. On error, it returns NULL.
*****************************************************************************/
vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
int i_width, int i_height,
vlc_fourcc_t i_chroma, int i_aspect )
unsigned int i_width,
unsigned int i_height,
vlc_fourcc_t i_chroma,
unsigned int i_aspect )
{
vout_thread_t * p_vout; /* thread descriptor */
int i_index; /* loop variable */
......
......@@ -2,7 +2,7 @@
* vout_pictures.c : picture management functions
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: vout_pictures.c,v 1.31 2002/11/19 20:45:09 gbazin Exp $
* $Id: vout_pictures.c,v 1.32 2002/11/20 13:37:36 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -357,8 +357,10 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
* This function will be accessed by plugins. It calculates the relative
* position of the output window and the image window.
*****************************************************************************/
void vout_PlacePicture( vout_thread_t *p_vout, int i_width, int i_height,
int *pi_x, int *pi_y, int *pi_width, int *pi_height )
void vout_PlacePicture( vout_thread_t *p_vout,
unsigned int i_width, unsigned int i_height,
unsigned int *pi_x, unsigned int *pi_y,
unsigned int *pi_width, unsigned int *pi_height )
{
if( (i_width <= 0) || (i_height <=0) )
{
......
......@@ -2,7 +2,7 @@
* vout_subpictures.c : subpicture management functions
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: vout_subpictures.c,v 1.17 2002/11/10 18:04:24 sam Exp $
* $Id: vout_subpictures.c,v 1.18 2002/11/20 13:37:36 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -57,7 +57,8 @@ void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
if( i_margin >= 0 )
{
if( p_subpic->i_height + i_margin <= p_vout->output.i_height )
if( p_subpic->i_height + (unsigned int)i_margin
<= p_vout->output.i_height )
{
p_subpic->i_y = p_vout->output.i_height
- i_margin - p_subpic->i_height;
......
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