Commit 2a8ef11d authored by Sam Hocevar's avatar Sam Hocevar

(previous commit foired)

 . this is a coding style patch which removes all "foo(bar){" constructions
   and most of the tabulations.
 . also, fixed a bug in the default subtitle track.
 . and made a few error messages more explicit, ie. changed "error: %s" to
   "foo error: couldn't initialize bar (%s)"
 . and removed a warning in intf_ctrl.c which isn't used anyway.
parent a132d75c
...@@ -331,7 +331,7 @@ static int SDLOpenDisplay( vout_thread_t *p_vout ) ...@@ -331,7 +331,7 @@ static int SDLOpenDisplay( vout_thread_t *p_vout )
SDL_ShowCursor( 1 ); SDL_ShowCursor( 1 );
SDL_WM_SetCaption( VOUT_TITLE , VOUT_TITLE ); SDL_WM_SetCaption( VOUT_TITLE , VOUT_TITLE );
SDL_EventState(SDL_KEYUP , SDL_IGNORE); /* ignore keys up */ SDL_EventState(SDL_KEYUP , SDL_IGNORE); /* ignore keys up */
if( p_vout->b_need_render ) if( p_vout->b_need_render )
{ {
...@@ -382,8 +382,8 @@ static int SDLOpenDisplay( vout_thread_t *p_vout ) ...@@ -382,8 +382,8 @@ static int SDLOpenDisplay( vout_thread_t *p_vout )
p_vout->i_changes |= VOUT_YUV_CHANGE; p_vout->i_changes |= VOUT_YUV_CHANGE;
/* Check buffers properties */ /* Check buffers properties */
p_vout->p_sys->b_must_acquire = 1; /* always acquire */ p_vout->p_sys->b_must_acquire = 1; /* always acquire */
return( 0 ); return( 0 );
} }
......
...@@ -498,8 +498,8 @@ static int SpawnInput( int i_argc, intf_arg_t *p_argv ) ...@@ -498,8 +498,8 @@ static int SpawnInput( int i_argc, intf_arg_t *p_argv )
p_main->p_intf->p_input = input_CreateThread( i_method, p_source, i_port, i_vlan_id, p_main->p_intf->p_input = input_CreateThread( i_method, p_source, i_port, i_vlan_id,
p_main->p_intf->p_vout, p_main->p_aout, p_main->p_intf->p_vout, p_main->p_aout,
NULL ); NULL );
return( INTF_NO_ERROR );
#endif #endif
return( INTF_NO_ERROR );
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
typedef struct lpcmdec_s lpcmdec_t; typedef struct lpcmdec_s lpcmdec_t;
typedef struct lpcm_sync_info_s { typedef struct lpcm_sync_info_s {
int sample_rate; /* sample rate in Hz */ int sample_rate; /* sample rate in Hz */
int frame_size; /* frame size in bytes */ int frame_size; /* frame size in bytes */
int bit_rate; /* nominal bit rate in kbps */ int bit_rate; /* nominal bit rate in kbps */
} lpcm_sync_info_t; } lpcm_sync_info_t;
typedef struct lpcm_byte_stream_s { typedef struct lpcm_byte_stream_s {
...@@ -57,7 +57,7 @@ struct lpcmdec_s { ...@@ -57,7 +57,7 @@ struct lpcmdec_s {
*/ */
/* The bit stream structure handles the PES stream at the bit level */ /* The bit stream structure handles the PES stream at the bit level */
lpcm_bit_stream_t bit_stream; lpcm_bit_stream_t bit_stream;
}; };
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* lpcm_decoder_thread.c: lpcm decoder thread * lpcm_decoder_thread.c: lpcm decoder thread
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: lpcm_decoder_thread.c,v 1.7 2000/12/27 18:35:45 massiot Exp $ * $Id: lpcm_decoder_thread.c,v 1.8 2001/01/05 14:46:37 sam Exp $
* *
* Authors: * Authors:
* *
...@@ -66,11 +66,11 @@ static void EndThread (lpcmdec_thread_t * p_adec); ...@@ -66,11 +66,11 @@ static void EndThread (lpcmdec_thread_t * p_adec);
vlc_thread_t lpcmdec_CreateThread (adec_config_t * p_config) vlc_thread_t lpcmdec_CreateThread (adec_config_t * p_config)
{ {
lpcmdec_thread_t * p_lpcmdec; lpcmdec_thread_t * p_lpcmdec;
intf_DbgMsg ( "LPCM Debug: creating lpcm decoder thread" ); intf_DbgMsg ( "lpcm: creating lpcm decoder thread" );
/* Allocate the memory needed to store the thread's structure */ /* Allocate the memory needed to store the thread's structure */
if ((p_lpcmdec = (lpcmdec_thread_t *)malloc (sizeof(lpcmdec_thread_t))) == NULL) { if ((p_lpcmdec = (lpcmdec_thread_t *)malloc (sizeof(lpcmdec_thread_t))) == NULL) {
intf_ErrMsg ( "LPCM Error: not enough memory for lpcmdec_CreateThread() to create the new thread" ); intf_ErrMsg ( "lpcm error: cannot create lpcmdec_thread_t" );
return 0; return 0;
} }
...@@ -92,7 +92,7 @@ vlc_thread_t lpcmdec_CreateThread (adec_config_t * p_config) ...@@ -92,7 +92,7 @@ vlc_thread_t lpcmdec_CreateThread (adec_config_t * p_config)
/* Spawn the lpcm decoder thread */ /* Spawn the lpcm decoder thread */
if (vlc_thread_create(&p_lpcmdec->thread_id, "lpcm decoder", (vlc_thread_func_t)RunThread, (void *)p_lpcmdec)) { if (vlc_thread_create(&p_lpcmdec->thread_id, "lpcm decoder", (vlc_thread_func_t)RunThread, (void *)p_lpcmdec)) {
intf_ErrMsg ( "LPCM Error: can't spawn lpcm decoder thread" ); intf_ErrMsg ( "lpcm error: cannot spawn thread" );
free (p_lpcmdec); free (p_lpcmdec);
return 0; return 0;
} }
...@@ -171,38 +171,38 @@ static void RunThread (lpcmdec_thread_t * p_lpcmdec) ...@@ -171,38 +171,38 @@ static void RunThread (lpcmdec_thread_t * p_lpcmdec)
while ((!p_lpcmdec->p_fifo->b_die) && (!p_lpcmdec->p_fifo->b_error)) while ((!p_lpcmdec->p_fifo->b_die) && (!p_lpcmdec->p_fifo->b_error))
{ {
s16 * buffer; s16 * buffer;
lpcm_sync_info_t sync_info; lpcm_sync_info_t sync_info;
if (!sync) if (!sync)
{ {
/* have to find a synchro point */ /* have to find a synchro point */
} }
if (DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts) if (DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts)
{ {
p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts; p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts;
DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts = 0; DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts = 0;
} }
else else
{ {
p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = LAST_MDATE; p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = LAST_MDATE;
} }
p_lpcmdec->p_aout_fifo->l_rate = sync_info.sample_rate; p_lpcmdec->p_aout_fifo->l_rate = sync_info.sample_rate;
buffer = ((s16 *)p_lpcmdec->p_aout_fifo->buffer) + (p_lpcmdec->p_aout_fifo->l_end_frame * LPCMDEC_FRAME_SIZE); buffer = ((s16 *)p_lpcmdec->p_aout_fifo->buffer) + (p_lpcmdec->p_aout_fifo->l_end_frame * LPCMDEC_FRAME_SIZE);
if (lpcm_decode_frame (&p_lpcmdec->lpcm_decoder, buffer)) if (lpcm_decode_frame (&p_lpcmdec->lpcm_decoder, buffer))
{ {
sync = 0; sync = 0;
goto bad_frame; goto bad_frame;
} }
vlc_mutex_lock (&p_lpcmdec->p_aout_fifo->data_lock); vlc_mutex_lock (&p_lpcmdec->p_aout_fifo->data_lock);
p_lpcmdec->p_aout_fifo->l_end_frame = (p_lpcmdec->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE; p_lpcmdec->p_aout_fifo->l_end_frame = (p_lpcmdec->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE;
vlc_cond_signal (&p_lpcmdec->p_aout_fifo->data_wait); vlc_cond_signal (&p_lpcmdec->p_aout_fifo->data_wait);
vlc_mutex_unlock (&p_lpcmdec->p_aout_fifo->data_lock); vlc_mutex_unlock (&p_lpcmdec->p_aout_fifo->data_lock);
intf_DbgMsg( "LPCM Debug: %x", *buffer ); intf_DbgMsg( "LPCM Debug: %x", *buffer );
bad_frame: bad_frame:
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* lpcm_decoder_thread.h : lpcm decoder thread interface * lpcm_decoder_thread.h : lpcm decoder thread interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: lpcm_decoder_thread.h,v 1.2 2000/12/21 13:25:51 massiot Exp $ * $Id: lpcm_decoder_thread.h,v 1.3 2001/01/05 14:46:37 sam Exp $
* *
* Authors: * Authors:
* *
...@@ -37,7 +37,7 @@ typedef struct lpcmdec_thread_s ...@@ -37,7 +37,7 @@ typedef struct lpcmdec_thread_s
*/ */
decoder_fifo_t * p_fifo; /* stores the PES stream data */ decoder_fifo_t * p_fifo; /* stores the PES stream data */
data_packet_t * p_data; data_packet_t * p_data;
int sync_ptr; /* sync ptr from lpcm magic header */ int sync_ptr; /* sync ptr from lpcm magic header */
adec_config_t * p_config; adec_config_t * p_config;
/* /*
......
...@@ -94,7 +94,7 @@ mtime_t mdate( void ) ...@@ -94,7 +94,7 @@ mtime_t mdate( void )
void mwait( mtime_t date ) void mwait( mtime_t date )
{ {
#ifdef HAVE_KERNEL_OS_H #ifdef HAVE_KERNEL_OS_H
mtime_t delay; mtime_t delay;
delay = date - real_time_clock_usecs(); delay = date - real_time_clock_usecs();
......
...@@ -94,7 +94,7 @@ int BuildInetAddr( struct sockaddr_in *p_sa_in, char *psz_in_addr, int i_port ) ...@@ -94,7 +94,7 @@ int BuildInetAddr( struct sockaddr_in *p_sa_in, char *psz_in_addr, int i_port )
intf_DbgMsg("debug: resolving internet address %s...", psz_in_addr); intf_DbgMsg("debug: resolving internet address %s...", psz_in_addr);
if ( (p_hostent = gethostbyname(psz_in_addr)) == NULL) if ( (p_hostent = gethostbyname(psz_in_addr)) == NULL)
{ {
intf_ErrMsg("error: unknown host %s", psz_in_addr); intf_ErrMsg( "net error: unknown host %s", psz_in_addr );
return( -1 ); return( -1 );
} }
...@@ -158,8 +158,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name) ...@@ -158,8 +158,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
} }
else else
{ {
intf_ErrMsg("Cannot read flags for interface %s: %s", psz_name, intf_ErrMsg( "net error: cannot read flags for interface %s (%s)",
strerror(errno)); psz_name, strerror(errno) );
return -1; return -1;
} }
...@@ -182,8 +182,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name) ...@@ -182,8 +182,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
} }
else else
{ {
intf_ErrMsg("Cannot read hardware address for interface %s: %s", intf_ErrMsg( "net error: cannot read hardware address for %s (%s)",
psz_name, strerror(errno)); psz_name, strerror(errno) );
return -1; return -1;
} }
...@@ -197,8 +197,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name) ...@@ -197,8 +197,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
} }
else else
{ {
intf_ErrMsg("Cannot read network address for interface %s: %s", intf_ErrMsg( "net error: cannot read network address for %s (%s)",
psz_name, strerror(errno)); psz_name, strerror(errno) );
return -1; return -1;
} }
...@@ -221,8 +221,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name) ...@@ -221,8 +221,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
} }
else else
{ {
intf_ErrMsg("Cannot read broadcast address for interface %s: %s", intf_ErrMsg( "net error: cannot read broadcast address for %s (%s)",
psz_name, strerror(errno)); psz_name, strerror(errno));
return -1; return -1;
} }
#endif #endif
...@@ -267,8 +267,8 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr) ...@@ -267,8 +267,8 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
i_rc = ioctl(i_sockfd, SIOCGIFCONF, (byte_t*)&ifc_netconf); i_rc = ioctl(i_sockfd, SIOCGIFCONF, (byte_t*)&ifc_netconf);
if( i_rc ) if( i_rc )
{ {
intf_ErrMsg("Cannot read network configuration: %s", intf_ErrMsg( "net error: cannot read network configuration (%s)",
strerror(errno)); strerror(errno));
break; break;
} }
} }
...@@ -298,8 +298,8 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr) ...@@ -298,8 +298,8 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
/* Read the status of this interface */ /* Read the status of this interface */
if( ioctl(i_sockfd, SIOCGIFFLAGS, (byte_t *)p_ifr_current_if) < 0 ) if( ioctl(i_sockfd, SIOCGIFFLAGS, (byte_t *)p_ifr_current_if) < 0 )
{ {
intf_ErrMsg("Cannot access interface %s: %s", intf_ErrMsg( "net error: cannot access interface %s (%s)",
p_ifr_current_if->ifr_name, strerror(errno)); p_ifr_current_if->ifr_name, strerror(errno) );
i_rc = -1; i_rc = -1;
break; break;
} }
......
...@@ -54,14 +54,14 @@ playlist_t * playlist_Create ( void ) ...@@ -54,14 +54,14 @@ playlist_t * playlist_Create ( void )
p_playlist->i_index = 0; p_playlist->i_index = 0;
p_playlist->p_list = NULL; p_playlist->p_list = NULL;
intf_Msg("Playlist initialized"); intf_Msg("Playlist created");
return( p_playlist ); return( p_playlist );
} }
void playlist_Init( playlist_t * p_playlist, int i_optind ) void playlist_Init( playlist_t * p_playlist, int i_optind )
{ {
int i_list_index = 0; int i_list_index = 0;
int i_index = 0; int i_index;
int i_argc = p_main->i_argc; int i_argc = p_main->i_argc;
if( i_optind < i_argc ) if( i_optind < i_argc )
...@@ -70,11 +70,17 @@ void playlist_Init( playlist_t * p_playlist, int i_optind ) ...@@ -70,11 +70,17 @@ void playlist_Init( playlist_t * p_playlist, int i_optind )
p_playlist->p_list = malloc( i_list_index * sizeof( int ) ); p_playlist->p_list = malloc( i_list_index * sizeof( int ) );
while( i_argc - i_index > i_optind ) for( i_index = 0 ; i_argc - i_index > i_optind ; i_index++ )
{ {
p_playlist->p_list[ i_index ] = if( strncmp( p_main->ppsz_argv[ i_argc - i_index - 1], "-", 1 ) )
p_main->ppsz_argv[ i_argc - i_index - 1]; {
i_index++; p_playlist->p_list[ i_index ] =
p_main->ppsz_argv[ i_argc - i_index - 1];
}
else
{
p_playlist->p_list[ i_index ] = "/dev/stdin";
}
} }
} }
else else
......
...@@ -115,6 +115,7 @@ void bank_Init( plugin_bank_t * p_bank ) ...@@ -115,6 +115,7 @@ void bank_Init( plugin_bank_t * p_bank )
/* Dummy plugin */ /* Dummy plugin */
SEEK_PLUGIN( "dummy" ); SEEK_PLUGIN( "dummy" );
SEEK_PLUGIN( "null" );
#undef SEEK_PLUGIN #undef SEEK_PLUGIN
} }
...@@ -190,7 +191,7 @@ char * TestPlugin ( plugin_id_t *p_plugin_id, char * psz_name ) ...@@ -190,7 +191,7 @@ char * TestPlugin ( plugin_id_t *p_plugin_id, char * psz_name )
} }
#ifndef SYS_BEOS #ifndef SYS_BEOS
intf_WarnMsg( 1, "Plugin %s failed: %s", psz_plugin, dlerror() ); intf_ErrMsg( "plugin error: cannot open %s (%s)", psz_plugin, dlerror() );
#endif #endif
free( psz_plugin ); free( psz_plugin );
......
...@@ -263,7 +263,7 @@ static void RunThread( spudec_thread_t *p_spudec ) ...@@ -263,7 +263,7 @@ static void RunThread( spudec_thread_t *p_spudec )
p_spu->i_height = p_spu->i_y - ( (i_word << 8) p_spu->i_height = p_spu->i_y - ( (i_word << 8)
| GetByte( &p_spudec->bit_stream ) ) + 1; | GetByte( &p_spudec->bit_stream ) ) + 1;
i_index += 6; i_index += 6;
break; break;
case SPU_CMD_SET_OFFSETS: case SPU_CMD_SET_OFFSETS:
/* 06xxxxyyyy (byte offsets) */ /* 06xxxxyyyy (byte offsets) */
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vdec_motion.c : motion compensation routines * vdec_motion.c : motion compensation routines
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_motion.c,v 1.33 2000/12/22 13:04:45 sam Exp $ * $Id: vdec_motion.c,v 1.34 2001/01/05 14:46:37 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr> * Jean-Marc Dressler <polux@via.ecp.fr>
...@@ -55,71 +55,71 @@ ...@@ -55,71 +55,71 @@
#include "video_parser.h" #include "video_parser.h"
#include "video_fifo.h" #include "video_fifo.h"
#define __MotionComponents(width,height) \ #define __MotionComponents(width,height) \
void MotionComponent_x_y_copy_##width##_##height (); \ void MotionComponent_x_y_copy_##width##_##height (); \
void MotionComponent_X_y_copy_##width##_##height (); \ void MotionComponent_X_y_copy_##width##_##height (); \
void MotionComponent_x_Y_copy_##width##_##height (); \ void MotionComponent_x_Y_copy_##width##_##height (); \
void MotionComponent_X_Y_copy_##width##_##height (); \ void MotionComponent_X_Y_copy_##width##_##height (); \
void MotionComponent_x_y_avg_##width##_##height (); \ void MotionComponent_x_y_avg_##width##_##height (); \
void MotionComponent_X_y_avg_##width##_##height (); \ void MotionComponent_X_y_avg_##width##_##height (); \
void MotionComponent_x_Y_avg_##width##_##height (); \ void MotionComponent_x_Y_avg_##width##_##height (); \
void MotionComponent_X_Y_avg_##width##_##height (); void MotionComponent_X_Y_avg_##width##_##height ();
__MotionComponents (16,16) /* 444, 422, 420 */ __MotionComponents (16,16) /* 444, 422, 420 */
__MotionComponents (16,8) /* 444, 422, 420 */ __MotionComponents (16,8) /* 444, 422, 420 */
__MotionComponents (8,8) /* 422, 420 */ __MotionComponents (8,8) /* 422, 420 */
__MotionComponents (8,4) /* 420 */ __MotionComponents (8,4) /* 420 */
#if 0 #if 0
__MotionComponents (8,16) /* 422 */ __MotionComponents (8,16) /* 422 */
#endif #endif
#define ___callTheRightOne(width,height) \ #define ___callTheRightOne(width,height) \
if ((i_width == width) && (i_height == height)) \ if ((i_width == width) && (i_height == height)) \
{ \ { \
if (!b_average) \ if (!b_average) \
{ \ { \
switch (i_select) \ switch (i_select) \
{ \ { \
case 0: \ case 0: \
MotionComponent_x_y_copy_##width##_##height (p_src, p_dest, \ MotionComponent_x_y_copy_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
case 1: \ case 1: \
MotionComponent_X_y_copy_##width##_##height (p_src, p_dest, \ MotionComponent_X_y_copy_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
case 2: \ case 2: \
MotionComponent_x_Y_copy_##width##_##height (p_src, p_dest, \ MotionComponent_x_Y_copy_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
case 3: \ case 3: \
MotionComponent_X_Y_copy_##width##_##height (p_src, p_dest, \ MotionComponent_X_Y_copy_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
} \ } \
} \ } \
else \ else \
{ \ { \
switch (i_select) \ switch (i_select) \
{ \ { \
case 0: \ case 0: \
MotionComponent_x_y_avg_##width##_##height (p_src, p_dest, \ MotionComponent_x_y_avg_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
case 1: \ case 1: \
MotionComponent_X_y_avg_##width##_##height (p_src, p_dest, \ MotionComponent_X_y_avg_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
case 2: \ case 2: \
MotionComponent_x_Y_avg_##width##_##height (p_src, p_dest, \ MotionComponent_x_Y_avg_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
case 3: \ case 3: \
MotionComponent_X_Y_avg_##width##_##height (p_src, p_dest, \ MotionComponent_X_Y_avg_##width##_##height (p_src, p_dest, \
i_stride); \ i_stride); \
break; \ break; \
} \ } \
} \ } \
} }
/***************************************************************************** /*****************************************************************************
...@@ -136,12 +136,12 @@ static __inline__ void MotionComponent( ...@@ -136,12 +136,12 @@ static __inline__ void MotionComponent(
boolean_t b_average /* (explicit) averaging of several boolean_t b_average /* (explicit) averaging of several
* predictions */ ) * predictions */ )
{ {
___callTheRightOne (16,16) ___callTheRightOne (16,16)
___callTheRightOne (16,8) ___callTheRightOne (16,8)
___callTheRightOne (8,8) ___callTheRightOne (8,8)
___callTheRightOne (8,4) ___callTheRightOne (8,4)
#if 0 #if 0
___callTheRightOne (8,16) ___callTheRightOne (8,16)
#endif #endif
} }
...@@ -263,7 +263,7 @@ static __inline__ void Motion422( ...@@ -263,7 +263,7 @@ static __inline__ void Motion422(
+ (p_mb->i_l_x + (i_mv_x >> 1)) + (p_mb->i_l_x + (i_mv_x >> 1))
+ (p_mb->i_motion_l_y + i_offset + (p_mb->i_motion_l_y + i_offset
+ b_source_field) + b_source_field)
* p_mb->p_picture->i_width * p_mb->p_picture->i_width
+ (i_mv_y >> 1) * p_mb->i_l_stride, + (i_mv_y >> 1) * p_mb->i_l_stride,
/* destination */ /* destination */
p_mb->p_picture->p_y p_mb->p_picture->p_y
...@@ -671,7 +671,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb ) ...@@ -671,7 +671,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb )
MOTION( p_mb, p_mb->p_forward, 0, 0, \ MOTION( p_mb, p_mb->p_forward, 0, 0, \
p_mb->pppi_motion_vectors[0][0][0], \ p_mb->pppi_motion_vectors[0][0][0], \
p_mb->pppi_motion_vectors[0][0][1], \ p_mb->pppi_motion_vectors[0][0][1], \
/* XXX?? XXX?? >> 1 ? */ \ /* XXX?? XXX?? >> 1 ? */ \
p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 ); \ p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 ); \
\ \
/* predict and add to top field from bottom field */ \ /* predict and add to top field from bottom field */ \
...@@ -683,7 +683,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb ) ...@@ -683,7 +683,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb )
MOTION( p_mb, p_mb->p_forward, 1, 1, \ MOTION( p_mb, p_mb->p_forward, 1, 1, \
p_mb->pppi_motion_vectors[0][0][0], \ p_mb->pppi_motion_vectors[0][0][0], \
p_mb->pppi_motion_vectors[0][0][1], \ p_mb->pppi_motion_vectors[0][0][1], \
/* XXX?? XXX?? >> 1 ? */ \ /* XXX?? XXX?? >> 1 ? */ \
p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 ); \ p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 ); \
\ \
/* predict and add to bottom field from top field */ \ /* predict and add to bottom field from top field */ \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vdec_motion_inner.c : motion compensation inner routines * vdec_motion_inner.c : motion compensation inner routines