#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_block_helper.h>
+#include <vlc_cpu.h>
#include "../codec/cc.h"
#include <mpeg2.h>
* Output properties
*/
decoder_synchro_t *p_synchro;
- int i_aspect;
int i_sar_num;
int i_sar_den;
mtime_t i_last_frame_pts;
static void CloseDecoder( vlc_object_t * );
static picture_t *DecodeBlock( decoder_t *, block_t ** );
+#if MPEG2_RELEASE >= MPEG2_VERSION (0, 5, 0)
static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] );
+#endif
static picture_t *GetNewPicture( decoder_t * );
static void PutPicture( decoder_t *, picture_t * );
static void GetAR( decoder_t *p_dec );
+static void Reset( decoder_t *p_dec );
+
/* */
static void DpbInit( decoder_t * );
static void DpbClean( decoder_t * );
static picture_t *DpbNewPicture( decoder_t * );
static void DpbUnlinkPicture( decoder_t *, picture_t * );
-static void DpbDisplayPicture( decoder_t *, picture_t * );
+static int DpbDisplayPicture( decoder_t *, picture_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
set_description( N_("MPEG I/II video decoder (using libmpeg2)") )
- set_capability( "decoder", 150 )
+ set_capability( "decoder", 50 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC )
set_callbacks( OpenDecoder, CloseDecoder )
p_sys->i_previous_pts = 0;
p_sys->i_current_dts = 0;
p_sys->i_previous_dts = 0;
+ p_sys->i_sar_num = 0;
+ p_sys->i_sar_den = 0;
p_sys->b_garbage_pic = false;
p_sys->b_slice_i = false;
p_sys->b_second_field = false;
i_accel |= MPEG2_ACCEL_PPC_ALTIVEC;
}
+#elif defined(__arm__) && defined(MPEG2_ACCEL_ARM)
+ i_accel |= MPEG2_ACCEL_ARM;
+
+# ifdef MPEG2_ACCEL_ARM_NEON
+ if( vlc_CPU() & CPU_CAPABILITY_NEON )
+ i_accel |= MPEG2_ACCEL_ARM_NEON;
+# endif
+
#else
/* If we do not know this CPU, trust libmpeg2's feature detection */
i_accel = MPEG2_ACCEL_DETECT;
p_block = *pp_block;
if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED) )
- {
- cc_Flush( &p_sys->cc );
- mpeg2_reset( p_sys->p_mpeg2dec, p_sys->p_info->sequence != NULL );
- DpbClean( p_dec );
- }
+ Reset( p_dec );
while( 1 )
{
mpeg2_custom_fbuf( p_sys->p_mpeg2dec, 1 );
/* Set the first 2 reference frames */
+ p_sys->i_sar_num = 0;
+ p_sys->i_sar_den = 0;
GetAR( p_dec );
for( int i = 0; i < 2; i++ )
{
picture_t *p_picture = DpbNewPicture( p_dec );
if( !p_picture )
{
- /* Is it ok ? or do we need a reset ? */
+ Reset( p_dec );
block_Release( p_block );
return NULL;
}
if( p_sys->p_synchro )
decoder_SynchroRelease( p_sys->p_synchro );
- p_sys->p_synchro =
- decoder_SynchroInit( p_dec, (uint32_t)((uint64_t)1001000000 * 27 /
- p_sys->p_info->sequence->frame_period) );
+ if( p_sys->p_info->sequence->frame_period <= 0 )
+ p_sys->p_synchro = NULL;
+ else
+ p_sys->p_synchro =
+ decoder_SynchroInit( p_dec, (uint32_t)(UINT64_C(1001000000) *
+ 27 / p_sys->p_info->sequence->frame_period) );
p_sys->b_after_sequence_header = true;
break;
}
p_pic = NULL;
if( !b_skip )
+ {
p_pic = DpbNewPicture( p_dec );
+ if( !p_pic )
+ {
+ Reset( p_dec );
+
+ p_pic = DpbNewPicture( p_dec );
+ if( !p_pic )
+ {
+ mpeg2_reset( p_sys->p_mpeg2dec, 1 );
+ block_Release( p_block );
+ return NULL;
+ }
+ }
+ }
if( b_skip || !p_pic )
{
& PIC_MASK_CODING_TYPE) == PIC_FLAG_CODING_TYPE_B )
p_sys->i_cc_flags = BLOCK_FLAG_TYPE_B;
else p_sys->i_cc_flags = BLOCK_FLAG_TYPE_I;
+ bool b_top_field_first = p_sys->p_info->current_picture->flags
+ & PIC_FLAG_TOP_FIELD_FIRST;
if( p_sys->i_gop_user_data > 2 )
{
/* We now have picture info for any cached user_data out of the gop */
- cc_Extract( &p_sys->cc, &p_sys->p_gop_user_data[0], p_sys->i_gop_user_data );
+ cc_Extract( &p_sys->cc, b_top_field_first,
+ &p_sys->p_gop_user_data[0], p_sys->i_gop_user_data );
p_sys->i_gop_user_data = 0;
}
/* Extract the CC from the user_data of the picture */
if( p_info->user_data_len > 2 )
- cc_Extract( &p_sys->cc, &p_info->user_data[0], p_info->user_data_len );
+ cc_Extract( &p_sys->cc, b_top_field_first,
+ &p_info->user_data[0], p_info->user_data_len );
}
}
break;
p_sys->p_info->display_fbuf->id )
{
p_pic = p_sys->p_info->display_fbuf->id;
- DpbDisplayPicture( p_dec, p_pic );
+ if( DpbDisplayPicture( p_dec, p_pic ) )
+ p_pic = NULL;
decoder_SynchroEnd( p_sys->p_synchro,
p_sys->p_info->display_picture->flags & PIC_MASK_CODING_TYPE,
p_sys->b_garbage_pic );
- p_pic->date = decoder_SynchroDate( p_sys->p_synchro );
- if( p_sys->b_garbage_pic )
- p_pic->date = 0; /* ??? */
- p_sys->b_garbage_pic = false;
+ if( p_pic )
+ {
+ p_pic->date = decoder_SynchroDate( p_sys->p_synchro );
+ if( p_sys->b_garbage_pic )
+ p_pic->date = 0; /* ??? */
+ p_sys->b_garbage_pic = false;
+ }
}
if( p_sys->p_info->discard_fbuf &&
free( p_sys );
}
+/*****************************************************************************
+ * Reset: reset the decoder state
+ *****************************************************************************/
+static void Reset( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ cc_Flush( &p_sys->cc );
+ mpeg2_reset( p_sys->p_mpeg2dec, 0 );
+ DpbClean( p_dec );
+}
+
/*****************************************************************************
* GetNewPicture: Get a new picture from the vout and set the buf struct
*****************************************************************************/
p_dec->fmt_out.video.i_height = p_sys->p_info->sequence->height;
p_dec->fmt_out.video.i_visible_height =
p_sys->p_info->sequence->picture_height;
- p_dec->fmt_out.video.i_aspect = p_sys->i_aspect;
p_dec->fmt_out.video.i_sar_num = p_sys->i_sar_num;
p_dec->fmt_out.video.i_sar_den = p_sys->i_sar_den;
return p_pic;
}
+#if MPEG2_RELEASE >= MPEG2_VERSION (0, 5, 0)
/*****************************************************************************
* GetCc: Retrieves the Closed Captions for the CC decoder.
*****************************************************************************/
cc_Flush( &p_sys->cc );
return p_cc;
}
+#endif
/*****************************************************************************
* GetAR: Get aspect ratio
static void GetAR( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ int i_old_sar_num = p_sys->i_sar_num;
+ int i_old_sar_den = p_sys->i_sar_den;
/* Check whether the input gave a particular aspect ratio */
- if( p_dec->fmt_in.video.i_aspect )
+ if( p_dec->fmt_in.video.i_sar_num > 0 &&
+ p_dec->fmt_in.video.i_sar_den > 0 )
{
- p_sys->i_aspect = p_dec->fmt_in.video.i_aspect;
+ p_sys->i_sar_num = p_dec->fmt_in.video.i_sar_num;
+ p_sys->i_sar_den = p_dec->fmt_in.video.i_sar_den;
}
else
{
/* Use the value provided in the MPEG sequence header */
if( p_sys->p_info->sequence->pixel_height > 0 )
{
- p_sys->i_aspect =
- ((uint64_t)p_sys->p_info->sequence->picture_width) *
- p_sys->p_info->sequence->pixel_width *
- VOUT_ASPECT_FACTOR /
- p_sys->p_info->sequence->picture_height /
- p_sys->p_info->sequence->pixel_height;
p_sys->i_sar_num = p_sys->p_info->sequence->pixel_width;
p_sys->i_sar_den = p_sys->p_info->sequence->pixel_height;
}
/* Invalid aspect, assume 4:3.
* This shouldn't happen and if it does it is a bug
* in libmpeg2 (likely triggered by an invalid stream) */
- p_sys->i_aspect = VOUT_ASPECT_FACTOR * 4 / 3;
p_sys->i_sar_num = p_sys->p_info->sequence->picture_height * 4;
p_sys->i_sar_den = p_sys->p_info->sequence->picture_width * 3;
}
}
- msg_Dbg( p_dec, "%dx%d (display %d,%d), aspect %d, sar %i:%i, %u.%03u fps",
- p_sys->p_info->sequence->picture_width,
- p_sys->p_info->sequence->picture_height,
- p_sys->p_info->sequence->display_width,
- p_sys->p_info->sequence->display_height,
- p_sys->i_aspect, p_sys->i_sar_num, p_sys->i_sar_den,
- (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) );
+ if( p_sys->i_sar_num == i_old_sar_num &&
+ p_sys->i_sar_den == i_old_sar_den )
+ return;
+
+ if( p_sys->p_info->sequence->frame_period > 0 )
+ msg_Dbg( p_dec,
+ "%dx%d (display %d,%d), sar %i:%i, %u.%03u fps",
+ p_sys->p_info->sequence->picture_width,
+ p_sys->p_info->sequence->picture_height,
+ p_sys->p_info->sequence->display_width,
+ p_sys->p_info->sequence->display_height,
+ p_sys->i_sar_num, p_sys->i_sar_den,
+ (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) );
+ else
+ msg_Dbg( p_dec, "bad frame period" );
}
/*****************************************************************************
static void DpbUnlinkPicture( decoder_t *p_dec, picture_t *p_picture )
{
picture_dpb_t *p = DpbFindPicture( p_dec, p_picture );
+
+ /* XXX it is needed to workaround libmpeg2 bugs */
+ if( !p || !p->b_linked )
+ {
+ msg_Err( p_dec, "DpbUnlinkPicture called on an invalid picture" );
+ return;
+ }
+
assert( p && p->b_linked );
decoder_UnlinkPicture( p_dec, p->p_picture );
/**
* Mark the provided picture as displayed.
*/
-static void DpbDisplayPicture( decoder_t *p_dec, picture_t *p_picture )
+static int DpbDisplayPicture( decoder_t *p_dec, picture_t *p_picture )
{
picture_dpb_t *p = DpbFindPicture( p_dec, p_picture );
+
+ /* XXX it is needed to workaround libmpeg2 bugs */
+ if( !p || p->b_displayed || !p->b_linked )
+ {
+ msg_Err( p_dec, "DpbDisplayPicture called on an invalid picture" );
+ return VLC_EGENERIC;
+ }
+
assert( p && !p->b_displayed && p->b_linked );
p->b_displayed = true;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff