Skip to content

V
vlc-1.1
Commit 88991a5c authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* include/vlc_common.h: 

    + Removed u8, s8, u16 etc. for good.
  * ALL:
    + Replaced all occurrences of u8, s8, u16 etc. with uint8_t, int8_t, etc.
parent a2fefa1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 815 additions and 829 deletions
include/vlc_common.h
View file @ 88991a5c
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.82 2003/10/24 21:27:06 gbazin Exp $
* $Id: vlc_common.h,v 1.83 2003/10/25 00:49:13 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -25,7 +25,7 @@
*****************************************************************************/
/**
* \file
* \file
* This file is a collection of common definitions and types
*/
......@@ -133,22 +133,6 @@ typedef uint16_t audio_volume_t;
typedef int socklen_t;
#endif
/*****************************************************************************
* Old types definitions
*****************************************************************************
* We still provide these types because most of the VLC code uses them
* instead of the C9x types. They should be removed when the transition is
* complete (probably in 10 years).
*****************************************************************************/
typedef uint8_t u8;
typedef int8_t s8;
typedef uint16_t u16;
typedef int16_t s16;
typedef uint32_t u32;
typedef int32_t s32;
typedef uint64_t u64;
typedef int64_t s64;
/*****************************************************************************
* mtime_t: high precision date or time interval
*****************************************************************************
......@@ -803,7 +787,7 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
#endif
# undef _
#if defined( __BORLANDC__ )
#define _(String) vlc_dgettext (PACKAGE_TARNAME, String)
#define _(String) vlc_dgettext (PACKAGE_TARNAME, String)
#else
# define _(String) vlc_dgettext (PACKAGE, String)
#endif
......
include/vlc_threads.h
View file @ 88991a5c
......@@ -3,7 +3,7 @@
* This header provides portable declarations for mutexes & conditions
*****************************************************************************
* Copyright (C) 1999, 2002 VideoLAN
* $Id: vlc_threads.h,v 1.33 2003/08/28 17:19:42 sam Exp $
* $Id: vlc_threads.h,v 1.34 2003/10/25 00:49:13 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -213,7 +213,7 @@ typedef thread_id vlc_thread_t;
typedef struct
{
int32 init;
int32_t init;
sem_id lock;
vlc_object_t * p_this;
......@@ -221,7 +221,7 @@ typedef struct
typedef struct
{
int32 init;
int32_t init;
thread_id thread;
vlc_object_t * p_this;
......
modules/access/dshow/dshow.cpp
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* dshow.cpp : DirectShow access module for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: dshow.cpp,v 1.10 2003/10/18 20:09:23 gbazin Exp $
* $Id: dshow.cpp,v 1.11 2003/10/25 00:49:13 sam Exp $
*
* Author: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -283,7 +283,7 @@ static int AccessOpen( vlc_object_t *p_this )
p_input->stream.p_selected_area->i_tell = 0;
p_input->stream.i_method = INPUT_METHOD_FILE;
vlc_mutex_unlock( &p_input->stream.stream_lock );
var_Create( p_input, "dshow-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Get( p_input, "dshow-caching", &val );
p_input->i_pts_delay = val.i_int * 1000;
......@@ -333,7 +333,7 @@ static int AccessOpen( vlc_object_t *p_this )
p_sys->p_graph->Release();
/* Uninitialize OLE/COM */
CoUninitialize();
CoUninitialize();
free( p_sys->p_header );
free( p_sys->pp_streams );
......@@ -377,7 +377,7 @@ static void AccessClose( vlc_object_t *p_this )
p_sys->p_graph->Release();
/* Uninitialize OLE/COM */
CoUninitialize();
CoUninitialize();
free( p_sys->p_header );
for( int i = 0; i < p_sys->i_streams; i++ ) delete p_sys->pp_streams[i];
......@@ -674,7 +674,7 @@ FindCaptureDevice( vlc_object_t *p_this, string *p_devicename,
return NULL;
}
/* If there are no enumerators for the requested type, then
/* If there are no enumerators for the requested type, then
* CreateClassEnumerator will succeed, but p_class_enum will be NULL */
if( p_class_enum == NULL )
{
......
modules/access/dvd/access.c
View file @ 88991a5c
......@@ -8,7 +8,7 @@
* -udf.* to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: access.c,v 1.13 2003/05/04 22:42:14 gbazin Exp $
* $Id: access.c,v 1.14 2003/10/25 00:49:13 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -400,9 +400,9 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
if( p_area != p_input->stream.p_selected_area )
{
int i_vts_title;
u32 i_first;
u32 i_last;
int i_vts_title;
uint32_t i_first;
uint32_t i_last;
unsigned int i;
/* Reset the Chapter position of the old title */
......
modules/access/dvd/es.c
View file @ 88991a5c
/* es.c: functions to find and select ES
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: es.c,v 1.5 2003/05/05 22:23:32 gbazin Exp $
* $Id: es.c,v 1.6 2003/10/25 00:49:13 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -228,10 +228,10 @@ void DVDReadSPU( input_thread_t * p_input )
{
ADDES( 0xbd, 0x20 + i_id, VLC_FOURCC('s','p','u','b'), SPU_ES,
vts.manager_inf.p_spu_attr[i-1].i_lang_code, "",
sizeof(int) + 16*sizeof(u32) );
sizeof(int) + 16*sizeof(uint32_t) );
*(int*)p_es->p_demux_data = 0xBeeF;
memcpy( (char*)p_es->p_demux_data + sizeof(int),
palette, 16*sizeof(u32) );
palette, 16*sizeof(uint32_t) );
}
else
{
......
modules/access/dvd/ifo.c
View file @ 88991a5c
This diff is collapsed.
modules/access/dvd/ifo.h
View file @ 88991a5c
This diff is collapsed.
modules/access/dvd/udf.h
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* dvd_udf.h: structures for udf filesystem tools.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: udf.h,v 1.1 2002/08/04 17:23:41 sam Exp $
* $Id: udf.h,v 1.2 2003/10/25 00:49:13 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
......@@ -13,7 +13,7 @@
* 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
......@@ -27,5 +27,5 @@
/*
* Fonctions in dvd_udf.c
*/
u32 DVDUDFFindFile( dvdcss_handle, char * );
uint32_t DVDUDFFindFile( dvdcss_handle, char * );
modules/access/dvdplay/es.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* es.c: functions to handle elementary streams.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: es.c,v 1.6 2003/05/05 22:23:32 gbazin Exp $
* $Id: es.c,v 1.7 2003/10/25 00:49:13 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -58,7 +58,7 @@ void dvdplay_DeleteES( input_thread_t* p_input )
p_input->stream.pp_selected_es = NULL;
p_input->stream.i_selected_es_number = 0;
while( p_input->stream.i_es_number )
{
input_DelES( p_input, p_input->stream.pp_es[0] );
......@@ -98,10 +98,10 @@ void dvdplay_Video( input_thread_t * p_input )
p_dvd = (dvd_data_t*)(p_input->p_access_data);
p_attr = dvdplay_video_attr( p_dvd->vmg );
/* ES 0 -> video MPEG2 */
i_id = 0xe0;
if( p_attr->display_aspect_ratio )
{
ADDES( 0xe0, VLC_FOURCC('m','p','g','v'), VIDEO_ES, 0,
......@@ -112,7 +112,7 @@ void dvdplay_Video( input_thread_t * p_input )
{
ADDES( 0xe0, VLC_FOURCC('m','p','g','v'), VIDEO_ES, 0, "", 0 );
}
}
/*****************************************************************************
......@@ -133,7 +133,7 @@ void dvdplay_Audio( input_thread_t * p_input )
p_dvd = (dvd_data_t*)(p_input->p_access_data);
p_dvd->i_audio_nb = 0;
dvdplay_audio_info( p_dvd->vmg, &i_audio_nr, &i_audio );
/* Audio ES, in the order they appear in .ifo */
for( i = 1 ; i <= i_audio_nr ; i++ )
{
......@@ -190,7 +190,7 @@ void dvdplay_Subp( input_thread_t * p_input )
dvd_data_t * p_dvd;
es_descriptor_t * p_es;
subp_attr_t * p_attr;
u32 * pi_palette;
uint32_t * pi_palette;
int i_subp_nr = -1;
int i_subp = -1;
int i_id;
......@@ -212,10 +212,10 @@ void dvdplay_Subp( input_thread_t * p_input )
if( pi_palette )
{
ADDES( i_id, VLC_FOURCC('s','p','u','b'), SPU_ES,
p_attr->lang_code, "", sizeof(int) + 16*sizeof(u32) );
p_attr->lang_code, "", sizeof(int) + 16*sizeof(uint32_t) );
*(int*)p_es->p_demux_data = 0xBeeF;
memcpy( (void*)p_es->p_demux_data + sizeof(int),
pi_palette, 16*sizeof(u32) );
pi_palette, 16*sizeof(uint32_t) );
}
else
{
......
modules/access/v4l/v4l.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* v4l.c : Video4Linux input module for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: v4l.c,v 1.25 2003/10/24 21:27:06 gbazin Exp $
* $Id: v4l.c,v 1.26 2003/10/25 00:49:13 sam Exp $
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
* Paul Forgey <paulf at aphrodite dot com>
......@@ -399,10 +399,10 @@ static int AccessOpen( vlc_object_t *p_this )
p_sys->b_mjpeg = VLC_TRUE;
}
else if( !strncmp( psz_parser, "decimation=",
else if( !strncmp( psz_parser, "decimation=",
strlen( "decimation=" ) ) )
{
p_sys->i_decimation =
p_sys->i_decimation =
strtol( psz_parser + strlen( "decimation=" ),
&psz_parser, 0 );
}
......@@ -559,7 +559,7 @@ static int AccessOpen( vlc_object_t *p_this )
#endif
// show a warning if frequency is < than 30000. User is certainly usint old syntax.
/* set frequency */
if( p_sys->i_frequency >= 0 )
......@@ -1127,7 +1127,7 @@ static uint8_t *GrabMJPEG( input_thread_t *p_input )
p_app1 = (struct quicktime_mjpeg_app1 *)(p_field + 6);
tag = 0xffd9;
tag = hton16( tag );
p = memmem( p_field, sync.length - (size_t)(p_field - p_frame),
p = memmem( p_field, sync.length - (size_t)(p_field - p_frame),
&tag, 2 );
if( !p )
......
modules/audio_filter/channel_mixer/trivial.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* trivial.c : trivial channel mixer plug-in (drops unwanted channels)
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: trivial.c,v 1.11 2003/01/23 11:48:18 massiot Exp $
* $Id: trivial.c,v 1.12 2003/10/25 00:49:13 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -72,12 +72,12 @@ static int Create( vlc_object_t *p_this )
> aout_FormatNbChannels( &p_filter->output ) )
{
/* Downmixing */
p_filter->b_in_place = 1;
p_filter->b_in_place = 1;
}
else
{
/* Upmixing */
p_filter->b_in_place = 0;
p_filter->b_in_place = 0;
}
return 0;
......@@ -86,7 +86,7 @@ static int Create( vlc_object_t *p_this )
/*****************************************************************************
* SparseCopy: trivially downmix or upmix a buffer
*****************************************************************************/
static void SparseCopy( s32 * p_dest, const s32 * p_src, size_t i_len,
static void SparseCopy( int32_t * p_dest, const int32_t * p_src, size_t i_len,
int i_output_stride, int i_input_stride )
{
int i;
......@@ -110,8 +110,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
{
int i_input_nb = aout_FormatNbChannels( &p_filter->input );
int i_output_nb = aout_FormatNbChannels( &p_filter->output );
s32 * p_dest = (s32 *)p_out_buf->p_buffer;
s32 * p_src = (s32 *)p_in_buf->p_buffer;
int32_t * p_dest = (int32_t *)p_out_buf->p_buffer;
int32_t * p_src = (int32_t *)p_in_buf->p_buffer;
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes * i_output_nb / i_input_nb;
......@@ -120,7 +120,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
!= (p_filter->input.i_original_channels & AOUT_CHAN_PHYSMASK)
&& (p_filter->input.i_original_channels & AOUT_CHAN_PHYSMASK)
== (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
{
{
int i;
/* This is a bit special. */
if ( !(p_filter->output.i_original_channels & AOUT_CHAN_LEFT) )
......
modules/audio_filter/converter/fixed32tos16.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* fixed32tos16.c : converter from fixed32 to signed 16 bits integer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: fixed32tos16.c,v 1.10 2002/12/24 19:09:12 jpsaman Exp $
* $Id: fixed32tos16.c,v 1.11 2003/10/25 00:49:13 sam Exp $
*
* Authors: Jean-Paul Saman <jpsaman@wxs.nl>
*
......@@ -92,10 +92,10 @@ static int Create( vlc_object_t *p_this )
#define VLC_F_FRACBITS 28
# if VLC_F_FRACBITS == 28
# define VLC_F(x) ((vlc_fixed_t) (x##L))
# define VLC_F(x) ((vlc_fixed_t) (x##L))
# endif
# define VLC_F_ONE VLC_F(0x10000000)
# define VLC_F_ONE VLC_F(0x10000000)
struct audio_dither {
vlc_fixed_t error[3];
......@@ -115,8 +115,8 @@ static inline unsigned long prng(unsigned long state)
* NAME: mpg321_s24_to_s16_pcm()
* DESCRIPTION: generic linear sample quantize and dither routine
********************************************************************/
static inline s16 mpg321_s24_to_s16_pcm(unsigned int bits, vlc_fixed_t sample,
struct audio_dither *dither)
static inline int16_t mpg321_s24_to_s16_pcm(unsigned int bits, vlc_fixed_t sample,
struct audio_dither *dither)
{
unsigned int scalebits;
vlc_fixed_t output, mask, random;
......@@ -171,7 +171,7 @@ static inline s16 mpg321_s24_to_s16_pcm(unsigned int bits, vlc_fixed_t sample,
/*****************************************************************************
* s24_to_s16_pcm: Scale a 24 bit pcm sample to a 16 bit pcm sample.
*****************************************************************************/
static inline s16 s24_to_s16_pcm(vlc_fixed_t sample)
static inline int16_t s24_to_s16_pcm(vlc_fixed_t sample)
{
/* round */
sample += (1L << (VLC_F_FRACBITS - 16));
......@@ -194,7 +194,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
{
int i;
vlc_fixed_t * p_in = (vlc_fixed_t *)p_in_buf->p_buffer;
s16 * p_out = (s16 *)p_out_buf->p_buffer;
int16_t * p_out = (int16_t *)p_out_buf->p_buffer;
#if 0
static struct audio_dither dither;
#endif
......
modules/audio_filter/converter/float32tos16.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* float32tos16.c : converter from float32 to signed 16 bits integer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: float32tos16.c,v 1.12 2002/11/20 16:43:32 sam Exp $
* $Id: float32tos16.c,v 1.13 2003/10/25 00:49:13 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -80,7 +80,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
{
int i;
float * p_in = (float *)p_in_buf->p_buffer;
s16 * p_out = (s16 *)p_out_buf->p_buffer;
int16_t * p_out = (int16_t *)p_out_buf->p_buffer;
for ( i = p_in_buf->i_nb_samples
* aout_FormatNbChannels( &p_filter->input ); i-- ; )
......@@ -93,8 +93,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
#else
/* This is walken's trick based on IEEE float format. */
float f_in = *p_in + 384.0;
s32 i_in;
i_in = *(s32 *)&f_in;
int32_t i_in;
i_in = *(int32_t *)&f_in;
if ( i_in > 0x43c07fff ) *p_out = 32767;
else if ( i_in < 0x43bf8000 ) *p_out = -32768;
else *p_out = i_in - 0x43c00000;
......
modules/audio_filter/converter/float32tos8.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* float32tos8.c : converter from float32 to signed 8 bits integer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: float32tos8.c,v 1.7 2002/11/20 16:43:32 sam Exp $
* $Id: float32tos8.c,v 1.8 2003/10/25 00:49:13 sam Exp $
*
* Authors: Xavier Maillard <zedek@fxgsproject.org>
*
......@@ -82,14 +82,14 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
{
int i;
float * p_in = (float *)p_in_buf->p_buffer;
s8 * p_out = (s8 *)p_out_buf->p_buffer;
int8_t * p_out = (int8_t *)p_out_buf->p_buffer;
for ( i = p_in_buf->i_nb_samples
* aout_FormatNbChannels( &p_filter->input ); i-- ; )
{
if ( *p_in >= 1.0 ) *p_out = 127;
else if ( *p_in < -1.0 ) *p_out = -128;
else *p_out = (s8)(*p_in * 128);
else *p_out = (int8_t)(*p_in * 128);
p_in++; p_out++;
}
......
modules/audio_filter/converter/float32tou16.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* float32tou16.c : converter from float32 to unsigned 16 bits integer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: float32tou16.c,v 1.7 2002/11/20 16:43:32 sam Exp $
* $Id: float32tou16.c,v 1.8 2003/10/25 00:49:13 sam Exp $
*
* Authors: Xavier Maillard <zedek@fxgsproject.org>
*
......@@ -82,14 +82,14 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
{
int i;
float * p_in = (float *)p_in_buf->p_buffer;
u16 * p_out = (u16 *)p_out_buf->p_buffer;
uint16_t * p_out = (uint16_t *)p_out_buf->p_buffer;
for ( i = p_in_buf->i_nb_samples
* aout_FormatNbChannels( &p_filter->input ); i-- ; )
{
if ( *p_in >= 1.0 ) *p_out = 65535;
else if ( *p_in < -1.0 ) *p_out = 0;
else *p_out = (u16)(32768 + *p_in * 32768);
else *p_out = (uint16_t)(32768 + *p_in * 32768);
p_in++; p_out++;
}
......
modules/audio_filter/converter/float32tou8.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* float32tou8.c : converter from float32 to unsigned 8 bits integer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: float32tou8.c,v 1.7 2002/11/20 16:43:32 sam Exp $
* $Id: float32tou8.c,v 1.8 2003/10/25 00:49:13 sam Exp $
*
* Authors: Xavier Maillard <zedek@fxgsproject.org>
*
......@@ -82,14 +82,14 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
{
int i;
float * p_in = (float *)p_in_buf->p_buffer;
u8 * p_out = (u8 *)p_out_buf->p_buffer;
uint8_t * p_out = (uint8_t *)p_out_buf->p_buffer;
for ( i = p_in_buf->i_nb_samples
* aout_FormatNbChannels( &p_filter->input ); i-- ; )
{
if ( *p_in >= 1.0 ) *p_out = 255;
else if ( *p_in < -1.0 ) *p_out = 0;
else *p_out = (u8)(128 + *p_in * 128);
else *p_out = (uint8_t)(128 + *p_in * 128);
p_in++; p_out++;
}
......
modules/audio_filter/converter/s16tofixed32.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* s16tofixed32.c : converter from signed 16 bits integer to fixed 32
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: s16tofixed32.c,v 1.1 2003/03/12 23:59:19 marcari Exp $
* $Id: s16tofixed32.c,v 1.2 2003/10/25 00:49:13 sam Exp $
*
* Authors: Marc Ariberti <marcari@videolan.ord>
*
......@@ -84,7 +84,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
/* We start from the end because b_in_place is true */
s16 * p_in = (s16 *)p_in_buf->p_buffer + i - 1;
int16_t * p_in = (int16_t *)p_in_buf->p_buffer + i - 1;
vlc_fixed_t * p_out = (vlc_fixed_t *)p_out_buf->p_buffer + i - 1;
while( i-- )
......@@ -94,6 +94,6 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
}
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes
* sizeof(vlc_fixed_t) / sizeof(s16);
p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes
* sizeof(vlc_fixed_t) / sizeof(int16_t);
}
modules/audio_filter/converter/s16tofloat32.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* s16tofloat32.c : converter from signed 16 bits integer to float32
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: s16tofloat32.c,v 1.5 2002/11/20 16:43:32 sam Exp $
* $Id: s16tofloat32.c,v 1.6 2003/10/25 00:49:13 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -83,7 +83,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
/* We start from the end because b_in_place is true */
s16 * p_in = (s16 *)p_in_buf->p_buffer + i - 1;
int16_t * p_in = (int16_t *)p_in_buf->p_buffer + i - 1;
float * p_out = (float *)p_out_buf->p_buffer + i - 1;
while( i-- )
......@@ -95,7 +95,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
/* This is walken's trick based on IEEE float format. On my PIII
* this takes 16 seconds to perform one billion conversions, instead
* of 19 seconds for the above division. */
s32 i_out = *p_in + 0x43c00000;
int32_t i_out = *p_in + 0x43c00000;
float f_out = *(float *)&i_out;
*p_out = f_out - 384.0;
#endif
......
modules/audio_filter/converter/s16tofloat32swab.c
View file @ 88991a5c
......@@ -3,16 +3,16 @@
* with endianness change
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: s16tofloat32swab.c,v 1.9 2003/04/22 22:25:09 gbazin Exp $
* $Id: s16tofloat32swab.c,v 1.10 2003/10/25 00:49:13 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.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
......@@ -54,7 +54,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description(
set_description(
_("audio filter for s16->float32 with endianness conversion") );
set_capability( "audio filter", 1 );
set_callbacks( Create, NULL );
......@@ -68,7 +68,7 @@ vlc_module_end();
static int Create( vlc_object_t *p_this )
{
aout_filter_t * p_filter = (aout_filter_t *)p_this;
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
{
return -1;
......@@ -97,30 +97,30 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
/* We start from the end because b_in_place is true */
s16 * p_in;
int16_t * p_in;
float * p_out = (float *)p_out_buf->p_buffer + i - 1;
#ifdef HAVE_SWAB
# ifdef HAVE_ALLOCA
s16 * p_swabbed = alloca( i * sizeof(s16) );
int16_t * p_swabbed = alloca( i * sizeof(int16_t) );
# else
s16 * p_swabbed = malloc( i * sizeof(s16) );
int16_t * p_swabbed = malloc( i * sizeof(int16_t) );
# endif
swab( p_in_buf->p_buffer, (void *)p_swabbed, i * sizeof(s16) );
swab( p_in_buf->p_buffer, (void *)p_swabbed, i * sizeof(int16_t) );
p_in = p_swabbed + i - 1;
#else
byte_t p_tmp[2];
p_in = (s16 *)p_in_buf->p_buffer + i - 1;
p_in = (int16_t *)p_in_buf->p_buffer + i - 1;
#endif
while( i-- )
{
#ifndef HAVE_SWAB
p_tmp[0] = ((byte_t *)p_in)[1];
p_tmp[1] = ((byte_t *)p_in)[0];
*p_out = (float)( *(s16 *)p_tmp ) / 32768.0;
*p_out = (float)( *(int16_t *)p_tmp ) / 32768.0;
#else
*p_out = (float)*p_in / 32768.0;
#endif
......
modules/audio_filter/converter/s8tofloat32.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* s8tofloat32.c : converter from signed 8 bits integer to float32.
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: s8tofloat32.c,v 1.2 2002/11/20 16:43:32 sam Exp $
* $Id: s8tofloat32.c,v 1.3 2003/10/25 00:49:13 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -81,7 +81,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
/* We start from the end because b_in_place is true */
s8 * p_in = (s8 *)p_in_buf->p_buffer + i - 1;
int8_t * p_in = (int8_t *)p_in_buf->p_buffer + i - 1;
float * p_out = (float *)p_out_buf->p_buffer + i - 1;
while( i-- )
......
modules/audio_filter/converter/u8tofixed32.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* u8tofixed32.c : converter from unsigned 8 bits integer to fixed32.
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: u8tofixed32.c,v 1.1 2002/11/21 13:53:32 sam Exp $
* $Id: u8tofixed32.c,v 1.2 2003/10/25 00:49:13 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -81,7 +81,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
/* We start from the end because b_in_place is true */
u8 * p_in = (u8 *)p_in_buf->p_buffer + i - 1;
uint8_t * p_in = (uint8_t *)p_in_buf->p_buffer + i - 1;
vlc_fixed_t * p_out = (vlc_fixed_t *)p_out_buf->p_buffer + i - 1;
while( i-- )
......
modules/audio_filter/converter/u8tofloat32.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* u8tofloat32.c : converter from unsigned 8 bits integer to float32.
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: u8tofloat32.c,v 1.3 2002/11/20 16:43:32 sam Exp $
* $Id: u8tofloat32.c,v 1.4 2003/10/25 00:49:13 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -81,7 +81,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
/* We start from the end because b_in_place is true */
u8 * p_in = (u8 *)p_in_buf->p_buffer + i - 1;
uint8_t * p_in = (uint8_t *)p_in_buf->p_buffer + i - 1;
float * p_out = (float *)p_out_buf->p_buffer + i - 1;
while( i-- )
......
modules/audio_mixer/trivial.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* trivial.c : trivial mixer plug-in (1 input, no downmixing)
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: trivial.c,v 1.12 2003/03/30 18:14:36 gbazin Exp $
* $Id: trivial.c,v 1.13 2003/10/25 00:49:13 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -73,7 +73,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
int i = 0;
aout_input_t * p_input = p_aout->pp_inputs[i];
int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
int i_nb_bytes = p_buffer->i_nb_samples * sizeof(s32)
int i_nb_bytes = p_buffer->i_nb_samples * sizeof(int32_t)
* i_nb_channels;
byte_t * p_in;
byte_t * p_out;
......@@ -92,7 +92,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
ptrdiff_t i_available_bytes = (p_input->fifo.p_first->p_buffer
- p_in)
+ p_input->fifo.p_first->i_nb_samples
* sizeof(s32)
* sizeof(int32_t)
* i_nb_channels;
if ( i_available_bytes < i_nb_bytes )
......
modules/audio_output/alsa.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* alsa.c : alsa plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: alsa.c,v 1.35 2003/10/23 21:55:50 gbazin Exp $
* $Id: alsa.c,v 1.36 2003/10/25 00:49:13 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
......@@ -70,7 +70,7 @@ struct aout_sys_t
/* These values are in frames.
To convert them to a number of bytes you have to multiply them by the
number of channel(s) (eg. 2 for stereo) and the size of a sample (eg.
2 for s16). */
2 for int16_t). */
#define ALSA_DEFAULT_PERIOD_SIZE 1024
#define ALSA_DEFAULT_BUFFER_SIZE ( ALSA_DEFAULT_PERIOD_SIZE << 8 )
#define ALSA_SPDIF_PERIOD_SIZE A52_FRAME_NB
......
modules/audio_output/file.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* file.c : audio output which writes the samples to a file
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: file.c,v 1.22 2003/05/15 22:27:37 massiot Exp $
* $Id: file.c,v 1.23 2003/10/25 00:49:13 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -11,7 +11,7 @@
* 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
......
modules/audio_output/sdl.c
View file @ 88991a5c
......@@ -2,18 +2,18 @@
* sdl.c : SDL audio output plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
* $Id: sdl.c,v 1.22 2003/05/04 22:42:15 gbazin Exp $
* $Id: sdl.c,v 1.23 2003/10/25 00:49:13 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
* Christophe Massiot <massiot@via.ecp.fr>
*
*
* 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
......@@ -48,7 +48,7 @@
* It describes the specific properties of an audio device.
*****************************************************************************/
struct aout_sys_t
{
{
mtime_t next_date;
mtime_t buffer_time;
};
......@@ -82,7 +82,7 @@ static int Open ( vlc_object_t *p_this )
vlc_value_t val, text;
/* Check that no one uses the DSP. */
Uint32 i_flags = SDL_INIT_AUDIO;
uint32_t i_flags = SDL_INIT_AUDIO;
if( SDL_WasInit( i_flags ) )
{
return VLC_EGENERIC;
......
modules/codec/araw.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* araw.c: Pseudo audio decoder; for raw pcm data
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: araw.c,v 1.17 2003/09/02 20:19:25 gbazin Exp $
* $Id: araw.c,v 1.18 2003/10/25 00:49:13 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -42,7 +42,7 @@ typedef struct adec_thread_s
/* Input properties */
decoder_fifo_t *p_fifo;
int16_t *p_logtos16; // used with m/alaw to s16
int16_t *p_logtos16; // used with m/alaw to int16_t
/* Output properties */
aout_instance_t * p_aout; /* opaque */
......@@ -379,7 +379,7 @@ static int InitThread( adec_thread_t * p_adec )
return( 0 );
}
static void GetPESData( u8 *p_buf, int i_max, pes_packet_t *p_pes )
static void GetPESData( uint8_t *p_buf, int i_max, pes_packet_t *p_pes )
{
int i_copy;
int i_count;
......
modules/codec/cinepak.c
View file @ 88991a5c
This diff is collapsed.
modules/codec/ffmpeg/ffmpeg.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.53 2003/10/02 18:07:26 hartman Exp $
* $Id: ffmpeg.c,v 1.54 2003/10/25 00:49:13 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -368,7 +368,7 @@ static void EndThread( generic_thread_t *p_decoder )
* locales Functions
*****************************************************************************/
int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes )
int E_( GetPESData )( uint8_t *p_buf, int i_max, pes_packet_t *p_pes )
{
int i_copy;
int i_count;
......
modules/codec/ffmpeg/ffmpeg.h
View file @ 88991a5c
......@@ -2,15 +2,15 @@
* ffmpeg_vdec.h: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ffmpeg.h,v 1.25 2003/10/01 22:39:43 hartman Exp $
* $Id: ffmpeg.h,v 1.26 2003/10/25 00:49:13 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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
......@@ -38,7 +38,7 @@
mtime_t pts; \
\
/* Private stuff for frame gathering */ \
u8 *p_buffer; /* buffer for gather pes */ \
uint8_t *p_buffer; /* buffer for gather pes */ \
int i_buffer_size; /* size of allocated p_buffer */ \
int i_buffer; /* bytes already present in p_buffer */
......@@ -57,7 +57,7 @@ typedef struct generic_thread_s
#define FREE( p ) if( p ) free( p ); p = NULL
int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
int E_( GetPESData )( uint8_t *p_buf, int i_max, pes_packet_t *p_pes );
/*****************************************************************************
* Video codec fourcc
......@@ -115,7 +115,7 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
#define FOURCC_3IVD VLC_FOURCC('3','I','V','D')
#define FOURCC_3ivd VLC_FOURCC('3','i','v','d')
/* 3ivx delta 3.5 Unsupported */
/* 3ivx delta 3.5 Unsupported */
#define FOURCC_3IV1 VLC_FOURCC('3','I','V','1')
#define FOURCC_3iv1 VLC_FOURCC('3','i','v','1')
......@@ -156,12 +156,12 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
#define FOURCC_JPGL VLC_FOURCC( 'J', 'P', 'G', 'L' )
/* Microsoft Video 1 */
#define FOURCC_MSVC VLC_FOURCC('M','S','V','C')
#define FOURCC_msvc VLC_FOURCC('m','s','v','c')
#define FOURCC_CRAM VLC_FOURCC('C','R','A','M')
#define FOURCC_cram VLC_FOURCC('c','r','a','m')
#define FOURCC_WHAM VLC_FOURCC('W','H','A','M')
#define FOURCC_wham VLC_FOURCC('w','h','a','m')
#define FOURCC_MSVC VLC_FOURCC('M','S','V','C')
#define FOURCC_msvc VLC_FOURCC('m','s','v','c')
#define FOURCC_CRAM VLC_FOURCC('C','R','A','M')
#define FOURCC_cram VLC_FOURCC('c','r','a','m')
#define FOURCC_WHAM VLC_FOURCC('W','H','A','M')
#define FOURCC_wham VLC_FOURCC('w','h','a','m')
/* Windows Screen Video */
#define FOURCC_MSS1 VLC_FOURCC('M','S','S','1')
......
modules/codec/ffmpeg/postprocessing/postprocessing.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* postprocessing.c
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: postprocessing.c,v 1.3 2003/03/30 18:14:36 gbazin Exp $
* $Id: postprocessing.c,v 1.4 2003/10/25 00:49:13 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -36,7 +36,7 @@
static int Open ( vlc_object_t *p_this );
static u32 pp_getmode( int i_quality, int b_autolevel );
static uint32_t pp_getmode( int i_quality, int b_autolevel );
static int pp_postprocess( picture_t *,
QT_STORE_T *, unsigned int,
unsigned int i_mode );
......@@ -73,14 +73,14 @@ static int Open ( vlc_object_t *p_this )
p_pp->pf_getmode = pp_getmode;
p_pp->pf_postprocess = pp_postprocess;
return VLC_SUCCESS;
}
static u32 pp_getmode( int i_quality, int b_autolevel )
static uint32_t pp_getmode( int i_quality, int b_autolevel )
{
u32 i_mode;
uint32_t i_mode;
i_quality = i_quality < 0 ? 0 : i_quality;
i_quality = i_quality > 6 ? 6 : i_quality;
......@@ -125,7 +125,7 @@ static u32 pp_getmode( int i_quality, int b_autolevel )
}
/*****************************************************************************
* pp_postprocess : make post-filter as defined in MPEG4-ISO
* pp_postprocess : make post-filter as defined in MPEG4-ISO
*****************************************************************************
*****************************************************************************/
......@@ -168,12 +168,12 @@ static int pp_postprocess( picture_t *p_pic,
if( i_mode&PP_DEBLOCK_C_V )
{
E_( pp_deblock_V )( p_pic->U_PIXELS,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->U_PITCH,
p_QP_store, i_QP_stride,
1 );
E_( pp_deblock_V )( p_pic->V_PIXELS,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->V_PITCH,
p_QP_store, i_QP_stride,
1 );
......@@ -181,36 +181,36 @@ static int pp_postprocess( picture_t *p_pic,
if( i_mode&PP_DEBLOCK_C_H )
{
E_( pp_deblock_H )( p_pic->U_PIXELS,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->U_PITCH,
p_QP_store, i_QP_stride,
1 );
E_( pp_deblock_H )( p_pic->V_PIXELS,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->V_PITCH,
p_QP_store, i_QP_stride,
1 );
}
/* After deblocking do dering */
/* After deblocking do dering */
/* TODO check for min size */
if( i_mode&PP_DERING_Y )
{
E_( pp_dering_Y )( p_pic->Y_PIXELS,
p_pic->p_heap->i_width, p_pic->p_heap->i_height,
p_pic->p_heap->i_width, p_pic->p_heap->i_height,
p_pic->Y_PITCH,
p_QP_store, i_QP_stride );
}
if( i_mode&PP_DERING_C )
{
E_( pp_dering_C )( p_pic->U_PIXELS,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->U_PITCH,
p_QP_store, i_QP_stride );
E_( pp_dering_C )( p_pic->V_PIXELS,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->p_heap->i_width >> 1, p_pic->p_heap->i_height >> 1,
p_pic->V_PITCH,
p_QP_store, i_QP_stride );
......
modules/codec/ffmpeg/postprocessing/postprocessing.h
View file @ 88991a5c
......@@ -2,15 +2,15 @@
* postprocessing.h
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: postprocessing.h,v 1.2 2002/11/10 02:47:27 fenrir Exp $
* $Id: postprocessing.h,v 1.3 2003/10/25 00:49:14 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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
......@@ -44,10 +44,10 @@
typedef struct postprocessing_s
{
VLC_COMMON_MEMBERS
module_t * p_module;
u32 (*pf_getmode)( int i_quality, int b_autolevel );
uint32_t (*pf_getmode)( int i_quality, int b_autolevel );
int (*pf_postprocess)( picture_t *p_pic,
QT_STORE_T *p_QP_store, unsigned int i_QP_stride,
......
modules/codec/libmpeg2.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* libmpeg2.c: mpeg2 video decoder module making use of libmpeg2.
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: libmpeg2.c,v 1.30 2003/10/08 21:03:36 gbazin Exp $
* $Id: libmpeg2.c,v 1.31 2003/10/25 00:49:13 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -11,7 +11,7 @@
* 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
......@@ -195,7 +195,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block )
return VLC_SUCCESS;
}
if( p_block->b_discontinuity && p_sys->p_synchro
if( p_block->b_discontinuity && p_sys->p_synchro
&& p_sys->p_info->sequence->width != (unsigned)-1 )
{
vout_SynchroReset( p_sys->p_synchro );
......@@ -315,15 +315,15 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block )
msg_Err( p_dec, "cannot create vout" );
block_Release( p_block );
return -1;
}
}
msg_Dbg( p_dec, "%dx%d, aspect %d, %u.%03u fps",
p_sys->p_info->sequence->width,
p_sys->p_info->sequence->height, i_aspect,
(uint32_t)((u64)1001000000 * 27 /
p_sys->p_info->sequence->frame_period / 1001),
(uint32_t)((u64)1001000000 * 27 /
p_sys->p_info->sequence->frame_period % 1001) );
(uint32_t)((uint64_t)1001000000 * 27 /
p_sys->p_info->sequence->frame_period / 1001),
(uint32_t)((uint64_t)1001000000 * 27 /
p_sys->p_info->sequence->frame_period % 1001) );
mpeg2_custom_fbuf( p_sys->p_mpeg2dec, 1 );
......@@ -468,7 +468,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block )
buf[0] = buf[1] = buf[2] = NULL;
msg_Warn( p_dec, "invalid picture encountered" );
if ( ( p_sys->p_info->current_picture == NULL ) ||
if ( ( p_sys->p_info->current_picture == NULL ) ||
( ( p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE)
!= B_CODING_TYPE ) )
{
......
modules/codec/spudec/render.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* render.c : SPU renderer
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: render.c,v 1.5 2003/07/22 20:49:10 hartman Exp $
* $Id: render.c,v 1.6 2003/10/25 00:49:14 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Rudolf Cornelissen <rag.cornelissen@inter.nl.net>
......@@ -12,7 +12,7 @@
* 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
......@@ -95,13 +95,13 @@ static void RenderI420( vout_thread_t *p_vout, picture_t *p_pic,
const subpicture_t *p_spu, vlc_bool_t b_crop )
{
/* Common variables */
u8 *p_dest;
u8 *p_destptr;
u16 *p_source = (u16 *)p_spu->p_sys->p_data;
uint8_t *p_dest;
uint8_t *p_destptr;
uint16_t *p_source = (uint16_t *)p_spu->p_sys->p_data;
int i_x, i_y;
int i_len, i_color;
u16 i_colprecomp, i_destalpha;
uint16_t i_colprecomp, i_destalpha;
/* Crop-specific */
int i_x_start, i_y_start, i_x_end, i_y_end;
......@@ -147,8 +147,8 @@ static void RenderI420( vout_thread_t *p_vout, picture_t *p_pic,
/* To be able to divide by 16 (>>4) we add 1 to the alpha.
* This means Alpha 0 won't be completely transparent, but
* that's handled in a special case above anyway. */
i_colprecomp = (u16)p_spu->p_sys->pi_yuv[i_color][0]
* (u16)(p_spu->p_sys->pi_alpha[i_color] + 1);
i_colprecomp = (uint16_t)p_spu->p_sys->pi_yuv[i_color][0]
* (uint16_t)(p_spu->p_sys->pi_alpha[i_color] + 1);
i_destalpha = 15 - p_spu->p_sys->pi_alpha[i_color];
for ( p_destptr = p_dest - i_x - i_y;
......@@ -156,7 +156,7 @@ static void RenderI420( vout_thread_t *p_vout, picture_t *p_pic,
p_destptr++ )
{
*p_destptr = ( i_colprecomp +
(u16)*p_destptr * i_destalpha ) >> 4;
(uint16_t)*p_destptr * i_destalpha ) >> 4;
}
break;
}
......@@ -168,9 +168,9 @@ static void RenderRV16( vout_thread_t *p_vout, picture_t *p_pic,
const subpicture_t *p_spu, vlc_bool_t b_crop )
{
/* Common variables */
u16 p_clut16[4];
u8 *p_dest;
u16 *p_source = (u16 *)p_spu->p_sys->p_data;
uint16_t p_clut16[4];
uint8_t *p_dest;
uint16_t *p_source = (uint16_t *)p_spu->p_sys->p_data;
int i_x, i_y;
int i_len, i_color;
......@@ -186,7 +186,7 @@ static void RenderRV16( vout_thread_t *p_vout, picture_t *p_pic,
for( i_color = 0; i_color < 4; i_color++ )
{
p_clut16[i_color] = 0x1111
* ( (u16)p_spu->p_sys->pi_yuv[i_color][0] >> 4 );
* ( (uint16_t)p_spu->p_sys->pi_yuv[i_color][0] >> 4 );
}
i_xscale = ( p_vout->output.i_width << 6 ) / p_vout->render.i_width;
......@@ -305,9 +305,9 @@ static void RenderRV32( vout_thread_t *p_vout, picture_t *p_pic,
const subpicture_t *p_spu, vlc_bool_t b_crop )
{
/* Common variables */
u32 p_clut32[4];
u8 *p_dest;
u16 *p_source = (u16 *)p_spu->p_sys->p_data;
uint32_t p_clut32[4];
uint8_t *p_dest;
uint16_t *p_source = (uint16_t *)p_spu->p_sys->p_data;
int i_x, i_y;
int i_len, i_color;
......@@ -323,7 +323,7 @@ static void RenderRV32( vout_thread_t *p_vout, picture_t *p_pic,
for( i_color = 0; i_color < 4; i_color++ )
{
p_clut32[i_color] = 0x11111111
* ( (u16)p_spu->p_sys->pi_yuv[i_color][0] >> 4 );
* ( (uint16_t)p_spu->p_sys->pi_yuv[i_color][0] >> 4 );
}
i_xscale = ( p_vout->output.i_width << 6 ) / p_vout->render.i_width;
......@@ -440,12 +440,12 @@ static void RenderYUY2( vout_thread_t *p_vout, picture_t *p_pic,
const subpicture_t *p_spu, vlc_bool_t b_crop )
{
/* Common variables */
u8 *p_dest;
u16 *p_source = (u16 *)p_spu->p_sys->p_data;
uint8_t *p_dest;
uint16_t *p_source = (uint16_t *)p_spu->p_sys->p_data;
int i_x, i_y;
int i_len, i_color;
u8 i_cnt;
uint8_t i_cnt;
/* Crop-specific */
int i_x_start, i_y_start, i_x_end, i_y_end;
......
modules/codec/tarkin.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* tarkin.c: tarkin decoder module making use of libtarkin.
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: tarkin.c,v 1.5 2003/09/02 20:19:25 gbazin Exp $
* $Id: tarkin.c,v 1.6 2003/10/25 00:49:13 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -334,7 +334,7 @@ static void tarkin_CopyPicture( dec_thread_t *p_dec, picture_t *p_pic,
uint8_t *p_src, int i_pitch )
{
int i_plane, i_line, i_src_stride, i_dst_stride;
u8 *p_dst;
uint8_t *p_dst;
for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
......
modules/codec/theora.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* theora.c: theora decoder module making use of libtheora.
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: theora.c,v 1.12 2003/10/09 18:53:00 gbazin Exp $
* $Id: theora.c,v 1.13 2003/10/25 00:49:13 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -218,7 +218,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block )
}
p_sys->i_headers++;
if( p_sys->b_packetizer )
{
/* add a input for the stream ouput */
......@@ -290,7 +290,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block )
return VLC_EGENERIC;
}
p_sys->i_headers++;
ParseTheoraComments( p_dec );
if( p_sys->b_packetizer )
......@@ -317,7 +317,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block )
return VLC_EGENERIC;
}
p_sys->i_headers++;
if( !p_sys->b_packetizer )
{
/* We have all the headers, initialize decoder */
......@@ -498,7 +498,7 @@ static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic,
{
int i_plane, i_line, i_width, i_dst_stride, i_src_stride;
int i_src_xoffset, i_src_yoffset;
u8 *p_dst, *p_src;
uint8_t *p_dst, *p_src;
for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
......@@ -513,7 +513,7 @@ static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic,
{
i_src_xoffset /= 2;
i_src_yoffset /= 2;
}
}
p_src += (i_src_yoffset * i_src_stride + i_src_yoffset);
......
modules/demux/mpeg/system.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* system.c: helper module for TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: system.c,v 1.17 2003/09/10 11:51:00 fenrir Exp $
* $Id: system.c,v 1.18 2003/10/25 00:49:14 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -485,7 +485,7 @@ static void GatherPES( input_thread_t * p_input, data_packet_t * p_data,
if( p_data->p_payload_end - p_data->p_payload_start
>= PES_HEADER_SIZE )
{
p_es->i_pes_real_size = ((u16)p_data->p_payload_start[4] << 8)
p_es->i_pes_real_size = ((uint16_t)p_data->p_payload_start[4] << 8)
+ p_data->p_payload_start[5];
if ( p_es->i_pes_real_size )
{
......@@ -534,9 +534,9 @@ static void GatherPES( input_thread_t * p_input, data_packet_t * p_data,
/*****************************************************************************
* GetID: Get the ID of a stream
*****************************************************************************/
static u16 GetID( data_packet_t * p_data )
static uint16_t GetID( data_packet_t * p_data )
{
u16 i_id;
uint16_t i_id;
i_id = p_data->p_demux_start[3]; /* stream_id */
if( i_id == 0xBD )
......@@ -974,13 +974,13 @@ static es_descriptor_t * ParsePS( input_thread_t * p_input,
*****************************************************************************/
static void DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
{
u32 i_code;
vlc_bool_t b_trash = 0;
es_descriptor_t * p_es = NULL;
uint32_t i_code;
vlc_bool_t b_trash = 0;
es_descriptor_t * p_es = NULL;
i_code = ((u32)p_data->p_demux_start[0] << 24)
| ((u32)p_data->p_demux_start[1] << 16)
| ((u32)p_data->p_demux_start[2] << 8)
i_code = ((uint32_t)p_data->p_demux_start[0] << 24)
| ((uint32_t)p_data->p_demux_start[1] << 16)
| ((uint32_t)p_data->p_demux_start[2] << 8)
| p_data->p_demux_start[3];
if( i_code <= 0x1BC )
{
......@@ -989,8 +989,8 @@ static void DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
case 0x1BA: /* PACK_START_CODE */
{
/* Read the SCR. */
mtime_t scr_time;
u32 i_mux_rate;
mtime_t scr_time;
uint32_t i_mux_rate;
if( (p_data->p_demux_start[4] & 0xC0) == 0x40 )
{
......@@ -1015,7 +1015,7 @@ static void DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
>> 11);
/* mux_rate */
i_mux_rate = ((u32)U16_AT(p_header + 10) << 6)
i_mux_rate = ((uint32_t)U16_AT(p_header + 10) << 6)
| (p_header[12] >> 2);
/* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
* This is the biggest kludge ever !
......
modules/demux/mpeg/system.h
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* system.h: MPEG demultiplexing.
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
* $Id: system.h,v 1.9 2003/08/14 23:32:51 fenrir Exp $
* $Id: system.h,v 1.10 2003/10/25 00:49:14 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -78,7 +78,7 @@
* Used by TS demux to handle a PSI, either with the builtin decoder, either
* with a library such as libdvbpsi
****************************************************************************/
typedef void( * psi_callback_t )(
typedef void( * psi_callback_t )(
input_thread_t * p_input,
data_packet_t * p_data,
es_descriptor_t * p_es,
......@@ -113,19 +113,19 @@ typedef struct psi_section_t
{
byte_t buffer[PSI_SECTION_SIZE];
u8 i_section_number;
u8 i_last_section_number;
u8 i_version_number;
u16 i_section_length;
u16 i_read_in_section;
uint8_t i_section_number;
uint8_t i_last_section_number;
uint8_t i_version_number;
uint16_t i_section_length;
uint16_t i_read_in_section;
/* the PSI is complete */
vlc_bool_t b_is_complete;
/* packet missed up ? */
vlc_bool_t b_trash;
/*about sections */
/*about sections */
vlc_bool_t b_section_complete;
/* where are we currently ? */
......@@ -252,7 +252,7 @@ typedef struct es_ts_data_t
*****************************************************************************/
typedef struct pgrm_ts_data_t
{
u16 i_pcr_pid; /* PCR ES, for TS streams */
uint16_t i_pcr_pid; /* PCR ES, for TS streams */
int i_pmt_version;
/* libdvbpsi pmt decoder handle */
void * p_pmt_handle;
......@@ -281,7 +281,7 @@ typedef struct stream_ps_data_t
{
vlc_bool_t b_has_PSM; /* very rare, in fact */
u8 i_PSM_version;
uint8_t i_PSM_version;
} stream_ps_data_t;
/* PSM version is 5 bits, so -1 is not a valid value */
......
modules/demux/ogg.c
View file @ 88991a5c
......@@ -2,15 +2,15 @@
* ogg.c : ogg stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ogg.c,v 1.41 2003/10/23 16:48:45 gbazin Exp $
* $Id: ogg.c,v 1.42 2003/10/25 00:49:14 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*
* 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
......@@ -39,7 +39,7 @@
#define OGG_BLOCK_SIZE 4096
/*****************************************************************************
* Definitions of structures and functions used by this plugins
* Definitions of structures and functions used by this plugins
*****************************************************************************/
typedef struct logical_stream_s
{
......@@ -107,7 +107,7 @@ typedef struct stream_header_video
ogg_int32_t width;
ogg_int32_t height;
} stream_header_video;
typedef struct stream_header_audio
{
ogg_int16_t channels;
......@@ -251,7 +251,7 @@ static void Ogg_ElemStreamStop( input_thread_t *p_input,
****************************************************************************/
static int Ogg_Check( input_thread_t *p_input )
{
u8 *p_peek;
uint8_t *p_peek;
int i_size = input_Peek( p_input, &p_peek, 4 );
/* Check for the Ogg capture pattern */
......@@ -910,7 +910,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
sprintf( title, "Stream %d", p_ogg->i_streams );
p_cat = input_InfoCategory( p_input, title );
input_AddInfo( p_cat, _("Type"), _("Audio") );
input_AddInfo( p_cat, _("Codec"), "%.4s",
input_AddInfo( p_cat, _("Codec"), "%.4s",
(char *)&p_stream->i_fourcc );
input_AddInfo( p_cat, _("Sample Rate"), "%d",
p_stream->p_wf->nSamplesPerSec );
......@@ -933,7 +933,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
}
}
else if( (*oggpacket.packet & PACKET_TYPE_BITS )
== PACKET_TYPE_HEADER &&
== PACKET_TYPE_HEADER &&
oggpacket.bytes >= (int)sizeof(stream_header)+1 )
{
stream_header *st = (stream_header *)(oggpacket.packet+1);
......@@ -1083,7 +1083,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
sprintf( title, "Stream %d", p_ogg->i_streams );
p_cat = input_InfoCategory( p_input, title );
input_AddInfo( p_cat, _("Type"), _("Audio") );
input_AddInfo( p_cat, _("Codec"), "%.4s",
input_AddInfo( p_cat, _("Codec"), "%.4s",
(char *)&p_stream->i_fourcc );
input_AddInfo( p_cat, _("Sample Rate"), "%d",
p_stream->p_wf->nSamplesPerSec );
......@@ -1386,7 +1386,7 @@ static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg )
static void Deactivate( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data ;
demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data ;
if( p_ogg )
{
......
modules/demux/util/id3.c
View file @ 88991a5c
......@@ -2,15 +2,15 @@
* id3.c: simple id3 tag skipper
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: id3.c,v 1.4 2003/07/13 12:52:40 sigmunau Exp $
* $Id: id3.c,v 1.5 2003/10/25 00:49:14 sam Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
*
* 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
......@@ -52,9 +52,9 @@ vlc_module_end();
static int SkipID3Tag( vlc_object_t *p_this )
{
input_thread_t *p_input;
u8 *p_peek;
uint8_t *p_peek;
int i_size;
u8 version, revision;
uint8_t version, revision;
int b_footer;
if ( p_this->i_object_type != VLC_OBJECT_INPUT )
......@@ -64,7 +64,7 @@ static int SkipID3Tag( vlc_object_t *p_this )
p_input = (input_thread_t *)p_this;
msg_Dbg( p_input, "Checking for ID3 tag" );
/* get 10 byte id3 header */
/* get 10 byte id3 header */
if( input_Peek( p_input, &p_peek, 10 ) < 10 )
{
msg_Err( p_input, "cannot peek()" );
......@@ -75,7 +75,7 @@ static int SkipID3Tag( vlc_object_t *p_this )
{
return( VLC_SUCCESS );
}
version = p_peek[3]; /* These may become usfull later, */
revision = p_peek[4]; /* but we ignore them for now */
b_footer = p_peek[5] & 0x10;
......
modules/demux/util/id3tag.c
View file @ 88991a5c
......@@ -2,15 +2,15 @@
* id3tag.c: id3 tag parser/skipper based on libid3tag
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: id3tag.c,v 1.12 2003/10/20 01:07:28 hartman Exp $
* $Id: id3tag.c,v 1.13 2003/10/25 00:49:14 sam Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
*
* 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
......@@ -51,13 +51,13 @@ set_callbacks( ParseID3Tags, NULL );
vlc_module_end();
/*****************************************************************************
* Definitions of structures and functions used by this plugins
* Definitions of structures and functions used by this plugins
*****************************************************************************/
/*****************************************************************************
* ParseID3Tag : parse an id3tag into the info structures
*****************************************************************************/
static void ParseID3Tag( input_thread_t *p_input, u8 *p_data, int i_size )
static void ParseID3Tag( input_thread_t *p_input, uint8_t *p_data, int i_size )
{
playlist_t * p_playlist;
struct id3_tag * p_id3_tag;
......@@ -67,7 +67,7 @@ static void ParseID3Tag( input_thread_t *p_input, u8 *p_data, int i_size )
char * psz_temp;
int i;
vlc_value_t val;
var_Get( p_input, "demuxed-id3", &val );
if( val.b_bool )
......@@ -75,11 +75,11 @@ static void ParseID3Tag( input_thread_t *p_input, u8 *p_data, int i_size )
msg_Dbg( p_input, "The ID3 tag was already parsed" );
return;
}
p_id3_tag = id3_tag_parse( p_data, i_size );
p_category = input_InfoCategory( p_input, "ID3" );
i = 0;
while ( ( p_frame = id3_tag_findframe( p_id3_tag , "T", i ) ) )
{
i_strings = id3_field_getnstrings( &p_frame->fields[1] );
......@@ -124,7 +124,7 @@ static void ParseID3Tag( input_thread_t *p_input, u8 *p_data, int i_size )
{
input_AddInfo( p_category, (char *)p_frame->description, psz_temp );
}
free( psz_temp );
free( psz_temp );
}
i++;
}
......@@ -140,7 +140,7 @@ static void ParseID3Tag( input_thread_t *p_input, u8 *p_data, int i_size )
static int ParseID3Tags( vlc_object_t *p_this )
{
input_thread_t *p_input;
u8 *p_peek;
uint8_t *p_peek;
int i_size;
int i_size2;
......@@ -154,7 +154,7 @@ static int ParseID3Tags( vlc_object_t *p_this )
if ( p_input->stream.b_seekable &&
p_input->stream.i_method != INPUT_METHOD_NETWORK )
{
{
stream_position_t pos;
/*look for a id3v1 tag at the end of the file*/
......@@ -163,8 +163,8 @@ static int ParseID3Tags( vlc_object_t *p_this )
{
input_AccessReinit( p_input );
p_input->pf_seek( p_input, pos.i_size - 128 );
/* get 10 byte id3 header */
/* get 10 byte id3 header */
if( input_Peek( p_input, &p_peek, 10 ) < 10 )
{
msg_Err( p_input, "cannot peek()" );
......@@ -183,7 +183,7 @@ static int ParseID3Tags( vlc_object_t *p_this )
}
/* look for id3v2.4 tag at end of file */
/* get 10 byte id3 footer */
/* get 10 byte id3 footer */
if( input_Peek( p_input, &p_peek, 128 ) < 128 )
{
msg_Err( p_input, "cannot peek()" );
......@@ -203,10 +203,10 @@ static int ParseID3Tags( vlc_object_t *p_this )
ParseID3Tag( p_input, p_peek, i_size2 );
}
}
input_AccessReinit( p_input );
input_AccessReinit( p_input );
p_input->pf_seek( p_input, 0 );
}
/* get 10 byte id3 header */
/* get 10 byte id3 header */
if( input_Peek( p_input, &p_peek, 10 ) < 10 )
{
msg_Err( p_input, "cannot peek()" );
......
modules/gui/beos/VideoOutput.cpp
View file @ 88991a5c
This diff is collapsed.
modules/gui/beos/VideoWindow.h
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* VideoWindow.h: BeOS video window class prototype
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: VideoWindow.h,v 1.6 2003/02/01 12:01:11 stippi Exp $
* $Id: VideoWindow.h,v 1.7 2003/10/25 00:49:14 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Tony Castley <tcastley@mail.powerup.com.au>
......@@ -13,7 +13,7 @@
* 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
......@@ -38,7 +38,7 @@ typedef struct colorcombo
{
color_space colspace;
const char *name;
u32 chroma;
uint32_t chroma;
int planes;
int pixel_bytes;
} colorcombo;
......@@ -71,8 +71,8 @@ class VideoSettings
SIZE_200 = 3,
};
void SetVideoSize( uint32 mode );
inline uint32 VideoSize() const
void SetVideoSize( uint32_t mode );
inline uint32_t VideoSize() const
{ return fVideoSize; }
enum
{
......@@ -82,15 +82,15 @@ class VideoSettings
FLAG_FULL_SCREEN = 0x0008,
};
inline void SetFlags( uint32 flags )
inline void SetFlags( uint32_t flags )
{ fFlags = flags; }
inline void AddFlags( uint32 flags )
inline void AddFlags( uint32_t flags )
{ fFlags |= flags; }
inline void ClearFlags( uint32 flags )
inline void ClearFlags( uint32_t flags )
{ fFlags &= ~flags; }
inline bool HasFlags( uint32 flags ) const
inline bool HasFlags( uint32_t flags ) const
{ return fFlags & flags; }
inline uint32 Flags() const
inline uint32_t Flags() const
{ return fFlags; }
private:
......@@ -98,8 +98,8 @@ class VideoSettings
static VideoSettings fDefaultSettings;
uint32 fVideoSize;
uint32 fFlags;
uint32_t fVideoSize;
uint32_t fFlags;
BMessage* fSettings;
};
......@@ -113,15 +113,15 @@ class VLCView : public BView
virtual void AttachedToWindow();
virtual void MouseDown(BPoint where);
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 transit,
virtual void MouseMoved(BPoint where, uint32_t transit,
const BMessage* dragMessage);
virtual void Pulse();
virtual void Draw(BRect updateRect);
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void KeyDown(const char* bytes, int32_t numBytes);
private:
vout_thread_t *p_vout;
bigtime_t fLastMouseMovedTime;
bool fCursorHidden;
bool fCursorInside;
......@@ -132,13 +132,13 @@ class VLCView : public BView
class VideoWindow : public BWindow
{
public:
VideoWindow(int v_width,
VideoWindow(int v_width,
int v_height,
BRect frame,
vout_thread_t *p_vout);
vout_thread_t *p_vout);
virtual ~VideoWindow();
// BWindow
// BWindow
virtual void MessageReceived(BMessage* message);
virtual void Zoom(BPoint origin,
float width, float height);
......@@ -168,8 +168,8 @@ public:
// this is the hook controling direct screen connection
int32 i_width; // aspect corrected bitmap size
int32 i_height;
int32_t i_width; // aspect corrected bitmap size
int32_t i_height;
BRect winSize; // current window size
BBitmap *bitmap[3];
// BBitmap *overlaybitmap;
......@@ -186,27 +186,27 @@ private:
int* mode);
void _FreeBuffers();
void _BlankBitmap(BBitmap* bitmap) const;
void _SetVideoSize(uint32 mode);
void _SetVideoSize(uint32_t mode);
void _SetToSettings();
void _SaveScreenShot( BBitmap* bitmap,
char* path,
uint32 translatorID ) const;
static int32 _save_screen_shot( void* cookie );
uint32_t translatorID ) const;
static int32_t _save_screen_shot( void* cookie );
struct screen_shot_info
{
BBitmap* bitmap;
char* path;
uint32 translatorID;
int32 width;
int32 height;
uint32_t translatorID;
int32_t width;
int32_t height;
};
vout_thread_t *p_vout;
int32 fTrueWidth; // incomming bitmap size
int32 fTrueHeight;
int32_t fTrueWidth; // incomming bitmap size
int32_t fTrueHeight;
window_feel fCachedFeel;
bool fInterfaceShowing;
status_t fInitStatus;
......@@ -214,4 +214,4 @@ private:
};
#endif // BEOS_VIDEO_WINDOW_H
modules/gui/qnx/vout.c
View file @ 88991a5c
......@@ -119,7 +119,7 @@ static int QNXDestroyWnd ( vout_thread_t * );
static int NewPicture ( vout_thread_t *, picture_t *, int );
static void FreePicture ( vout_thread_t *, picture_t * );
static int ResizeOverlayOutput ( vout_thread_t * );
static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * );
static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
/*****************************************************************************
* OpenVideo: allocate QNX video thread output method
......@@ -1071,7 +1071,8 @@ static int ResizeOverlayOutput(vout_thread_t *p_vout)
* anything, but could later send information on which colors it was unable
* to set.
*****************************************************************************/
static void SetPalette( vout_thread_t *p_vout, u16 *red, u16 *green, u16 *blue )
static void SetPalette( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{
int i;
......
modules/misc/dummy/decoder.c
View file @ 88991a5c
......@@ -2,15 +2,15 @@
* dec_dummy.c: dummy decoder plugin for vlc.
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: decoder.c,v 1.6 2003/09/02 20:19:26 gbazin Exp $
* $Id: decoder.c,v 1.7 2003/10/25 00:49:14 sam Exp $
*
* Authors: 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
......@@ -66,7 +66,7 @@ int E_(OpenDecoder) ( vlc_object_t *p_this )
*****************************************************************************/
static int Run ( decoder_fifo_t *p_fifo )
{
u8 p_buffer[1024];
uint8_t p_buffer[1024];
bit_stream_t bit_stream;
mtime_t last_date = mdate();
......
modules/misc/dummy/vout.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* vout_dummy.c: Dummy video output display method for testing purposes
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: vout.c,v 1.5 2003/10/24 21:27:06 gbazin Exp $
* $Id: vout.c,v 1.6 2003/10/25 00:49:14 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -42,7 +42,7 @@ static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_t * );
static void Display ( vout_thread_t *, picture_t * );
static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * );
static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
/*****************************************************************************
* OpenVideo: activates dummy video thread output method
......@@ -198,8 +198,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
/*****************************************************************************
* SetPalette: set the palette for the picture
*****************************************************************************/
static void SetPalette ( vout_thread_t *p_vout, u16 *red, u16 *green,
u16 *blue )
static void SetPalette ( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{
/* No need to do anything, the fake direct buffers stay as they are */
}
}
modules/video_chroma/i420_yuy2.c
View file @ 88991a5c
......@@ -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.3 2003/08/29 18:58:05 fenrir Exp $
* $Id: i420_yuy2.c,v 1.4 2003/10/25 00:49:14 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -55,8 +55,8 @@ static void I420_Y211 ( vout_thread_t *, picture_t *, picture_t * );
#endif
#ifdef MODULE_NAME_IS_i420_yuy2_mmx
static unsigned long long i_00ffw;
static unsigned long long i_80w;
static uint64_t i_00ffw;
static uint64_t i_80w;
#endif
/*****************************************************************************
......
modules/video_output/aa.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* vout_aa.c: Aa video output display method for testing purposes
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: aa.c,v 1.2 2003/03/30 18:14:38 gbazin Exp $
* $Id: aa.c,v 1.3 2003/10/25 00:49:14 sam Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -46,7 +46,7 @@ static int Manage ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_t * );
static void Display ( vout_thread_t *, picture_t * );
static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * );
static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
/*****************************************************************************
* Module descriptor
......@@ -246,7 +246,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
/*****************************************************************************
* SetPalette: set the 8bpp palette
*****************************************************************************/
static void SetPalette( vout_thread_t *p_vout, u16 *red, u16 *green, u16 *blue )
static void SetPalette( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{
int i;
......
modules/video_output/directx/vout.h
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* vout.h: Windows DirectX video output header file
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout.h,v 1.6 2003/09/26 16:03:21 gbazin Exp $
* $Id: vout.h,v 1.7 2003/10/25 00:49:14 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -77,8 +77,8 @@ struct vout_sys_t
int i_rgb_colorkey; /* colorkey in RGB used by the overlay */
int i_colorkey; /* colorkey used by the overlay */
volatile u16 i_changes; /* changes made to the video display */
volatile uint16_t i_changes; /* changes made to the video display */
/* Mouse */
volatile vlc_bool_t b_cursor_hidden;
......
modules/video_output/fb.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* fb.c : framebuffer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: fb.c,v 1.6 2003/04/20 21:15:31 sam Exp $
* $Id: fb.c,v 1.7 2003/10/25 00:49:14 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -337,7 +337,7 @@ static void End( vout_thread_t *p_vout )
static void Destroy( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
CloseDisplay( p_vout );
/* Reset the terminal */
......@@ -366,7 +366,7 @@ static void Destroy( vlc_object_t *p_this )
static int Manage( vout_thread_t *p_vout )
{
#if 0
u8 buf;
uint8_t buf;
if ( read(0, &buf, 1) == 1)
{
......@@ -427,7 +427,7 @@ static int panned=0;
{
p_vout->p_sys->var_info.yoffset = 0;
/*p_vout->p_sys->var_info.yoffset = p_vout->p_sys->var_info.yres; */
/* the X offset should be 0, but who knows ...
* some other app might have played with the framebuffer */
p_vout->p_sys->var_info.xoffset = 0;
......@@ -441,8 +441,8 @@ panned++;
}
#if 0
static void SetPalette( vout_thread_t *p_vout,
u16 *red, u16 *green, u16 *blue, u16 *transp )
static void SetPalette( vout_thread_t *p_vout, uint16_t *red, uint16_t *green,
uint16_t *blue, uint16_t *transp )
{
struct fb_cmap cmap = { 0, 256, red, green, blue, transp };
......@@ -536,13 +536,13 @@ static int OpenDisplay( vout_thread_t *p_vout )
switch( p_vout->p_sys->var_info.bits_per_pixel )
{
case 8:
p_vout->p_sys->p_palette = malloc( 8 * 256 * sizeof( u16 ) );
p_vout->p_sys->p_palette = malloc( 8 * 256 * sizeof( uint16_t ) );
p_vout->p_sys->fb_cmap.start = 0;
p_vout->p_sys->fb_cmap.len = 256;
p_vout->p_sys->fb_cmap.red = p_vout->p_sys->p_palette;
p_vout->p_sys->fb_cmap.green = p_vout->p_sys->p_palette + 256 * sizeof( u16 );
p_vout->p_sys->fb_cmap.blue = p_vout->p_sys->p_palette + 2 * 256 * sizeof( u16 );
p_vout->p_sys->fb_cmap.transp = p_vout->p_sys->p_palette + 3 * 256 * sizeof( u16 );
p_vout->p_sys->fb_cmap.green = p_vout->p_sys->p_palette + 256 * sizeof( uint16_t );
p_vout->p_sys->fb_cmap.blue = p_vout->p_sys->p_palette + 2 * 256 * sizeof( uint16_t );
p_vout->p_sys->fb_cmap.transp = p_vout->p_sys->p_palette + 3 * 256 * sizeof( uint16_t );
/* Save the colormap */
ioctl( p_vout->p_sys->i_fd, FBIOGETCMAP, &p_vout->p_sys->fb_cmap );
......
modules/video_output/ggi.c
View file @ 88991a5c
......@@ -2,16 +2,16 @@
* ggi.c : GGI plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: ggi.c,v 1.4 2003/02/20 01:52:46 sigmunau Exp $
* $Id: ggi.c,v 1.5 2003/10/25 00:49:14 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* 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
......@@ -42,13 +42,13 @@ static int Create ( vlc_object_t * );
static void Destroy ( vlc_object_t * );
static int Init ( vout_thread_t * );
static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * );
static void Display ( vout_thread_t *, picture_t * );
static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * );
static void Display ( vout_thread_t *, picture_t * );
static int OpenDisplay ( vout_thread_t * );
static void CloseDisplay ( vout_thread_t * );
static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * );
static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
/*****************************************************************************
* Module descriptor
......@@ -58,7 +58,7 @@ static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * );
"\nBy default VLC will use the value of the DISPLAY"\
" environment variable.")
vlc_module_begin();
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
set_description( "General Graphics Interface video output" );
......@@ -254,9 +254,9 @@ static void End( vout_thread_t *p_vout )
* Terminate an output method created by Create
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
CloseDisplay( p_vout );
free( p_vout->p_sys );
......@@ -278,7 +278,7 @@ static int Manage( vout_thread_t *p_vout )
mask = emKeyboard | emPtrButtonPress | emPtrButtonRelease;
ggiEventPoll( p_vout->p_sys->p_display, mask, &tv );
while( ggiEventsQueued( p_vout->p_sys->p_display, mask) )
{
ggiEventRead( p_vout->p_sys->p_display, &event, mask);
......@@ -511,11 +511,12 @@ static void CloseDisplay( vout_thread_t *p_vout )
/*****************************************************************************
* SetPalette: sets an 8 bpp palette
*****************************************************************************/
static void SetPalette( vout_thread_t *p_vout, u16 *red, u16 *green, u16 *blue )
static void SetPalette( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{
ggi_color colors[256];
int i;
/* Fill colors with color information */
for( i = 0; i < 256; i++ )
{
......
modules/video_output/glide.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* glide.c : 3dfx Glide plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: glide.c,v 1.2 2003/03/30 18:14:38 gbazin Exp $
* $Id: glide.c,v 1.3 2003/10/25 00:49:14 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -77,7 +77,7 @@ struct vout_sys_t
{
GrLfbInfo_t p_buffer_info; /* back buffer info */
u8* pp_buffer[2];
uint8_t * pp_buffer[2];
int i_index;
};
......@@ -107,8 +107,8 @@ static int Create( vlc_object_t *p_this )
}
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_render = NULL;
p_vout->pf_display = Display;
......@@ -298,7 +298,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
return( 1 );
}
grLfbUnlock( GR_LFB_WRITE_ONLY, GR_BUFFER_BACKBUFFER );
grBufferClear( 0, 0, 0 );
p_vout->p_sys->pp_buffer[0] = p_vout->p_sys->p_buffer_info.lfbPtr;
......
modules/video_output/mga/mga.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* mga.c : Matrox Graphic Array plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: mga.c,v 1.2 2003/03/30 18:14:39 gbazin Exp $
* $Id: mga.c,v 1.3 2003/10/25 00:49:14 sam Exp $
*
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Samuel Hocevar <sam@zoy.org>
......@@ -11,7 +11,7 @@
* 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
......@@ -47,15 +47,15 @@ static int Create ( vlc_object_t * );
static void Destroy ( vlc_object_t * );
static int Init ( vout_thread_t * );
static void End ( vout_thread_t * );
static void Display ( vout_thread_t *, picture_t * );
static void End ( vout_thread_t * );
static void Display ( vout_thread_t *, picture_t * );
static int NewPicture ( vout_thread_t *, picture_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
vlc_module_begin();
set_description( _("Matrox Graphic Array video output") );
set_capability( "video output", 10 );
set_callbacks( Create, Destroy );
......@@ -89,22 +89,22 @@ vlc_module_end();
typedef struct mga_vid_config_t
{
u16 version;
u16 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;
u32 format;
u32 frame_size;
u32 num_frames;
uint16_t version;
uint16_t card_type;
uint32_t ram_size;
uint32_t src_width;
uint32_t src_height;
uint32_t dest_width;
uint32_t dest_height;
uint32_t x_org;
uint32_t y_org;
uint8_t colkey_on;
uint8_t colkey_red;
uint8_t colkey_green;
uint8_t colkey_blue;
uint32_t format;
uint32_t frame_size;
uint32_t num_frames;
} mga_vid_config_t;
#endif
......@@ -190,7 +190,7 @@ static int Init( vout_thread_t *p_vout )
* YV12, but it's actually some strange format with packed UV. */
p_vout->output.i_chroma = VLC_FOURCC('Y','M','G','A');
p_vout->p_sys->mga.format = MGA_VID_FORMAT_YV12;
if( ioctl(p_vout->p_sys->i_fd, MGA_VID_CONFIG, &p_vout->p_sys->mga) )
{
msg_Err( p_vout, "MGA config ioctl failed" );
......@@ -281,8 +281,8 @@ static void End( vout_thread_t *p_vout )
* Terminate an output method created by DummyCreateOutputMethod
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
close( p_vout->p_sys->i_fd );
free( p_vout->p_sys );
}
......
modules/video_output/sdl.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: sdl.c,v 1.13 2003/05/05 16:09:37 gbazin Exp $
* $Id: sdl.c,v 1.14 2003/10/25 00:49:14 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
......@@ -612,8 +612,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
*****************************************************************************/
static int OpenDisplay( vout_thread_t *p_vout )
{
Uint32 i_flags;
int i_bpp;
uint32_t i_flags;
int i_bpp;
/* SDL fucked up fourcc definitions on bigendian machines */
uint32_t i_sdl_chroma;
......
modules/video_output/x11/xcommon.h
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* xcommon.h: Defines common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.h,v 1.9 2003/10/24 21:27:06 gbazin Exp $
* $Id: xcommon.h,v 1.10 2003/10/25 00:49:14 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -166,11 +166,11 @@ struct picture_sys_t
#define PROP_MWM_HINTS_ELEMENTS 5
typedef struct mwmhints_t
{
u32 flags;
u32 functions;
u32 decorations;
s32 input_mode;
u32 status;
uint32_t flags;
uint32_t functions;
uint32_t decorations;
int32_t input_mode;
uint32_t status;
} mwmhints_t;
/*****************************************************************************
......
src/misc/beos_specific.cpp
View file @ 88991a5c
/*****************************************************************************
* beos_init.cpp: Initialization for BeOS specific features
* beos_init.cpp: Initialization for BeOS specific features
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: beos_specific.cpp,v 1.32 2003/09/29 17:36:35 gbazin Exp $
* $Id: beos_specific.cpp,v 1.33 2003/10/25 00:49:14 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
*
......@@ -10,7 +10,7 @@
* 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
......@@ -52,7 +52,7 @@ public:
virtual void RefsReceived(BMessage* message);
virtual void MessageReceived(BMessage* message);
virtual bool QuitRequested();
private:
BWindow* fInterfaceWindow;
BMessage* fRefsMessage;
......@@ -62,7 +62,7 @@ private:
* Static vars
*****************************************************************************/
//const uint32 INTERFACE_CREATED = 'ifcr'; /* message sent from interface */
//const uint32_t INTERFACE_CREATED = 'ifcr'; /* message sent from interface */
#include "../../modules/gui/beos/MsgVals.h"
extern "C"
......@@ -163,12 +163,12 @@ void VlcApplication::AboutRequested( )
void VlcApplication::ReadyToRun( )
{
BPath path;
app_info info;
app_info info;
/* Get the program path */
be_app->GetAppInfo( &info );
BEntry entry( &info.ref );
entry.GetPath( &path );
be_app->GetAppInfo( &info );
BEntry entry( &info.ref );
entry.GetPath( &path );
path.GetParent( &path );
p_this->p_libvlc->psz_vlcpath = strdup( path.Path() );
......@@ -224,7 +224,7 @@ void VlcApplication::MessageReceived(BMessage* message)
bool VlcApplication::QuitRequested()
{
if( CurrentMessage() && CurrentMessage()->FindBool( "shortcut" ) )
if( CurrentMessage() && CurrentMessage()->FindBool( "shortcut" ) )
{
/* The user hit Alt+Q, don't let the be_app exit without cleaning.
Let the interface do the job */
......
src/misc/threads.c
View file @ 88991a5c
......@@ -2,7 +2,7 @@
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: threads.c,v 1.41 2003/08/28 17:19:41 sam Exp $
* $Id: threads.c,v 1.42 2003/10/25 00:49:14 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -705,7 +705,7 @@ void __vlc_thread_join( vlc_object_t *p_this, char * psz_file, int i_line )
i_ret = 1;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
int32 exit_value;
int32_t exit_value;
wait_for_thread( p_this->thread_id, &exit_value );
#endif
......
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