* libmpeg2.c: mpeg2 video decoder module making use of libmpeg2.
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: libmpeg2.c,v 1.38 2003/12/10 23:27:34 gbazin Exp $
+ * $Id: libmpeg2.c,v 1.39 2003/12/22 14:32:55 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Christophe Massiot <massiot@via.ecp.fr>
mpeg2_buffer( p_sys->p_mpeg2dec, p_block->p_buffer,
p_block->p_buffer + p_block->i_buffer );
- p_block->i_buffer = 0;
+ p_block->i_buffer = 0;
break;
case STATE_SEQUENCE:
{
/* Use the value provided in the MPEG sequence header */
p_sys->i_aspect =
- ((uint64_t)p_sys->p_info->sequence->display_width) *
+ ((uint64_t)p_sys->p_info->sequence->display_width) *
p_sys->p_info->sequence->pixel_width * VOUT_ASPECT_FACTOR /
p_sys->p_info->sequence->display_height /
p_sys->p_info->sequence->pixel_height;
mpeg2_set_buf( p_sys->p_mpeg2dec, buf, NULL );
if( (p_pic = GetNewPicture( p_dec, buf )) == NULL )
- {
- block_Release( p_block );
- return NULL;
- }
+ {
+ block_Release( p_block );
+ return NULL;
+ }
mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic );
vout_SynchroNewPicture( p_sys->p_synchro,
p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
- p_sys->p_info->current_picture->nb_fields, i_pts,
+ p_sys->p_info->current_picture->nb_fields, i_pts,
0, p_sys->i_current_rate );
if ( !(p_sys->b_slice_i
&& !vout_SynchroChoose( p_sys->p_synchro,
p_sys->p_info->current_picture->flags
& PIC_MASK_CODING_TYPE,
- /*p_sys->p_vout->render_time*/ 0 /*FIXME*/ ) )
+ /*p_sys->p_vout->render_time*/ 0 /*FIXME*/ ) )
{
mpeg2_skip( p_sys->p_mpeg2dec, 1 );
p_sys->b_skip = 1;
vout_SynchroDecode( p_sys->p_synchro );
if( (p_pic = GetNewPicture( p_dec, buf )) == NULL )
- {
- block_Release( p_block );
- return NULL;
- }
+ {
+ block_Release( p_block );
+ return NULL;
+ }
mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic );
}
p_sys->p_info->discard_fbuf->id );
}
- if( p_pic ) return p_pic;
+ if( p_pic ) return p_pic;
break;
msg_Warn( p_dec, "invalid picture encountered" );
if ( ( p_sys->p_info->current_picture == NULL ) ||
( ( p_sys->p_info->current_picture->flags &
- PIC_MASK_CODING_TYPE) != B_CODING_TYPE ) )
+ PIC_MASK_CODING_TYPE) != B_CODING_TYPE ) )
{
if( p_sys->p_synchro ) vout_SynchroReset( p_sys->p_synchro );
}