Skip to content

V
vlc-1.1
Commit 36ac163c authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

Le retour du demoronifier qui n'est pas content. 

   . 11 moronic long lines destroyed
   . 1282 trailing spaces eradicated
   . 4 ugly macros fixed
   . 5 innocent a_bit_long lines shortened

   . 5987 tabulations transform�es en espaces
   . 153 '??' transform�s en 'XXX??' ou 'FIXME??'
    (ptyx, j'esp�re que ce compromis te convient)

   . commentaires en // corrig�s en /* */
    (je parle bien des commentaires, pas des morceaux de code
     mis en // comme les printf de debug par exemple)

Au passage :

   . version du vlc modifi�e en 0.1.99 (la release sera la 0.2.0)
   . suppression de video_x11.h
   . correction d'un warning dans intf_ctrl.c
parent 3f8bf7fb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3343 additions and 3406 deletions
Makefile
View file @ 36ac163c
......@@ -16,15 +16,15 @@ SHELL=/bin/sh
# Audio output settings
AUDIO = dsp
# Not yet supported
#AUDIO += esd
AUDIO += esd
# Fallback method that should always work
AUDIO += dummy
# Video output settings
VIDEO = x11
#VIDEO += fb
VIDEO += fb
#VIDEO += ggi
#VIDEO += glide
VIDEO += glide
# Not yet supported
#VIDEO += beos
#VIDEO += dga
......@@ -59,7 +59,7 @@ DEBUG=0
################################################################################
# Program version - may only be changed by the project leader
PROGRAM_VERSION = 0.95.0
PROGRAM_VERSION = 0.1.99
# audio options
audio := $(shell echo $(AUDIO) | tr 'A-Z' 'a-z')
......
include/ac3_decoder.h
View file @ 36ac163c
......@@ -279,7 +279,7 @@ typedef struct audblk_s
/* Bit allocation pointer results */
u16 fbw_bap[5][256];
//FIXME figure out exactly how many entries there should be (253-37?)
/* FIXME?? figure out exactly how many entries there should be (253-37?) */
u16 cpl_bap[256];
u16 lfe_bap[7];
......
include/audio_output.h
View file @ 36ac163c
......@@ -40,7 +40,7 @@
#define AOUT_DEFAULT_STEREO 1
/* Audio output rate, in Hz */
#define AOUT_MIN_RATE 22050 /* ?? */
#define AOUT_MIN_RATE 22050 /* XXX?? */
#define AOUT_DEFAULT_RATE 44100
#define AOUT_MAX_RATE 48000
......
include/common.h
View file @ 36ac163c
......@@ -97,7 +97,7 @@ typedef struct video_parser_s * p_video_parser_t;
* byte orders other than little and big endians are not supported, but only
* the VAX seems to have such exotic properties - note that these 'functions'
* needs <netinet/in.h> or the local equivalent. */
/* ?? hton64 should be declared as an extern inline function to avoid border
/* FIXME??: hton64 should be declared as an extern inline function to avoid border
* effects (see byteorder.h) */
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define hton16 htons
......@@ -114,7 +114,7 @@ typedef struct video_parser_s * p_video_parser_t;
#define ntoh32 ntohl
#define ntoh64(i) ( i )
#else
/* ?? cause a compilation error */
/* XXX??: cause a compilation error */
#endif
/* Macros used by input to access the TS buffer */
......
include/config.h
View file @ 36ac163c
......@@ -47,7 +47,7 @@
* or pictures count won't be available if it not set */
#define STATS
/* Define for unthreaded version of the program - ?? not yet implemented */
/* Define for unthreaded version of the program FIXME: not yet implemented ??*/
//#define NO_THREAD
/*****************************************************************************
......@@ -80,7 +80,7 @@
/* Automagically spawn input, audio and video threads ? */
// ?? used ?
/* XXX?? used ? */
#define AUTO_SPAWN
/* When creating or destroying threads in blocking mode, delay to poll thread
......@@ -125,7 +125,7 @@
* Input thread configuration
*****************************************************************************/
/* ?? */
/* XXX?? */
#define INPUT_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ))
/*
......
include/decoder_fifo.h
View file @ 36ac163c
......@@ -13,7 +13,7 @@
* Macros
*****************************************************************************/
/* ?? move to inline functions */
/* FIXME: move to inline functions ??*/
#define DECODER_FIFO_ISEMPTY( fifo ) ( (fifo).i_start == (fifo).i_end )
#define DECODER_FIFO_ISFULL( fifo ) ( ( ( (fifo).i_end + 1 - (fifo).i_start ) \
& FIFO_SIZE ) == 0 )
......
include/input.h
View file @ 36ac163c
......@@ -95,7 +95,7 @@ typedef struct es_descriptor_t
u8 i_type; /* stream type */
boolean_t b_pcr; /* does the stream include a PCR ? */
/* ?? b_pcr will be replaced by something else: since a PCR can't be shared
/* XXX?? b_pcr will be replaced by something else: since a PCR can't be shared
* between several ES, we will probably store the PCR fields directly here,
* and one of those fields will probably (again) be used as a test of the
* PCR presence */
......@@ -119,12 +119,12 @@ typedef struct es_descriptor_t
* vdec_thread_t. We will use explicit
* casts. */
/* ?? video stream descriptor ? */
/* ?? audio stream descriptor ? */
/* ?? hierarchy descriptor ? */
/* ?? target background grid descriptor ? */
/* ?? video window descriptor ? */
/* ?? ISO 639 language descriptor ? */
/* XXX?? video stream descriptor ? */
/* XXX?? audio stream descriptor ? */
/* XXX?? hierarchy descriptor ? */
/* XXX?? target background grid descriptor ? */
/* XXX?? video window descriptor ? */
/* XXX?? ISO 639 language descriptor ? */
#ifdef STATS
/* Stats */
......@@ -132,7 +132,7 @@ typedef struct es_descriptor_t
count_t c_payload_bytes;/* total of payload usefull bytes */
count_t c_packets; /* total packets read */
count_t c_invalid_packets; /* invalid packets read */
/* ?? ... other stats */
/* XXX?? ... other stats */
#endif
} es_descriptor_t;
......@@ -173,13 +173,13 @@ typedef struct
char* psz_srv_name;
#endif
/* ?? target background grid descriptor ? */
/* ?? video window descriptor ? */
/* ?? ISO 639 language descriptor ? */
/* XXX?? target background grid descriptor ? */
/* XXX?? video window descriptor ? */
/* XXX?? ISO 639 language descriptor ? */
#ifdef STATS
/* Stats */
/* ?? ...stats */
/* XXX?? ...stats */
#endif
} pgrm_descriptor_t;
......@@ -241,7 +241,7 @@ typedef struct
#ifdef STATS
/* Stats */
/* ?? ...stats */
/* XXX?? ...stats */
#endif
} stream_descriptor_t;
......
include/input_vlan.h
View file @ 36ac163c
......@@ -2,7 +2,7 @@
* input_vlan.h: vlan input method
* (c)1999 VideoLAN
*****************************************************************************
* ??
* XXX??
*****************************************************************************
* Required headers:
* <netinet/in.h>
......
include/video_decoder.h
View file @ 36ac163c
......@@ -17,7 +17,7 @@
/*****************************************************************************
* vdec_thread_t: video decoder thread descriptor
*****************************************************************************
* ??
* XXX??
*****************************************************************************/
typedef struct vdec_thread_s
{
......@@ -29,8 +29,7 @@ typedef struct vdec_thread_s
vlc_thread_t thread_id; /* id for thread functions */
/* Thread configuration */
/* ?? */
/*??*/
/* XXX?? */
// int *pi_status;
#ifdef OLD_DECODER
......
include/video_fifo.h
View file @ 36ac163c
......@@ -16,7 +16,7 @@
*****************************************************************************/
#ifdef VDEC_SMP
/* ?? move to inline functions */
/* FIXME: move to inline functions ??*/
#define VIDEO_FIFO_ISEMPTY( fifo ) ( (fifo).i_start == (fifo).i_end )
#define VIDEO_FIFO_ISFULL( fifo ) ( ( ( (fifo).i_end + 1 - (fifo).i_start )\
& VFIFO_SIZE ) == 0 )
......
include/video_parser.h
View file @ 36ac163c
......@@ -60,7 +60,7 @@ typedef struct video_buffer_s
/*****************************************************************************
* vpar_thread_t: video parser thread descriptor
*****************************************************************************
* ??
* XXX??
*****************************************************************************/
typedef struct vpar_thread_s
{
......@@ -72,8 +72,7 @@ typedef struct vpar_thread_s
vlc_thread_t thread_id; /* id for thread functions */
/* Thread configuration */
/* ?? */
/*??*/
/* XXX?? */
// int *pi_status;
......@@ -143,10 +142,10 @@ vpar_thread_t * vpar_CreateThread ( /* video_cfg_t *p_cfg, */ input_thread
void vpar_DestroyThread ( vpar_thread_t *p_vpar /*, int *pi_status */ );
/* Time management functions */
/* ?? */
/* XXX?? */
/* Dynamic thread settings */
/* ?? */
/* XXX?? */
/*****************************************************************************
......
include/vlc_thread.h
View file @ 36ac163c
......@@ -59,8 +59,10 @@ static __inline__ int vlc_cond_init ( vlc_cond_t *p_condvar );
static __inline__ int vlc_cond_signal ( vlc_cond_t *p_condvar );
static __inline__ int vlc_cond_wait ( vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex );
//static _inline__ int vlc_cond_timedwait ( vlc_cond_t * condvar, vlc_mutex_t * mutex,
// mtime_t absoute_timeout_time );
#if 0
static _inline__ int vlc_cond_timedwait ( vlc_cond_t * condvar, vlc_mutex_t * mutex,
mtime_t absoute_timeout_time );
#endif
/*****************************************************************************
* vlc_thread_create: create a thread
......
src/ac3_decoder/ac3_decoder_thread.c
View file @ 36ac163c
......@@ -146,7 +146,7 @@ static __inline__ int decode_find_sync( ac3dec_thread_t * p_ac3dec )
p_ac3dec->ac3_decoder.total_bits_read = 16;
return( 0 );
}
DumpBits( &(p_ac3dec->ac3_decoder.bit_stream), 1 ); /* XXX */
DumpBits( &(p_ac3dec->ac3_decoder.bit_stream), 1 ); /* XXX?? */
}
return( -1 );
}
......@@ -203,13 +203,13 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
msleep( INPUT_PTS_DELAY );
/* Initializing the ac3 decoder thread */
if ( InitThread(p_ac3dec) ) /* XXX */
if ( InitThread(p_ac3dec) ) /* XXX?? */
{
p_ac3dec->b_error = 1;
}
/* ac3 decoder thread's main loop */
/* FIXME : do we have enough room to store the decoded frames ? */
/* FIXME : do we have enough room to store the decoded frames ?? */
while ( (!p_ac3dec->b_die) && (!p_ac3dec->b_error) )
{
int i;
......@@ -243,12 +243,12 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
p_ac3dec->p_aout_fifo->l_rate = 32000;
break;
default: /* XXX */
default: /* XXX?? */
fprintf( stderr, "ac3dec debug: invalid fscod\n" );
p_ac3dec->ac3_decoder.b_invalid = 1;
break;
}
if ( p_ac3dec->ac3_decoder.b_invalid ) /* XXX */
if ( p_ac3dec->ac3_decoder.b_invalid ) /* XXX?? */
{
continue;
}
......
src/ac3_decoder/ac3_downmix.c
View file @ 36ac163c
......@@ -34,7 +34,7 @@ typedef struct prefs_s
prefs_t global_prefs = {0,0};
//Pre-scaled downmix coefficients
/* Pre-scaled downmix coefficients */
static float cmixlev_lut[4] = { 0.2928, 0.2468, 0.2071, 0.2468 };
static float smixlev_lut[4] = { 0.2928, 0.2071, 0.0 , 0.2071 };
......@@ -55,12 +55,12 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
dprintf("(downmix) invalid acmod number\n");
*/
//There are two main cases, with or without Dolby Surround
/* There are two main cases, with or without Dolby Surround */
if(global_prefs.use_dolby_surround)
{
switch(p_ac3dec->bsi.acmod)
{
// 3/2
/* 3/2 */
case 7:
left = p_ac3dec->samples.channel[0];
centre = p_ac3dec->samples.channel[1];
......@@ -84,7 +84,7 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 2/2
/* 2/2 */
case 6:
left = p_ac3dec->samples.channel[0];
right = p_ac3dec->samples.channel[1];
......@@ -107,12 +107,12 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 3/1
/* 3/1 */
case 5:
left = p_ac3dec->samples.channel[0];
centre = p_ac3dec->samples.channel[1];
right = p_ac3dec->samples.channel[2];
//Mono surround
/* Mono surround */
right_sur = p_ac3dec->samples.channel[3];
for (j = 0; j < 256; j++)
......@@ -131,11 +131,11 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 2/1
/* 2/1 */
case 4:
left = p_ac3dec->samples.channel[0];
right = p_ac3dec->samples.channel[1];
//Mono surround
/* Mono surround */
right_sur = p_ac3dec->samples.channel[2];
for (j = 0; j < 256; j++)
......@@ -154,7 +154,7 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 3/0
/* 3/0 */
case 3:
left = p_ac3dec->samples.channel[0];
centre = p_ac3dec->samples.channel[1];
......@@ -174,7 +174,7 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 2/0
/* 2/0 */
case 2:
left = p_ac3dec->samples.channel[0];
right = p_ac3dec->samples.channel[1];
......@@ -186,9 +186,9 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 1/0
/* 1/0 */
case 1:
//Mono program!
/* Mono program! */
right = p_ac3dec->samples.channel[0];
for (j = 0; j < 256; j++)
......@@ -204,9 +204,9 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 1+1
/* 1+1 */
case 0:
//Dual mono, output selected by user
/* Dual mono, output selected by user */
right = p_ac3dec->samples.channel[global_prefs.dual_mono_channel_select];
for (j = 0; j < 256; j++)
......@@ -225,10 +225,10 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
else
{
//Non-Dolby surround downmixes
/* Non-Dolby surround downmixes */
switch(p_ac3dec->bsi.acmod)
{
// 3/2
/* 3/2 */
case 7:
left = p_ac3dec->samples.channel[0];
centre = p_ac3dec->samples.channel[1];
......@@ -253,7 +253,7 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 2/2
/* 2/2 */
case 6:
left = p_ac3dec->samples.channel[0];
right = p_ac3dec->samples.channel[1];
......@@ -276,12 +276,12 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 3/1
/* 3/1 */
case 5:
left = p_ac3dec->samples.channel[0];
centre = p_ac3dec->samples.channel[1];
right = p_ac3dec->samples.channel[2];
//Mono surround
/* Mono surround */
right_sur = p_ac3dec->samples.channel[3];
clev = cmixlev_lut[p_ac3dec->bsi.cmixlev];
......@@ -301,11 +301,11 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 2/1
/* 2/1 */
case 4:
left = p_ac3dec->samples.channel[0];
right = p_ac3dec->samples.channel[1];
//Mono surround
/* Mono surround */
right_sur = p_ac3dec->samples.channel[2];
slev = smixlev_lut[p_ac3dec->bsi.surmixlev];
......@@ -324,7 +324,7 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 3/0
/* 3/0 */
case 3:
left = p_ac3dec->samples.channel[0];
centre = p_ac3dec->samples.channel[1];
......@@ -357,9 +357,9 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 1/0
/* 1/0 */
case 1:
//Mono program!
/* Mono program! */
right = p_ac3dec->samples.channel[0];
for (j = 0; j < 256; j++)
......@@ -375,9 +375,9 @@ void downmix( ac3dec_t * p_ac3dec, s16 * out_buf )
}
break;
// 1+1
/* 1+1 */
case 0:
//Dual mono, output selected by user
/* Dual mono, output selected by user */
right = p_ac3dec->samples.channel[global_prefs.dual_mono_channel_select];
for (j = 0; j < 256; j++)
......
src/ac3_decoder/ac3_imdct.c
View file @ 36ac163c
......@@ -183,11 +183,10 @@ void imdct( ac3dec_t * p_ac3dec )
imdct_do_512(p_ac3dec->coeffs.fbw[i],p_ac3dec->samples.channel[i],delay[i]);
}
//XXX We don't bother with the IMDCT for the LFE as it's currently
//unused.
/* XXX?? We don't bother with the IMDCT for the LFE as it's currently
* unused. */
//if (bsi->lfeon)
// imdct_do_512(coeffs->lfe,samples->channel[5],delay[5]);
//
}
void
......@@ -209,7 +208,7 @@ imdct_do_512(float x[],float y[],float delay[])
float *delay_ptr;
float *window_ptr;
// Pre IFFT complex multiply plus IFFT cmplx conjugate
/* Pre IFFT complex multiply plus IFFT cmplx conjugate */
for( i=0; i < N/4; i++)
{
/* z[i] = (X[N/2-2*i-1] + j * X[2*i]) * (xcos1[i] + j * xsin1[i]) ; */
......@@ -217,7 +216,7 @@ imdct_do_512(float x[],float y[],float delay[])
buf[i].imag = -((x[2*i] * xcos1[i]) + (x[N/2-2*i-1] * xsin1[i]));
}
//Bit reversed shuffling
/* Bit reversed shuffling */
for(i=0; i<N/4; i++)
{
k = bit_reverse_512[i];
......@@ -328,7 +327,7 @@ imdct_do_256(float x[],float y[],float delay[])
buf_2[k].imag = - (x[q + 1] * xcos2[k] + x[p + 1] * xsin2[k]);
}
//IFFT Bit reversed shuffling
/* IFFT Bit reversed shuffling */
for(i=0; i<N/8; i++)
{
k = bit_reverse_256[i];
......@@ -351,7 +350,7 @@ imdct_do_256(float x[],float y[],float delay[])
{
p = k + i;
q = p + two_m;
//Do block 1
/* Do block 1 */
tmp_a_r = buf_1[p].real;
tmp_a_i = buf_1[p].imag;
tmp_b_r = buf_1[q].real * w[m][k].real - buf_1[q].imag * w[m][k].imag;
......@@ -361,7 +360,7 @@ imdct_do_256(float x[],float y[],float delay[])
buf_1[q].real = tmp_a_r - tmp_b_r;
buf_1[q].imag = tmp_a_i - tmp_b_i;
//Do block 2
/* Do block 2 */
tmp_a_r = buf_2[p].real;
tmp_a_i = buf_2[p].imag;
tmp_b_r = buf_2[q].real * w[m][k].real - buf_2[q].imag * w[m][k].imag;
......
src/ac3_decoder/ac3_mantissa.c
View file @ 36ac163c
......@@ -34,7 +34,7 @@ static float q_2_2[ 128 ] = { (-4 << 15) / 5, (-2 << 15) / 5, 0, (2 << 15) / 5,
static float q_4_0[ 128 ] = { (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, (-2 << 15) / 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (2 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, (10 << 15) / 11, 0, 0, 0, 0, 0, 0, 0 };
static float q_4_1[ 128 ] = { (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, (-10 << 15) / 11, (-8 << 15) / 11, (-6 << 15) / 11, (-4 << 15) / 11, (-2 << 15) / 11, 0, (2 << 15) / 11, (4 << 15) / 11, (6 << 15) / 11, (8 << 15) / 11, (10 << 15) / 11, 0, 0, 0, 0, 0, 0, 0 };
//Lookup tables of 0.16 two's complement quantization values
/* Lookup tables of 0.16 two's complement quantization values */
/*
s32 q_1[3] = {( -2 << 15)/3, 0 ,( 2 << 15)/3 };
......@@ -59,7 +59,7 @@ static float q_5[15] = {(-14 << 15)/15,(-12 << 15)/15,(-10 << 15)/15,
( 4 << 15)/15,( 6 << 15)/15,( 8 << 15)/15,
( 10 << 15)/15,( 12 << 15)/15,( 14 << 15)/15};
//These store the persistent state of the packed mantissas
/* These store the persistent state of the packed mantissas */
static float q_1[2];
static float q_2[2];
static float q_4[1];
......@@ -67,8 +67,8 @@ static s32 q_1_pointer;
static s32 q_2_pointer;
static s32 q_4_pointer;
//Conversion from bap to number of bits in the mantissas
//zeros account for cases 0,1,2,4 which are special cased
/* Conversion from bap to number of bits in the mantissas
* zeros account for cases 0,1,2,4 which are special cased */
static u16 qnttztab[16] = { 0, 0, 0, 3, 0 , 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16};
static float exp_lut[ 25 ] =
......@@ -105,7 +105,7 @@ static __inline__ float float_get( ac3dec_t * p_ac3dec, u16 bap, u16 exp )
{
u32 group_code;
//If the bap is 0-5 then we have special cases to take care of
/* If the bap is 0-5 then we have special cases to take care of */
switch ( bap )
{
case 0:
......
src/ac3_decoder/ac3_parse.c
View file @ 36ac163c
......@@ -876,17 +876,17 @@ void parse_auxdata( ac3dec_t * p_ac3dec )
p_ac3dec->total_bits_read += 1;
}
//get the auxdata exists bit
/* get the auxdata exists bit */
NeedBits( &(p_ac3dec->bit_stream), 1 );
DumpBits( &(p_ac3dec->bit_stream), 1 );
p_ac3dec->total_bits_read += 1;
//Skip the CRC reserved bit
/* Skip the CRC reserved bit */
NeedBits( &(p_ac3dec->bit_stream), 1 );
DumpBits( &(p_ac3dec->bit_stream), 1 );
p_ac3dec->total_bits_read += 1;
//Get the crc
/* Get the crc */
NeedBits( &(p_ac3dec->bit_stream), 16 );
DumpBits( &(p_ac3dec->bit_stream), 16 );
p_ac3dec->total_bits_read += 16;
......
src/audio_decoder/audio_constants.h
View file @ 36ac163c
......@@ -246,7 +246,7 @@
/*54*/ 0.00000762939453, /*55*/ 0.00000605545445, /*56*/ 0.00000480621738,\
/*57*/ 0.00000381469727, /*58*/ 0.00000302772723, /*59*/ 0.00000240310869,\
/*60*/ 0.00000190734863, /*61*/ 0.00000151386361, /*62*/ 0.00000120155435,\
/*63*/ 0.0 /* ?? invalid scale factor ?? */ \
/*63*/ 0.0 /* XXX?? invalid scale factor ? */ \
}
......
src/audio_decoder/audio_decoder.c
View file @ 36ac163c
......@@ -272,7 +272,9 @@ static __inline__ int adec_Layer2_Stereo( adec_thread_t * p_adec )
s16 * p_s16;
int i_need = 0, i_dump = 0;
// static const int pi_framesize[512] = ADEC_FRAME_SIZE;
#if 0
static const int pi_framesize[512] = ADEC_FRAME_SIZE;
#endif
/* Read the audio frame header and flush the bit buffer */
i_header = p_adec->bit_stream.fifo.buffer;
......@@ -679,18 +681,20 @@ static __inline__ int adec_Layer2_Stereo( adec_thread_t * p_adec )
NEXT_BUF
READ_SAMPLE_L2S( pf_scalefactor_0_2, pf_scalefactor_1_2, 12 )
// fprintf(stderr, "adec debug: layer == %i, padding_bit == %i, sampling_frequency == %i, bitrate_index == %i\n",
// (i_header & ADEC_HEADER_LAYER_MASK) >> ADEC_HEADER_LAYER_SHIFT,
// (i_header & ADEC_HEADER_PADDING_BIT_MASK) >> ADEC_HEADER_PADDING_BIT_SHIFT,
// (i_header & ADEC_HEADER_SAMPLING_FREQUENCY_MASK) >> ADEC_HEADER_SAMPLING_FREQUENCY_SHIFT,
// (i_header & ADEC_HEADER_BITRATE_INDEX_MASK) >> ADEC_HEADER_BITRATE_INDEX_SHIFT);
// fprintf(stderr, "adec debug: framesize == %i, i_need == %i, i_dump == %i\n",
// pi_framesize[ 128 * ((i_header & ADEC_HEADER_LAYER_MASK) >> ADEC_HEADER_LAYER_SHIFT) +
// 64 * ((i_header & ADEC_HEADER_PADDING_BIT_MASK) >> ADEC_HEADER_PADDING_BIT_SHIFT) +
// 16 * ((i_header & ADEC_HEADER_SAMPLING_FREQUENCY_MASK) >> ADEC_HEADER_SAMPLING_FREQUENCY_SHIFT) +
// 1 * ((i_header & ADEC_HEADER_BITRATE_INDEX_MASK) >> ADEC_HEADER_BITRATE_INDEX_SHIFT) ],
// i_need,
// i_dump);
#if 0
fprintf(stderr, "adec debug: layer == %i, padding_bit == %i, sampling_frequency == %i, bitrate_index == %i\n",
(i_header & ADEC_HEADER_LAYER_MASK) >> ADEC_HEADER_LAYER_SHIFT,
(i_header & ADEC_HEADER_PADDING_BIT_MASK) >> ADEC_HEADER_PADDING_BIT_SHIFT,
(i_header & ADEC_HEADER_SAMPLING_FREQUENCY_MASK) >> ADEC_HEADER_SAMPLING_FREQUENCY_SHIFT,
(i_header & ADEC_HEADER_BITRATE_INDEX_MASK) >> ADEC_HEADER_BITRATE_INDEX_SHIFT);
fprintf(stderr, "adec debug: framesize == %i, i_need == %i, i_dump == %i\n",
pi_framesize[ 128 * ((i_header & ADEC_HEADER_LAYER_MASK) >> ADEC_HEADER_LAYER_SHIFT) +
64 * ((i_header & ADEC_HEADER_PADDING_BIT_MASK) >> ADEC_HEADER_PADDING_BIT_SHIFT) +
16 * ((i_header & ADEC_HEADER_SAMPLING_FREQUENCY_MASK) >> ADEC_HEADER_SAMPLING_FREQUENCY_SHIFT) +
1 * ((i_header & ADEC_HEADER_BITRATE_INDEX_MASK) >> ADEC_HEADER_BITRATE_INDEX_SHIFT) ],
i_need,
i_dump);
#endif
p_adec->bit_stream.fifo.buffer = 0;
p_adec->bit_stream.fifo.i_available = 0;
return( 6 );
......@@ -796,10 +800,12 @@ static int InitThread( adec_thread_t * p_adec )
*****************************************************************************/
static void RunThread( adec_thread_t * p_adec )
{
// static const int pi_framesize[512] = ADEC_FRAME_SIZE;
// int i_header;
// int i_framesize;
// int i_dummy;
#if 0
static const int pi_framesize[512] = ADEC_FRAME_SIZE;
int i_header;
int i_framesize;
int i_dummy;
#endif
intf_DbgMsg("adec debug: running audio decoder thread (%p) (pid == %i)\n", p_adec, getpid());
......@@ -845,7 +851,7 @@ static void RunThread( adec_thread_t * p_adec )
* l_end_frame index would be incremented 6 times. But, if after
* this operation the audio output fifo contains less than 6 frames,
* it would mean that we had not enough room to store the 6 frames :-P */
while ( (((p_adec->p_aout_fifo->l_end_frame + 6) - p_adec->p_aout_fifo->l_start_frame) & AOUT_FIFO_SIZE) < 6 ) /* XXX */
while ( (((p_adec->p_aout_fifo->l_end_frame + 6) - p_adec->p_aout_fifo->l_start_frame) & AOUT_FIFO_SIZE) < 6 ) /* XXX?? */
{
vlc_cond_wait( &p_adec->p_aout_fifo->data_wait, &p_adec->p_aout_fifo->data_lock );
}
......
src/audio_output/audio_output.c
View file @ 36ac163c
......@@ -64,7 +64,9 @@ aout_thread_t *aout_CreateThread( int *pi_status )
aout_thread_t * p_aout; /* thread descriptor */
char * psz_method;
char * psz_plugin;
// int i_status; /* thread status */
#if 0
int i_status; /* thread status */
#endif
/* Allocate descriptor */
p_aout = (aout_thread_t *) malloc( sizeof(aout_thread_t) );
......@@ -79,11 +81,11 @@ aout_thread_t *aout_CreateThread( int *pi_status )
psz_plugin = malloc( sizeof("./audio_output/aout_.so") + strlen(psz_method) );
sprintf( psz_plugin, "./audio_output/aout_%s.so", psz_method );
p_aout->p_aout_plugin = dlopen (psz_plugin, RTLD_LAZY);
p_aout->p_aout_plugin = dlopen( psz_plugin, RTLD_NOW | RTLD_GLOBAL );
if( p_aout->p_aout_plugin == NULL )
{
intf_ErrMsg( "error: could not open audio plugin %s\n", psz_method );
intf_ErrMsg( "error: could not open audio plugin %s\n", psz_plugin );
free( psz_plugin );
free( p_aout );
return( NULL );
......@@ -110,8 +112,8 @@ aout_thread_t *aout_CreateThread( int *pi_status )
return( NULL );
}
p_aout->b_stereo = ( p_aout->i_channels == 2 ) ? 1 : 0; /* XXX only works
for i_channels == 1 or 2 */
p_aout->b_stereo = ( p_aout->i_channels == 2 ) ? 1 : 0; /* FIXME: only works
for i_channels == 1 or 2 ??*/
if ( p_aout->p_sys_reset( p_aout ) )
{
......@@ -142,9 +144,9 @@ aout_thread_t *aout_CreateThread( int *pi_status )
return( NULL );
}
//?? maybe it would be cleaner to change SpawnThread prototype
//?? see vout to handle status correctly - however, it is not critical since
//?? this thread is only called in main and all calls are blocking
/* FIXME: maybe it would be cleaner to change SpawnThread prototype
* see vout to handle status correctly ?? however, it is not critical since
* this thread is only called in main and all calls are blocking */
if( aout_SpawnThread( p_aout ) )
{
p_aout->p_sys_close( p_aout );
......@@ -217,8 +219,8 @@ static int aout_SpawnThread( aout_thread_t * p_aout )
break;
default:
intf_ErrMsg("aout error: unknown audio output format (%i)\n",
p_aout->i_format);
intf_ErrMsg( "aout error: unknown audio output format (%i)\n",
p_aout->i_format );
return( -1 );
}
break;
......@@ -298,13 +300,13 @@ static int aout_SpawnThread( aout_thread_t * p_aout )
*****************************************************************************/
void aout_DestroyThread( aout_thread_t * p_aout, int *pi_status )
{
//???? pi_status is not handled correctly: check vout how to do!
/* FIXME: pi_status is not handled correctly: check vout how to do!?? */
intf_DbgMsg("aout debug: requesting termination of audio output thread (%p)\n", p_aout);
/* Ask thread to kill itself and wait until it's done */
p_aout->b_die = 1;
vlc_thread_join( p_aout->thread_id ); // only if pi_status is NULL
vlc_thread_join( p_aout->thread_id ); /* only if pi_status is NULL */
/* Free the allocated memory */
free( p_aout->buffer );
......@@ -500,7 +502,7 @@ static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo, m
}
/* We are looking for the next dated frame */
/* FIXME : is the output fifo full ? */
/* FIXME : is the output fifo full ?? */
while ( !p_fifo->b_next_frame )
{
while ( p_fifo->l_next_frame != p_fifo->l_end_frame )
......
src/generic_decoder/generic_decoder.c
View file @ 36ac163c
......@@ -65,7 +65,7 @@ static void PrintPES ( pes_packet_t *p_pes, int i_stream_id );
* to its description. On error, it returns NULL.
* Following configuration properties are used:
* GDEC_CFG_ACTIONS (required)
* ??
* XXX??
*****************************************************************************/
gdec_thread_t * gdec_CreateThread( gdec_cfg_t *p_cfg, input_thread_t *p_input,
int *pi_status )
......@@ -90,7 +90,7 @@ gdec_thread_t * gdec_CreateThread( gdec_cfg_t *p_cfg, input_thread_t *p_input,
/* Copy configuration */
p_gdec->i_actions = p_cfg->i_actions;
/* ?? */
/* XXX?? */
/* Set status */
p_gdec->pi_status = (pi_status != NULL) ? pi_status : &i_status;
......@@ -194,7 +194,7 @@ static int CheckConfiguration( gdec_cfg_t *p_cfg )
*****************************************************************************/
static int InitThread( gdec_thread_t *p_gdec )
{
/* ?? */
/* XXX?? */
/* Update status */
*p_gdec->pi_status = THREAD_START;
......@@ -239,8 +239,8 @@ static void RunThread( gdec_thread_t *p_gdec )
*/
while( (!p_gdec->b_die) && (!p_gdec->b_error) )
{
/* ?? locks rajouter ? - vrifier les macros (transformer en inline ?) */
/* ?? on idle loop, increment c_idle_loops */
/* FIXME: locks rajouter ?? - vrifier les macros (transformer en inline ?) */
/* on idle loop, increment c_idle_loops */
while( !DECODER_FIFO_ISEMPTY( p_gdec->fifo ) )
{
p_pes = DECODER_FIFO_START( p_gdec->fifo );
......@@ -262,13 +262,13 @@ static void RunThread( gdec_thread_t *p_gdec )
/* PES multiplexed stream saving */
if( p_gdec->i_actions & GDEC_SAVE )
{
/* ?? */
/* XXX?? */
}
/* PES demultiplexed stream saving */
if( p_gdec->i_actions & GDEC_SAVE_DEMUX )
{
/* ?? */
/* XXX?? */
}
/* PES information printing */
......@@ -344,7 +344,7 @@ static void EndThread( gdec_thread_t *p_gdec )
#ifdef DEBUG
/* Check for remaining PES packets */
/* ?? */
/* XXX?? */
#endif
/* Destroy thread structures allocated by InitThread */
......@@ -372,7 +372,7 @@ static void IdentifyPES( gdec_thread_t *p_gdec, pes_packet_t *p_pes, int i_strea
case INPUT_METHOD_TS_UCAST:
case INPUT_METHOD_TS_BCAST:
case INPUT_METHOD_TS_VLAN_BCAST:
/* ?? since PID is extracted by demux, it could be usefull to store it
/* XXX?? since PID is extracted by demux, it could be usefull to store it
* in a readable place, i.e. the TS packet descriptor, rather than to
* re-extract it now */
i_id = U16_AT(&p_pes->p_first_ts->buffer[1]) & 0x1fff;
......@@ -419,7 +419,7 @@ static void IdentifyPES( gdec_thread_t *p_gdec, pes_packet_t *p_pes, int i_strea
}
/* Update ES table */
/* ?? */
/* XXX?? */
}
/*****************************************************************************
......
src/generic_decoder/generic_decoder.h
View file @ 36ac163c
......@@ -9,7 +9,7 @@
* "vlc_thread.h"
* "input.h"
* "decoder_fifo.h"
* ??
* XXX??
*****************************************************************************/
/*****************************************************************************
......@@ -50,13 +50,13 @@ typedef struct gdec_thread_s
input_thread_t * p_input; /* input thread */
decoder_fifo_t fifo; /* PES input fifo */
/* ?? status info */
/* XXX?? status info */
int * pi_status;
/* Files array - these files are used to extract ES streams from a
* demultiplexed stream */
/* ?? */
/* XXX?? */
#ifdef STATS
/* Statistics */
......@@ -83,7 +83,7 @@ gdec_thread_t * gdec_CreateThread ( gdec_cfg_t *p_cfg,
void gdec_DestroyThread ( gdec_thread_t *p_gdec, int *pi_status );
/* Time management functions */
/* ?? */
/* XXX?? */
/* Dynamic thread settings */
/* ?? */
/* XXX?? */
src/input/input.c
View file @ 36ac163c
This diff is collapsed.
src/input/input_file.c
View file @ 36ac163c
......@@ -22,7 +22,7 @@
*****************************************************************************/
int input_FileOpen( input_thread_t *p_input )
{
//??
/* XXX?? */
return( 1 );
}
......@@ -32,7 +32,7 @@ int input_FileOpen( input_thread_t *p_input )
int input_FileRead( input_thread_t *p_input, const struct iovec *p_vector,
size_t i_count )
{
//??
/* XXX?? */
return( -1 );
}
......@@ -41,5 +41,5 @@ int input_FileRead( input_thread_t *p_input, const struct iovec *p_vector,
*****************************************************************************/
void input_FileClose( input_thread_t *p_input )
{
//??
/* XXX?? */
}
src/input/input_psi.c
View file @ 36ac163c
......@@ -49,7 +49,7 @@ u32 i_crc_32_table[256];
* the option (audio and video) passed to the VideoLAN client.
*/
#ifdef AUTO_SPAWN
//??extern program_data_t *p_main;
//XXX?? extern program_data_t *p_main;
#endif
/*
......@@ -107,8 +107,8 @@ int input_PsiInit( input_thread_t *p_input )
{
ASSERT(p_input);
/* Precalculate the 32-bit CRC table if not already done ???
TO DO -> Put a lock or do that at pgrm init */
/* Precalculate the 32-bit CRC table if not already done ?
FIXME: Put a lock or do that at pgrm init ?? */
if( !b_crc_initialised )
{
BuildCrc32Table();
......@@ -137,10 +137,10 @@ int input_PsiEnd( input_thread_t *p_input )
ASSERT(p_input);
/* Stop to receive all the PSI tables associated with that program */
/* TO DO ??? -> Not really usefull */
/* FIXME: Not really useful ??*/
/* Clean also descriptors for programs associated with that stream */
/* TO DO ??? -> Not really usefull and maybe buggy */
/* FIXME: -> Not really useful and maybe buggy ??*/
/* Destroy the stream description */
DestroyStreamDescr( p_input, p_input->p_stream->i_stream_id );
......@@ -151,9 +151,9 @@ int input_PsiEnd( input_thread_t *p_input )
/*****************************************************************************
* input_PsiRead: Read the table of programs
*****************************************************************************
* Ugly debugging function at that time ???????
* Ugly debugging function at that time ? XXX??
*****************************************************************************/
void input_PsiRead( input_thread_t *p_input /* ??? */ )
void input_PsiRead( input_thread_t *p_input /* XXX?? */ )
{
int i_index;
int i_index2;
......@@ -679,7 +679,7 @@ static void DecodePgrmMapSection( u8* p_pms, input_thread_t* p_input )
/*****************************************************************************
* DecodeSrvDescrSection
*****************************************************************************
* A finir et a refaire proprement ????
* FIXME: A finir et a refaire proprement ??
*****************************************************************************/
void DecodeSrvDescrSection( byte_t* p_sdt, input_thread_t *p_input )
{
......@@ -1183,7 +1183,7 @@ static pgrm_descriptor_t* AddPgrmDescr( stream_descriptor_t* p_stream,
p_stream->ap_programs[i_pgrm_index]->i_es_number = 0;
p_stream->ap_programs[i_pgrm_index]->ap_es = NULL;
/* descriptors ???? */
/* descriptors ? XXX?? */
return p_stream->ap_programs[i_pgrm_index];
}
......@@ -1272,7 +1272,7 @@ static es_descriptor_t* AddESDescr(input_thread_t* p_input,
intf_DbgMsg("Slot %d in p_es table assigned to ES %d\n", i_index, i_es_pid);
/* Init its values */
p_es->i_type = 0; /* ??? */
p_es->i_type = 0; /* XXX?? */
p_es->b_psi = 0;
p_es->b_pcr = 0;
p_es->i_continuity_counter = 0xFF;
......
src/input/input_vlan.c
View file @ 36ac163c
......@@ -110,7 +110,7 @@ int input_VlanJoin( int i_vlan_id )
p_main->p_vlan->i_vlan_id = i_vlan_id;
intf_Msg("Joining VLAN %d (channel %d)\n", i_vlan_id + 2, i_vlan_id );
return( ZeTrucMucheFunction( i_vlan_id ) ); // ?? join vlan
return( ZeTrucMucheFunction( i_vlan_id ) ); /* FIXME: join vlan ?? */
}
/*****************************************************************************
......@@ -121,7 +121,7 @@ int input_VlanJoin( int i_vlan_id )
*****************************************************************************/
void input_VlanLeave( int i_vlan_id )
{
// ??
/* XXX?? */
}
/* following functions are local */
......@@ -179,7 +179,7 @@ static int ZeTrucMucheFunction( int Channel)
inet_aton( ipaddr, &(sa_client.sin_addr) );
/* Initialization of the socket */
i_socket = socket(AF_INET, SOCK_DGRAM, 17 ); // ?? UDP
i_socket = socket(AF_INET, SOCK_DGRAM, 17 ); /* XXX?? UDP */
/* SOCK_DGRAM because here we use DATAGRAM
* Sachant qu'il y a un #define AF_INET = PF_INET dans sys/socket.h et que PF_INET est le IP protocol family ...
* Protocol is in #define, should be 17 for udp */
......
src/interface/interface.c
View file @ 36ac163c
......@@ -85,7 +85,7 @@ intf_thread_t* intf_Create( void )
psz_plugin = malloc( sizeof("./interface/intf_.so") + strlen(psz_method) );
sprintf( psz_plugin, "./interface/intf_%s.so", psz_method );
p_intf->p_intf_plugin = dlopen( psz_plugin, RTLD_LAZY );
p_intf->p_intf_plugin = dlopen( psz_plugin, RTLD_NOW | RTLD_GLOBAL );
if( p_intf->p_intf_plugin == NULL )
{
......@@ -159,7 +159,7 @@ void intf_Run( intf_thread_t *p_intf )
/* Check attached threads status */
if( (p_intf->p_vout != NULL) && p_intf->p_vout->b_error )
{
//?? add aout error detection
/* FIXME: add aout error detection ?? */
p_intf->b_die = 1;
}
if( (p_intf->p_input != NULL) && p_intf->p_input->b_error )
......@@ -270,14 +270,14 @@ int intf_ProcessKey( intf_thread_t *p_intf, int i_key )
intf_SelectChannel( p_intf, i_key - '0' );
break;
case '+': /* volume + */
// ??
/* XXX?? */
break;
case '-': /* volume - */
// ??
/* XXX?? */
break;
case 'M': /* toggle mute */
case 'm':
// ??
/* XXX?? */
break;
case 'g': /* gamma - */
if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma > -INTF_GAMMA_LIMIT) )
......
src/interface/intf_console.c
View file @ 36ac163c
......@@ -58,7 +58,7 @@ void intf_ConsoleDestroy( intf_console_t *p_console )
*****************************************************************************/
void intf_ConsoleClear( intf_console_t *p_console )
{
//??
/* XXX?? */
}
/*****************************************************************************
......@@ -68,7 +68,7 @@ void intf_ConsoleClear( intf_console_t *p_console )
*****************************************************************************/
void intf_ConsolePrint( intf_console_t *p_console, char *psz_str )
{
//??
/* XXX?? */
}
......@@ -79,7 +79,7 @@ void intf_ConsolePrint( intf_console_t *p_console, char *psz_str )
*****************************************************************************/
void intf_ConsoleExec( intf_console_t *p_console, char *psz_str )
{
//??
/* XXX?? */
}
/* following functions are local */
src/interface/intf_ctrl.c
View file @ 36ac163c
......@@ -220,7 +220,7 @@ static int Exec( int i_argc, intf_arg_t *p_argv )
*****************************************************************************/
static int DisplayImage( int i_argc, intf_arg_t *p_argv )
{
/* ?? */
/* XXX?? */
return( INTF_NO_ERROR );
}
......@@ -376,11 +376,11 @@ static int PlayAudio( int i_argc, intf_arg_t *p_argv )
/*****************************************************************************
* PlayVideo: play a video sequence from a file
*****************************************************************************
* ??
* XXX??
*****************************************************************************/
static int PlayVideo( int i_argc, intf_arg_t *p_argv )
{
/* ?? */
/* XXX?? */
return( INTF_NO_ERROR );
}
......@@ -412,7 +412,7 @@ static int SelectPID( int i_argc, intf_arg_t *p_argv )
switch( p_argv[i_arg].i_index )
{
case 0:
// ?? useless
/* FIXME: useless ?? */
i_input = p_argv[i_arg].i_num;
break;
case 1:
......@@ -424,8 +424,8 @@ static int SelectPID( int i_argc, intf_arg_t *p_argv )
/* Find to which input this command is destinated */
intf_IntfMsg( "Adding PID %d to input %d\n", i_pid, i_input );
//???? input_AddPgrmElem( p_main->p_intf->p_x11->p_input,
//???? i_pid );
//XXX?? input_AddPgrmElem( p_main->p_intf->p_x11->p_input,
//XXX?? i_pid );
return( INTF_NO_ERROR );
}
......@@ -489,7 +489,7 @@ static int Test( int i_argc, intf_arg_t *p_argv )
{
int i_thread;
/*?? if( i_argc == 1 )
/*XXX?? if( i_argc == 1 )
{
i_thread = intf_CreateVoutThread( &p_main->intf_thread, NULL, -1, -1);
intf_IntfMsg("return value: %d", i_thread );
......@@ -497,7 +497,7 @@ static int Test( int i_argc, intf_arg_t *p_argv )
else*/
{
i_thread = p_argv[1].i_num;
//?? intf_DestroyVoutThread( &p_main->intf_thread, i_thread );
//XXX?? intf_DestroyVoutThread( &p_main->intf_thread, i_thread );
}
return( INTF_NO_ERROR );
......@@ -530,12 +530,12 @@ static int Vlan( int i_argc, intf_arg_t *p_argv )
/* Command is 'join' */
if( !strcmp(p_argv[i_command].psz_str, "join") )
{
/* ?? */
/* XXX?? */
}
/* Command is 'leave' */
else if( !strcmp(p_argv[i_command].psz_str, "leave") )
{
/* ?? */
/* XXX?? */
}
/* Command is unknown */
else
......@@ -558,6 +558,6 @@ static int Psi( int i_argc, intf_arg_t *p_argv )
int i_index = p_argv[1].i_num;
intf_IntfMsg("Reading PSI table for input %d\n", i_index);
//???? input_PsiRead(p_main->p_intf->p_x11->p_input );
//XXX?? input_PsiRead(p_main->p_intf->p_x11->p_input );
return( INTF_NO_ERROR );
}
src/interface/main.c
View file @ 36ac163c
......@@ -425,11 +425,11 @@ static void Usage( int i_fashion )
/* Options */
intf_Msg("Options:\n" \
" -h, --help, -H, --longhelp \tprint short/long usage\n" \
" -v, --version \tprint version information\n" \
" -v, --version \tprint version information\n"\
" --noaudio, --novideo \tdisable audio/video\n" \
" --aout {" AUDIO_OPTIONS "} \taudio output method\n" \
" --aout {" AUDIO_OPTIONS "} \taudio output method\n"\
" --stereo, --mono \tstereo/mono audio\n" \
" --vout {" VIDEO_OPTIONS "} \tvideo output method\n" \
" --vout {" VIDEO_OPTIONS "} \tvideo output method\n"\
" --display <display> \tdisplay string\n" \
" --width <w>, --height <h> \tdisplay dimensions\n" \
" -g, --grayscale, --color \tgrayscale/color video\n" \
......@@ -468,7 +468,7 @@ static void Usage( int i_fashion )
intf_Msg("Input parameters:\n" \
" " INPUT_SERVER_VAR "=<hostname> \tvideo server\n" \
" " INPUT_PORT_VAR "=<port> \tvideo server port\n" \
" " INPUT_IFACE_VAR "=<interface> \tnetwork interface\n" \
" " INPUT_IFACE_VAR "=<interface> \tnetwork interface\n"\
" " INPUT_VLAN_SERVER_VAR "=<hostname> \tvlan server\n" \
" " INPUT_VLAN_PORT_VAR "=<port> \tvlan server port\n"\
);
......
src/misc/decoder_fifo.c
View file @ 36ac163c
......@@ -10,7 +10,7 @@
#include "mtime.h"
#include "vlc_thread.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......
src/misc/netutils.c
View file @ 36ac163c
......@@ -2,7 +2,7 @@
* netutils.c: various network functions
* (c)1999 VideoLAN
*****************************************************************************
* ??
* XXX??
*****************************************************************************
* Required headers:
* <netinet/in.h>
......@@ -275,7 +275,7 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
p_net_descr->i_if_number++;
p_net_descr->a_if = realloc(p_net_descr->a_if,
p_net_descr->i_if_number*sizeof(if_descr_t));
/* Read the info ??? */
/* FIXME: Read the info ?? */
i_rc = ReadIfConf(i_sockfd, &p_net_descr->a_if[p_net_descr->i_if_number-1],
p_ifr_current_if->ifr_name);
}
......
src/spu_decoder/spu_decoder.c
View file @ 36ac163c
......@@ -4,7 +4,7 @@
*****************************************************************************/
/* repomp sur video_decoder.c
* ?? passer en terminate/destroy avec les signaux supplmentaires */
* FIXME: passer en terminate/destroy avec les signaux supplmentaires ?? */
/*****************************************************************************
* Preamble
......@@ -24,7 +24,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......
src/video_decoder/vdec_idct.c
View file @ 36ac163c
......@@ -20,7 +20,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......
src/video_decoder/vdec_motion.c
View file @ 36ac163c
......@@ -19,7 +19,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......@@ -503,7 +503,7 @@ void vdec_MotionFieldField444( macroblock_t * p_mb )
}
/*****************************************************************************
* vdec_MotionField16x8XXX : motion compensation for 16x8 motion type (field)
* vdec_MotionField16x8XXX?? : motion compensation for 16x8 motion type (field)
*****************************************************************************/
#define FIELD16X8( MOTION ) \
{ \
......@@ -585,7 +585,7 @@ void vdec_MotionField16x8444( macroblock_t * p_mb )
}
/*****************************************************************************
* vdec_MotionFieldDMVXXX : motion compensation for dmv motion type (field)
* vdec_MotionFieldDMVXXX?? : motion compensation for dmv motion type (field)
*****************************************************************************/
#define FIELDDMV( MOTION ) \
{ \
......@@ -627,7 +627,7 @@ void vdec_MotionFieldDMV444( macroblock_t * p_mb )
}
/*****************************************************************************
* vdec_MotionFrameFrameXXX : motion compensation for frame motion type (frame)
* vdec_MotionFrameFrameXXX?? : motion compensation for frame motion type (frame)
*****************************************************************************/
#define FRAMEFRAME( MOTION ) \
{ \
......@@ -672,7 +672,7 @@ void vdec_MotionFrameFrame444( macroblock_t * p_mb )
}
/*****************************************************************************
* vdec_MotionFrameFieldXXX : motion compensation for field motion type (frame)
* vdec_MotionFrameFieldXXX?? : motion compensation for field motion type (frame)
*****************************************************************************/
#define FRAMEFIELD( MOTION ) \
{ \
......@@ -737,7 +737,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb )
}
/*****************************************************************************
* vdec_MotionFrameDMVXXX : motion compensation for dmv motion type (frame)
* vdec_MotionFrameDMVXXX?? : motion compensation for dmv motion type (frame)
*****************************************************************************/
#define FRAMEDMV( MOTION ) \
{ \
......@@ -748,7 +748,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb )
MOTION( p_mb, p_mb->p_forward, 0, 0, \
p_mb->pppi_motion_vectors[0][0][0], \
p_mb->pppi_motion_vectors[0][0][1], \
/* ????? >> 1 ? */ \
/* XXX?? XXX?? >> 1 ? */ \
p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 ); \
\
/* predict and add to top field from bottom field */ \
......@@ -760,7 +760,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb )
MOTION( p_mb, p_mb->p_forward, 1, 1, \
p_mb->pppi_motion_vectors[0][0][0], \
p_mb->pppi_motion_vectors[0][0][1], \
/* ????? >> 1 ? */ \
/* XXX?? XXX?? >> 1 ? */ \
p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 ); \
\
/* predict and add to bottom field from top field */ \
......
src/video_decoder/video_decoder.c
View file @ 36ac163c
......@@ -3,7 +3,7 @@
* (c)1999 VideoLAN
*****************************************************************************/
/* ?? passer en terminate/destroy avec les signaux supplmentaires */
/* FIXME: passer en terminate/destroy avec les signaux supplmentaires ?? */
/*****************************************************************************
* Preamble
......@@ -23,7 +23,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......@@ -59,7 +59,7 @@ static void EndThread ( vdec_thread_t *p_vdec );
* This function creates a new video decoder thread, and returns a pointer
* to its description. On error, it returns NULL.
* Following configuration properties are used:
* ??
* XXX??
*****************************************************************************/
vdec_thread_t * vdec_CreateThread( vpar_thread_t *p_vpar /*, int *pi_status */ )
{
......
src/video_output/video_output.c
View file @ 36ac163c
......@@ -91,11 +91,11 @@ vout_thread_t * vout_CreateThread ( char *psz_display, int i_root_window,
psz_plugin = malloc( sizeof("./video_output/vout_.so") + strlen(psz_method) );
sprintf( psz_plugin, "./video_output/vout_%s.so", psz_method );
p_vout->p_vout_plugin = dlopen( psz_plugin, RTLD_LAZY );
p_vout->p_vout_plugin = dlopen( psz_plugin, RTLD_NOW | RTLD_GLOBAL );
if( p_vout->p_vout_plugin == NULL )
{
intf_ErrMsg( "error: could not open video plugin %s\n", psz_method );
intf_ErrMsg( "error: could not open video plugin %s\n", psz_plugin );
free( psz_plugin );
free( p_vout );
return( NULL );
......@@ -895,7 +895,7 @@ static int InitThread( vout_thread_t *p_vout )
*****************************************************************************/
static void RunThread( vout_thread_t *p_vout)
{
//?? welcome to gore land
/* XXX?? welcome to gore land */
static int i_trash_count = 0;
static mtime_t last_display_date = 0;
......@@ -950,7 +950,7 @@ static void RunThread( vout_thread_t *p_vout)
/* Computes FPS rate */
p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date;
#endif
// ???
/* XXX?? */
i_trash_count++;
//fprintf( stderr, "gap : %Ld\n", display_date-last_display_date );
last_display_date = display_date;
......@@ -1003,7 +1003,7 @@ last_display_date = display_date;
* only READY_SUBPICTURES are handled. If no picture has been selected,
* display_date will depend on the subpicture
*/
//??
/* XXX?? */
/*
* Perform rendering, sleep and display rendered picture
......@@ -1088,7 +1088,7 @@ last_display_date = display_date;
}
else if( p_vout->b_active ) /* idle or interface screen alone */
{
if( p_vout->b_interface && 0 /* && ?? intf_change */ )
if( p_vout->b_interface && 0 /* && XXX?? intf_change */ )
{
/* Interface has changed, so a new rendering is required - force
* it by setting last idle date to 0 */
......@@ -1848,7 +1848,7 @@ static void RenderInterface( vout_thread_t *p_vout )
i_byte < p_vout->i_height * p_vout->i_bytes_per_line;
i_byte++ )
{
//?? noooo !
/* XXX?? noooo ! */
p_vout->p_buffer[ p_vout->i_buffer_index ].p_data[ i_byte ] = p_vout->i_blue_pixel;
}
......@@ -1882,7 +1882,7 @@ static void RenderInterface( vout_thread_t *p_vout )
static void Synchronize( vout_thread_t *p_vout, s64 i_delay )
{
int i_synchro_inc = 0;
//???? gore following
/* XXX?? gore following */
static int i_panic_count = 0;
static int i_last_synchro_inc = 0;
static float r_synchro_level = VOUT_SYNCHRO_LEVEL_START;
......
src/video_output/video_text.c
View file @ 36ac163c
......@@ -350,7 +350,7 @@ void vout_Print( vout_font_t *p_font, byte_t *p_pic, int i_bytes_per_pixel, int
int i_font_bytes_per_line, i_font_height; /* font properties */
vout_put_byte_t *p_PutByte; /* PutByte function */
//?? background: can be something else that whole byte
/* FIXME: background: can be something else that whole byte ?? */
/* Select output function */
switch( i_bytes_per_pixel )
......@@ -479,7 +479,7 @@ static void PutByte16( u16 *p_pic, int i_byte, int i_char, int i_border,
static void PutByte24( void *p_pic, int i_byte, byte_t i_char, byte_t i_border, byte_t i_bg,
u32 i_char_color, u32 i_border_color, u32 i_bg_color )
{
//??
/* XXX?? */
}
/*****************************************************************************
......
src/video_output/video_x11.h deleted 100644 → 0
View file @ 3f8bf7fb
/*****************************************************************************
* video_x11.h: X11 video output display method
* (c)1999 VideoLAN
*****************************************************************************
* The X11 method for video output thread. The functions declared here should
* not be needed by any other module than video_output.c.
*****************************************************************************
* Required headers:
* <X11/Xlib.h>
* <X11/Xutil.h>
* <X11/extensions/XShm.h>
* "config.h"
* "common.h"
* "mtime.h"
* "video.h"
* "video_output.h"
*****************************************************************************/
/*****************************************************************************
* vout_x11_t: video output X11 method descriptor
*****************************************************************************
* This structure is part of the video output thread descriptor.
* It describes the X11 specific properties of an output thread. X11 video
* output is performed through regular resizable windows. Windows can be
* dynamically resized to adapt to the size of the streams.
*****************************************************************************/
typedef struct vout_x11_s
{
/* User settings */
boolean_t b_shm_ext; /* shared memory extension flag */
/* Thread configuration - these properties are copied from a video_cfg_t
* structure to be used in second step of initialization */
char * psz_display; /* display name */
char * psz_title; /* window title */
/* Internal settings and properties */
Display * p_display; /* display pointer */
int i_screen; /* screen number */
Window window; /* window instance handler */
GC gc; /* graphic context instance handler */
/* Window manager hints and atoms */
Atom wm_protocols; /* WM_PROTOCOLS atom */
Atom wm_delete_window; /* WM_DELETE_WINDOW atom */
/* Color maps and translation tables - some of those tables are shifted,
* see x11.c for more informations. */
u8 * trans_16bpp_red; /* red (16 bpp) (SHIFTED !) */
u8 * trans_16bpp_green; /* green (16 bpp) (SHIFTED !) */
u8 * trans_16bpp_blue; /* blue (16 bpp) (SHIFTED !) */
/* ?? colormaps ? */
boolean_t b_private_colormap; /* private color map flag */
Colormap private_colormap; /* private color map */
/* Display buffers and shared memory information */
int i_buffer_index; /* buffer index */
XImage * p_ximage[2]; /* XImage pointer */
XShmSegmentInfo shm_info[2]; /* shared memory zone information */
int i_completion_type; /* ?? */
} vout_x11_t;
/*****************************************************************************
* Prototypes
*****************************************************************************/
int vout_X11AllocOutputMethod ( vout_thread_t *p_vout, video_cfg_t *p_cfg );
void vout_X11FreeOutputMethod ( vout_thread_t *p_vout );
int vout_X11CreateOutputMethod ( vout_thread_t *p_vout );
void vout_X11DestroyOutputMethod ( vout_thread_t *p_vout );
int vout_X11ManageOutputMethod ( vout_thread_t *p_vout );
void vout_X11DisplayOutput ( vout_thread_t *p_vout );
src/video_output/video_yuv.c
View file @ 36ac163c
......@@ -991,7 +991,7 @@ static void ConvertY4Gray24( p_vout_thread_t p_vout, void *p_pic, yuv_data_t *p_
int i_width, int i_height, int i_pic_width, int i_pic_height, int i_pic_line_width,
int i_matrix_coefficients )
{
//??
/* XXX?? */
}
/*****************************************************************************
......@@ -1083,12 +1083,14 @@ static void ConvertYUV420RGB8( p_vout_thread_t p_vout, u8 *p_pic, yuv_data_t *p_
int dither23[4] = { 0x1e, 0xe, 0x1a, 0xa };
/* other matrices that can be interesting, either for debugging or for effects */
//int dither[4][4] = { { 0, 8, 2, 10 }, { 12, 4, 14, 16 }, { 3, 11, 1, 9}, {15, 7, 13, 5} };
//int dither[4][4] = { { 7, 8, 0, 15 }, { 0, 15, 8, 7 }, { 7, 0, 15, 8 }, { 15, 7, 8, 0 } };
//int dither[4][4] = { { 0, 15, 0, 15 }, { 15, 0, 15, 0 }, { 0, 15, 0, 15 }, { 15, 0, 15, 0 } };
//int dither[4][4] = { { 15, 15, 0, 0 }, { 15, 15, 0, 0 }, { 0, 0, 15, 15 }, { 0, 0, 15, 15 } };
//int dither[4][4] = { { 8, 8, 8, 8 }, { 8, 8, 8, 8 }, { 8, 8, 8, 8 }, { 8, 8, 8, 8 } };
//int dither[4][4] = { { 0, 1, 2, 3 }, { 4, 5, 6, 7 }, { 8, 9, 10, 11 }, { 12, 13, 14, 15 } };
#if 0
int dither[4][4] = { { 0, 8, 2, 10 }, { 12, 4, 14, 16 }, { 3, 11, 1, 9}, {15, 7, 13, 5} };
int dither[4][4] = { { 7, 8, 0, 15 }, { 0, 15, 8, 7 }, { 7, 0, 15, 8 }, { 15, 7, 8, 0 } };
int dither[4][4] = { { 0, 15, 0, 15 }, { 15, 0, 15, 0 }, { 0, 15, 0, 15 }, { 15, 0, 15, 0 } };
int dither[4][4] = { { 15, 15, 0, 0 }, { 15, 15, 0, 0 }, { 0, 0, 15, 15 }, { 0, 0, 15, 15 } };
int dither[4][4] = { { 8, 8, 8, 8 }, { 8, 8, 8, 8 }, { 8, 8, 8, 8 }, { 8, 8, 8, 8 } };
int dither[4][4] = { { 0, 1, 2, 3 }, { 4, 5, 6, 7 }, { 8, 9, 10, 11 }, { 12, 13, 14, 15 } };
#endif
/*
* Initialize some values - i_pic_line_width will store the line skip
......@@ -1247,9 +1249,10 @@ static void ConvertYUV420RGB16( p_vout_thread_t p_vout, u16 *p_pic, yuv_data_t *
int i_width, int i_height, int i_pic_width, int i_pic_height, int i_pic_line_width,
int i_matrix_coefficients )
{
/* MMX version */
// int i_chroma_width, i_chroma_skip; /* width and eol for chroma */
/*
#if 0
/* MMX version */
int i_chroma_width, i_chroma_skip; /* width and eol for chroma */
i_chroma_width = i_width / 2;
i_chroma_skip = i_skip / 2;
ConvertYUV420RGB16MMX( p_y, p_u, p_v, i_width, i_height,
......@@ -1257,7 +1260,7 @@ static void ConvertYUV420RGB16( p_vout_thread_t p_vout, u16 *p_pic, yuv_data_t *
(i_chroma_width + i_chroma_skip) * sizeof( yuv_data_t),
i_scale, (u8 *)p_pic, 0, 0, (i_width + i_pic_eol) * sizeof( u16 ),
p_vout->i_screen_depth == 15 );
*/
#endif
boolean_t b_horizontal_scaling; /* horizontal scaling type */
int i_vertical_scaling; /* vertical scaling type */
int i_x, i_y; /* horizontal and vertical indexes */
......@@ -1449,7 +1452,7 @@ static void ConvertYUV420RGB24( p_vout_thread_t p_vout, void *p_pic, yuv_data_t
int i_width, int i_height, int i_pic_width, int i_pic_height, int i_pic_line_width,
int i_matrix_coefficients )
{
//???
/* XXX?? */
}
/*****************************************************************************
......@@ -1459,7 +1462,7 @@ static void ConvertYUV422RGB24( p_vout_thread_t p_vout, void *p_pic, yuv_data_t
int i_width, int i_height, int i_pic_width, int i_pic_height, int i_pic_line_width,
int i_matrix_coefficients )
{
//???
/* XXX?? */
}
/*****************************************************************************
......@@ -1469,7 +1472,7 @@ static void ConvertYUV444RGB24( p_vout_thread_t p_vout, void *p_pic, yuv_data_t
int i_width, int i_height, int i_pic_width, int i_pic_height, int i_pic_line_width,
int i_matrix_coefficients )
{
//???
/* XXX?? */
}
/*****************************************************************************
......@@ -1663,7 +1666,7 @@ static void ConvertYUV444RGB32( p_vout_thread_t p_vout, u32 *p_pic, yuv_data_t *
}
}
//-------------------- walken code follows ------------------------------------
/*-------------------- walken code follows ----------------------------------*/
/*
* YUV to RGB routines.
......@@ -1689,7 +1692,7 @@ static void ConvertYUV444RGB32( p_vout_thread_t p_vout, u32 *p_pic, yuv_data_t *
*/
#if 0
//??
/* XXX?? */
static void yuvToRgb24 (unsigned char * Y,
unsigned char * U, unsigned char * V,
char * dest, int table[1935], int width)
......
src/video_output/video_yuv.h
View file @ 36ac163c
......@@ -24,8 +24,8 @@ void vout_EndYUV ( vout_thread_t *p_vout );
* i_ypitch, i_vpitch: Y and V lines sizes (bytes)
* i_aspect: vertical aspect factor
* p_pic: RGB frame
* i_dci_offset: ?? x offset for left image border
* i_offset_to_line_0: ?? x offset for left image border
* i_dci_offset: XXX?? x offset for left image border
* i_offset_to_line_0: XXX?? x offset for left image border
* i_pitch: RGB line size (bytes)
* i_colortype: 0 for 565, 1 for 555 */
void ConvertYUV420RGB16MMX( u8* p_y, u8* p_u, u8 *p_v,
......
src/video_parser/video_fifo.c
View file @ 36ac163c
......@@ -19,7 +19,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......
src/video_parser/video_parser.c
View file @ 36ac163c
......@@ -3,7 +3,7 @@
* (c)1999 VideoLAN
*****************************************************************************/
/* ?? passer en terminate/destroy avec les signaux supplmentaires */
/* FIXME: passer en terminate/destroy avec les signaux supplmentaires ?? */
/*****************************************************************************
* Preamble
......@@ -21,7 +21,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......@@ -54,7 +54,7 @@ static void EndThread ( vpar_thread_t *p_vpar );
* This function creates a new video parser thread, and returns a pointer
* to its description. On error, it returns NULL.
* Following configuration properties are used:
* ??
* XXX??
*****************************************************************************/
#include "main.h"
#include "interface.h"
......@@ -94,7 +94,7 @@ vpar_thread_t * vpar_CreateThread( /* video_cfg_t *p_cfg, */ input_thread_t *p_i
p_vpar->bit_stream.fifo.buffer = 0;
p_vpar->bit_stream.fifo.i_available = 0;
/* FIXME !!!! */
/* FIXME !!!!?? */
p_vpar->p_vout = p_main->p_intf->p_vout;
/* Spawn the video parser thread */
......@@ -143,7 +143,7 @@ void vpar_DestroyThread( vpar_thread_t *p_vpar /*, int *pi_status */ )
#if 0
static int CheckConfiguration( video_cfg_t *p_cfg )
{
/* ?? */
/* XXX?? */
return( 0 );
}
......@@ -223,7 +223,7 @@ static int InitThread( vpar_thread_t *p_vpar )
#ifdef VDEC_SMP
/* Spawn video_decoder threads */
/* ??? modify the number of vdecs at runtime ? */
/* FIXME: modify the number of vdecs at runtime ?? */
for( i_dummy = 0; i_dummy < NB_VDEC; i_dummy++ )
{
if( (p_vpar->pp_vdec[i_dummy] = vdec_CreateThread( p_vpar )) == NULL )
......@@ -421,12 +421,12 @@ static void EndThread( vpar_thread_t *p_vpar )
#ifdef DEBUG
/* Check for remaining PES packets */
/* ?? */
/* XXX?? */
#endif
/* Destroy thread structures allocated by InitThread */
// vout_DestroyStream( p_vpar->p_vout, p_vpar->i_stream );
/* ?? */
/* XXX?? */
/* Dispose of matrices if they have been allocated. */
if( p_vpar->sequence.intra_quant.b_allocated )
......
src/video_parser/vpar_blocks.c
View file @ 36ac163c
......@@ -19,7 +19,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......@@ -137,7 +137,7 @@ static lookup_t pl_coded_pattern[512] =
* Tables are cut in two parts to reduce memory occupation
*/
/* Table B-12, dct_dc_size_luminance, codes 00xxx ... 11110 */
/* Table B-12, dct_dc_size_luminance, codes 00XXX ... 11110 */
static lookup_t pl_dct_dc_lum_init_table_1[32] =
{ {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2},
{2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2},
......@@ -543,7 +543,7 @@ void vpar_InitDCTTables( vpar_thread_t * p_vpar )
p_vpar->pppl_dct_dc_size[1][0] = pl_dct_dc_chrom_init_table_1;
p_vpar->pppl_dct_dc_size[1][1] = pl_dct_dc_chrom_init_table_2;
/* ??? MB_ERROR is replaced by 0 because if we use -1 we
/* XXX?? MB_ERROR is replaced by 0 because if we use -1 we
* can block in DecodeMPEG2Intra and others */
memset( p_vpar->ppl_dct_coef[0], 0, 16 );
memset( p_vpar->ppl_dct_coef[1], 0, 16 );
......@@ -1485,7 +1485,7 @@ static __inline__ void MacroblockModes( vpar_thread_t * p_vpar,
p_vpar->mb.i_motion_type = MOTION_FRAME;
}
/* ???? */
/* XXX?? */
p_vpar->mb.i_mv_count = ppi_mv_count[i_structure == FRAME_STRUCTURE]
[p_vpar->mb.i_motion_type];
p_vpar->mb.i_mv_format = ppi_mv_format[i_structure == FRAME_STRUCTURE]
......
src/video_parser/vpar_headers.c
View file @ 36ac163c
......@@ -19,7 +19,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......@@ -458,7 +458,7 @@ static void SequenceHeader( vpar_thread_t * p_vpar )
if( p_vpar->sequence.i_width != i_width_save
|| p_vpar->sequence.i_height != i_height_save )
{
/* What do we do in case of a size change ??? */
/* FIXME: What do we do in case of a size change ?? */
}
#endif
......@@ -682,7 +682,7 @@ static void PictureHeader( vpar_thread_t * p_vpar )
{
/* This is a new frame. Get a structure from the video_output. */
while( ( P_picture = vout_CreatePicture( p_vpar->p_vout,
99+p_vpar->sequence.i_chroma_format, /*???*/
99+p_vpar->sequence.i_chroma_format, /*XXX??*/
p_vpar->sequence.i_width,
p_vpar->sequence.i_height ) )
== NULL )
......@@ -709,7 +709,7 @@ static void PictureHeader( vpar_thread_t * p_vpar )
#ifdef VDEC_SMP
memset( p_vpar->picture.pp_mb, 0, MAX_MB*sizeof(macroblock_t *) );
#endif
/* FIXME ! remove asap */
/* FIXME ! remove asap ?? */
//memset( P_picture->p_data, 0, (p_vpar->sequence.i_mb_size*384));
/* Update the reference pointers. */
......
src/video_parser/vpar_synchro.c
View file @ 36ac163c
......@@ -19,7 +19,7 @@
#include "vlc_thread.h"
#include "intf_msg.h"
#include "debug.h" /* ?? temporaire, requis par netlist.h */
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
......
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