X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Flibmpeg2.c;h=b622dad20271e67dfb4b4304d440854ed5f2102f;hb=d5e8b7340d120798bd5871bafaf96f4e14a0b1b8;hp=f6d7f66269749c962a994015ae5ea7d47201a69f;hpb=88991a5ce9c2603bc5a9be0779353fe08b29e8f9;p=vlc diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c old mode 100755 new mode 100644 index f6d7f66269..b622dad202 --- a/modules/codec/libmpeg2.c +++ b/modules/codec/libmpeg2.c @@ -1,10 +1,10 @@ /***************************************************************************** * libmpeg2.c: mpeg2 video decoder module making use of libmpeg2. ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN - * $Id: libmpeg2.c,v 1.31 2003/10/25 00:49:13 sam Exp $ + * Copyright (C) 1999-2001 the VideoLAN team + * $Id$ * - * Authors: Gildas Bazin + * Authors: Gildas Bazin * Christophe Massiot * * This program is free software; you can redistribute it and/or modify @@ -27,12 +27,8 @@ *****************************************************************************/ #include #include -#include #include -#include /* malloc(), free() */ -#include /* memcpy(), memset() */ - #include #include "vout_synchro.h" @@ -58,10 +54,10 @@ struct decoder_sys_t /* * Input properties */ - pes_packet_t *p_pes; /* current PES we are decoding */ - mtime_t i_pts; mtime_t i_previous_pts; mtime_t i_current_pts; + mtime_t i_previous_dts; + mtime_t i_current_dts; int i_current_rate; picture_t * p_picture_to_destroy; vlc_bool_t b_garbage_pic; @@ -69,23 +65,29 @@ struct decoder_sys_t * the sequence header ? */ vlc_bool_t b_slice_i; /* intra-slice refresh stream */ + vlc_bool_t b_preroll; + /* * Output properties */ - vout_thread_t *p_vout; vout_synchro_t *p_synchro; + int i_aspect; + int i_sar_num; + int i_sar_den; + mtime_t i_last_frame_pts; }; /***************************************************************************** * Local prototypes *****************************************************************************/ -static int OpenDecoder( vlc_object_t * ); -static int InitDecoder( decoder_t * ); -static int RunDecoder ( decoder_t *, block_t * ); -static int EndDecoder ( decoder_t * ); +static int OpenDecoder( vlc_object_t * ); +static void CloseDecoder( vlc_object_t * ); + +static picture_t *DecodeBlock( decoder_t *, block_t ** ); static picture_t *GetNewPicture( decoder_t *, uint8_t ** ); +static void GetAR( decoder_t *p_dec ); /***************************************************************************** * Module descriptor @@ -93,7 +95,9 @@ static picture_t *GetNewPicture( decoder_t *, uint8_t ** ); vlc_module_begin(); set_description( _("MPEG I/II video decoder (using libmpeg2)") ); set_capability( "decoder", 150 ); - set_callbacks( OpenDecoder, NULL ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_VCODEC ); + set_callbacks( OpenDecoder, CloseDecoder ); add_shortcut( "libmpeg2" ); vlc_module_end(); @@ -103,32 +107,23 @@ vlc_module_end(); static int OpenDecoder( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys; + uint32_t i_accel = 0; - if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('m','p','g','v') && - p_dec->p_fifo->i_fourcc != VLC_FOURCC('m','p','g','1') && + if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','v') && + p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','1') && /* Pinnacle hardware-mpeg1 */ - p_dec->p_fifo->i_fourcc != VLC_FOURCC('P','I','M','1') && + p_dec->fmt_in.i_codec != VLC_FOURCC('P','I','M','1') && /* ATI Video */ - p_dec->p_fifo->i_fourcc != VLC_FOURCC('V','C','R','2') && - p_dec->p_fifo->i_fourcc != VLC_FOURCC('m','p','g','2') ) + p_dec->fmt_in.i_codec != VLC_FOURCC('V','C','R','2') && + p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','2') && + p_dec->fmt_in.i_codec != VLC_FOURCC('h','d','v','2') ) { return VLC_EGENERIC; } - p_dec->pf_init = InitDecoder; - p_dec->pf_decode = RunDecoder; - p_dec->pf_end = EndDecoder; - - return VLC_SUCCESS; -} - -/***************************************************************************** - * InitDecoder: Initalize the decoder - *****************************************************************************/ -static int InitDecoder( decoder_t *p_dec ) -{ /* Allocate the memory needed to store the decoder's structure */ - if( ( p_dec->p_sys = + if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { msg_Err( p_dec, "out of memory" ); @@ -136,30 +131,63 @@ static int InitDecoder( decoder_t *p_dec ) } /* Initialize the thread properties */ - memset( p_dec->p_sys, 0, sizeof(decoder_sys_t) ); - p_dec->p_sys->p_pes = NULL; - p_dec->p_sys->p_vout = NULL; - p_dec->p_sys->p_mpeg2dec = NULL; - p_dec->p_sys->p_synchro = NULL; - p_dec->p_sys->p_info = NULL; - p_dec->p_sys->i_pts = mdate() + DEFAULT_PTS_DELAY; - p_dec->p_sys->i_current_pts = 0; - p_dec->p_sys->i_previous_pts = 0; - p_dec->p_sys->p_picture_to_destroy = NULL; - p_dec->p_sys->b_garbage_pic = 0; - p_dec->p_sys->b_slice_i = 0; - p_dec->p_sys->b_skip = 0; + memset( p_sys, 0, sizeof(decoder_sys_t) ); + p_sys->p_mpeg2dec = NULL; + p_sys->p_synchro = NULL; + p_sys->p_info = NULL; + p_sys->i_current_pts = 0; + p_sys->i_previous_pts = 0; + p_sys->i_current_dts = 0; + p_sys->i_previous_dts = 0; + p_sys->p_picture_to_destroy = NULL; + p_sys->b_garbage_pic = 0; + p_sys->b_slice_i = 0; + p_sys->b_skip = 0; + p_sys->b_preroll = VLC_FALSE; + +#if defined( __i386__ ) || defined( __x86_64__ ) + if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX ) + { + i_accel |= MPEG2_ACCEL_X86_MMX; + } + + if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW ) + { + i_accel |= MPEG2_ACCEL_X86_3DNOW; + } + + if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT ) + { + i_accel |= MPEG2_ACCEL_X86_MMXEXT; + } + +#elif defined( __powerpc__ ) || defined( SYS_DARWIN ) + if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC ) + { + i_accel |= MPEG2_ACCEL_PPC_ALTIVEC; + } + +#else + /* If we do not know this CPU, trust libmpeg2's feature detection */ + i_accel = MPEG2_ACCEL_DETECT; + +#endif + + /* Set CPU acceleration features */ + mpeg2_accel( i_accel ); /* Initialize decoder */ - p_dec->p_sys->p_mpeg2dec = mpeg2_init(); - if( p_dec->p_sys->p_mpeg2dec == NULL) + p_sys->p_mpeg2dec = mpeg2_init(); + if( p_sys->p_mpeg2dec == NULL) { msg_Err( p_dec, "mpeg2_init() failed" ); - free( p_dec->p_sys ); + free( p_sys ); return VLC_EGENERIC; } - p_dec->p_sys->p_info = mpeg2_info( p_dec->p_sys->p_mpeg2dec ); + p_sys->p_info = mpeg2_info( p_sys->p_mpeg2dec ); + + p_dec->pf_decode_video = DecodeBlock; return VLC_SUCCESS; } @@ -167,36 +195,36 @@ static int InitDecoder( decoder_t *p_dec ) /***************************************************************************** * RunDecoder: the libmpeg2 decoder *****************************************************************************/ -static int RunDecoder( decoder_t *p_dec, block_t *p_block ) +static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; mpeg2_state_t state; picture_t *p_pic; - int i_aspect; - vlc_bool_t b_need_more_data = VLC_FALSE; + block_t *p_block; + + if( !pp_block || !*pp_block ) return NULL; + + p_block = *pp_block; while( 1 ) { - if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) - { - block_Release( p_block ); - return VLC_EGENERIC; - } - state = mpeg2_parse( p_sys->p_mpeg2dec ); switch( state ) { case STATE_BUFFER: - if( !p_block->i_buffer || b_need_more_data ) + if( !p_block->i_buffer ) { block_Release( p_block ); - return VLC_SUCCESS; + return NULL; } - if( p_block->b_discontinuity && p_sys->p_synchro - && p_sys->p_info->sequence->width != (unsigned)-1 ) + if( (p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY + | BLOCK_FLAG_CORRUPTED)) && + p_sys->p_synchro && + p_sys->p_info->sequence && + p_sys->p_info->sequence->width != (unsigned)-1 ) { vout_SynchroReset( p_sys->p_synchro ); if( p_sys->p_info->current_fbuf != NULL @@ -215,144 +243,92 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) } p_sys->p_picture_to_destroy = p_pic; - memset( p_pic->p[0].p_pixels, 0, - p_sys->p_info->sequence->width - * p_sys->p_info->sequence->height ); - memset( p_pic->p[1].p_pixels, 0x80, - p_sys->p_info->sequence->width - * p_sys->p_info->sequence->height / 4 ); - memset( p_pic->p[2].p_pixels, 0x80, - p_sys->p_info->sequence->width - * p_sys->p_info->sequence->height / 4 ); - if ( p_sys->b_slice_i ) { vout_SynchroNewPicture( p_sys->p_synchro, - I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate ); + I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); vout_SynchroDecode( p_sys->p_synchro ); vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); } } + if( p_block->i_flags & BLOCK_FLAG_PREROLL ) + { + p_sys->b_preroll = VLC_TRUE; + } + else if( p_sys->b_preroll ) + { + p_sys->b_preroll = VLC_FALSE; + /* Reset synchro */ + vout_SynchroReset( p_sys->p_synchro ); + } + +#ifdef PIC_FLAG_PTS if( p_block->i_pts ) { mpeg2_pts( p_sys->p_mpeg2dec, (uint32_t)p_block->i_pts ); + +#else /* New interface */ + if( p_block->i_pts || p_block->i_dts ) + { + mpeg2_tag_picture( p_sys->p_mpeg2dec, + (uint32_t)p_block->i_pts, + (uint32_t)p_block->i_dts ); +#endif p_sys->i_previous_pts = p_sys->i_current_pts; p_sys->i_current_pts = p_block->i_pts; + p_sys->i_previous_dts = p_sys->i_current_dts; + p_sys->i_current_dts = p_block->i_dts; } - p_sys->i_current_rate = DEFAULT_RATE;//p_pes->i_rate; + p_sys->i_current_rate = p_block->i_rate; mpeg2_buffer( p_sys->p_mpeg2dec, p_block->p_buffer, p_block->p_buffer + p_block->i_buffer ); - b_need_more_data = VLC_TRUE; + p_block->i_buffer = 0; break; +#ifdef STATE_SEQUENCE_MODIFIED + case STATE_SEQUENCE_MODIFIED: + GetAR( p_dec ); + break; +#endif + case STATE_SEQUENCE: { /* Initialize video output */ uint8_t *buf[3]; buf[0] = buf[1] = buf[2] = NULL; - /* Check whether the input gives a particular aspect ratio */ - if( p_dec->p_fifo->p_demux_data - && ( *(int*)(p_dec->p_fifo->p_demux_data) & 0x7 ) ) - { - i_aspect = *(int*)(p_dec->p_fifo->p_demux_data); - switch( i_aspect ) - { - case AR_3_4_PICTURE: - i_aspect = VOUT_ASPECT_FACTOR * 4 / 3; - break; - case AR_16_9_PICTURE: - i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; - break; - case AR_221_1_PICTURE: - i_aspect = VOUT_ASPECT_FACTOR * 221 / 100; - break; - case AR_SQUARE_PICTURE: - default: - i_aspect = VOUT_ASPECT_FACTOR * - p_sys->p_info->sequence->width / - p_sys->p_info->sequence->height; - break; - } - } - else - { - /* Use the value provided in the MPEG sequence header */ - i_aspect = ((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; - } + GetAR( p_dec ); - if ( p_dec->p_sys->p_vout != NULL ) - { - int i_pic; - /* Temporary hack to free the pictures in use by libmpeg2 */ - for ( i_pic = 0; i_pic < p_dec->p_sys->p_vout->render.i_pictures; i_pic++ ) - { - if( p_dec->p_sys->p_vout->render.pp_picture[i_pic]->i_status == - RESERVED_PICTURE ) - vout_DestroyPicture( p_dec->p_sys->p_vout, - p_dec->p_sys->p_vout->render.pp_picture[i_pic] ); - if( p_dec->p_sys->p_vout->render.pp_picture[i_pic]->i_refcount > 0 ) - vout_UnlinkPicture( p_dec->p_sys->p_vout, - p_dec->p_sys->p_vout->render.pp_picture[i_pic] ); - } - } + mpeg2_custom_fbuf( p_sys->p_mpeg2dec, 1 ); - p_sys->p_vout = vout_Request( p_dec, p_sys->p_vout, - p_sys->p_info->sequence->width, - p_sys->p_info->sequence->height, - VLC_FOURCC('Y','V','1','2'), - i_aspect ); + /* Set the first 2 reference frames */ + mpeg2_set_buf( p_sys->p_mpeg2dec, buf, NULL ); - if(p_sys->p_vout == NULL ) + if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) { - msg_Err( p_dec, "cannot create vout" ); block_Release( p_block ); - return -1; + return NULL; } - msg_Dbg( p_dec, "%dx%d, aspect %d, %u.%03u fps", - p_sys->p_info->sequence->width, - p_sys->p_info->sequence->height, i_aspect, - (uint32_t)((uint64_t)1001000000 * 27 / - p_sys->p_info->sequence->frame_period / 1001), - (uint32_t)((uint64_t)1001000000 * 27 / - p_sys->p_info->sequence->frame_period % 1001) ); - - mpeg2_custom_fbuf( p_sys->p_mpeg2dec, 1 ); - - /* Set the first 2 reference frames */ - mpeg2_set_buf( p_sys->p_mpeg2dec, buf, NULL ); - - if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) break; - memset( p_pic->p[0].p_pixels, 0, - p_sys->p_info->sequence->width - * p_sys->p_info->sequence->height ); - memset( p_pic->p[1].p_pixels, 0x80, - p_sys->p_info->sequence->width - * p_sys->p_info->sequence->height / 4 ); - memset( p_pic->p[2].p_pixels, 0x80, - p_sys->p_info->sequence->width - * p_sys->p_info->sequence->height / 4 ); mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + /* This picture will never go through display_picture. */ - vout_DatePicture( p_sys->p_vout, p_pic, 0 ); - vout_DisplayPicture( p_sys->p_vout, p_pic ); + p_pic->date = 0; + /* For some reason, libmpeg2 will put this pic twice in * discard_picture. This can be considered a bug in libmpeg2. */ - vout_LinkPicture( p_sys->p_vout, p_pic ); + p_dec->pf_picture_link( p_dec, p_pic ); - if ( p_sys->p_synchro ) + if( p_sys->p_synchro ) { vout_SynchroRelease( p_sys->p_synchro ); } - p_sys->p_synchro = vout_SynchroInit( p_dec, p_sys->p_vout, + p_sys->p_synchro = vout_SynchroInit( p_dec, (uint32_t)((uint64_t)1001000000 * 27 / p_sys->p_info->sequence->frame_period) ); p_sys->b_after_sequence_header = 1; @@ -363,10 +339,10 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) 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, - 0, 0, - p_sys->i_current_rate ); + 0, 0, p_sys->i_current_rate, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); - if ( p_sys->b_skip ) + if( p_sys->b_skip ) { vout_SynchroTrash( p_sys->p_synchro ); } @@ -379,38 +355,71 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) case STATE_PICTURE: { uint8_t *buf[3]; + mtime_t i_pts, i_dts; buf[0] = buf[1] = buf[2] = NULL; - if ( p_sys->b_after_sequence_header - && ((p_sys->p_info->current_picture->flags - & PIC_MASK_CODING_TYPE) - == PIC_FLAG_CODING_TYPE_P) ) + if ( p_sys->b_after_sequence_header && + ((p_sys->p_info->current_picture->flags & + PIC_MASK_CODING_TYPE) == PIC_FLAG_CODING_TYPE_P) ) { /* Intra-slice refresh. Simulate a blank I picture. */ msg_Dbg( p_dec, "intra-slice refresh stream" ); vout_SynchroNewPicture( p_sys->p_synchro, - I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate ); + I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); vout_SynchroDecode( p_sys->p_synchro ); vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); p_sys->b_slice_i = 1; } p_sys->b_after_sequence_header = 0; +#ifdef PIC_FLAG_PTS + i_pts = p_sys->p_info->current_picture->flags & PIC_FLAG_PTS ? + ( ( p_sys->p_info->current_picture->pts == + (uint32_t)p_sys->i_current_pts ) ? + p_sys->i_current_pts : p_sys->i_previous_pts ) : 0; + i_dts = 0; + + /* Hack to handle demuxers which only have DTS timestamps */ + if( !i_pts && !p_block->i_pts && p_block->i_dts > 0 ) + { + if( p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY || + (p_sys->p_info->current_picture->flags & + PIC_MASK_CODING_TYPE) == PIC_FLAG_CODING_TYPE_B ) + { + i_pts = p_block->i_dts; + } + } + p_block->i_pts = p_block->i_dts = 0; + /* End hack */ + +#else /* New interface */ + + i_pts = p_sys->p_info->current_picture->flags & PIC_FLAG_TAGS ? + ( ( p_sys->p_info->current_picture->tag == + (uint32_t)p_sys->i_current_pts ) ? + p_sys->i_current_pts : p_sys->i_previous_pts ) : 0; + i_dts = p_sys->p_info->current_picture->flags & PIC_FLAG_TAGS ? + ( ( p_sys->p_info->current_picture->tag2 == + (uint32_t)p_sys->i_current_dts ) ? + p_sys->i_current_dts : p_sys->i_previous_dts ) : 0; +#endif + 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, - (p_sys->p_info->current_picture->flags & PIC_FLAG_PTS) ? - ( ( p_sys->p_info->current_picture->pts == - (uint32_t)p_sys->i_current_pts ) ? - p_sys->i_current_pts : p_sys->i_previous_pts ) : 0, - 0, p_sys->i_current_rate ); + p_sys->p_info->current_picture->nb_fields, i_pts, i_dts, + p_sys->i_current_rate, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); - if ( !(p_sys->b_slice_i + if( !p_dec->b_pace_control && !p_sys->b_preroll && + !(p_sys->b_slice_i && ((p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE) == P_CODING_TYPE)) && !vout_SynchroChoose( p_sys->p_synchro, p_sys->p_info->current_picture->flags - & PIC_MASK_CODING_TYPE ) ) + & PIC_MASK_CODING_TYPE, + /*p_sys->p_vout->render_time*/ 0 /*FIXME*/, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ) ) { mpeg2_skip( p_sys->p_mpeg2dec, 1 ); p_sys->b_skip = 1; @@ -422,7 +431,13 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) mpeg2_skip( p_sys->p_mpeg2dec, 0 ); p_sys->b_skip = 0; vout_SynchroDecode( p_sys->p_synchro ); - if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) break; + + if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) + { + block_Release( p_block ); + return NULL; + } + mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); } } @@ -430,6 +445,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) case STATE_END: case STATE_SLICE: + p_pic = NULL; if( p_sys->p_info->display_fbuf && p_sys->p_info->display_fbuf->id ) { @@ -440,26 +456,38 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) & PIC_MASK_CODING_TYPE, p_sys->b_garbage_pic ); p_sys->b_garbage_pic = 0; - vout_DisplayPicture( p_sys->p_vout, p_pic ); if ( p_sys->p_picture_to_destroy != p_pic ) { - vout_DatePicture( p_sys->p_vout, p_pic, - vout_SynchroDate( p_sys->p_synchro ) ); + p_pic->date = vout_SynchroDate( p_sys->p_synchro ); } else { p_sys->p_picture_to_destroy = NULL; - vout_DatePicture( p_sys->p_vout, p_pic, 0 ); + p_pic->date = 0; } } if( p_sys->p_info->discard_fbuf && p_sys->p_info->discard_fbuf->id ) { - p_pic = (picture_t *)p_sys->p_info->discard_fbuf->id; - vout_UnlinkPicture( p_sys->p_vout, p_pic ); + p_dec->pf_picture_unlink( p_dec, + p_sys->p_info->discard_fbuf->id ); } + + /* For still frames */ + if( state == STATE_END && p_pic ) p_pic->b_force = VLC_TRUE; + + if( p_pic ) + { + /* Avoid frames with identical timestamps. + * Especially needed for still frames in DVD menus. */ + if( p_sys->i_last_frame_pts == p_pic->date ) p_pic->date++; + p_sys->i_last_frame_pts = p_pic->date; + + return p_pic; + } + break; case STATE_INVALID: @@ -469,10 +497,10 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) 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 ) ) + ( ( p_sys->p_info->current_picture->flags & + PIC_MASK_CODING_TYPE) != B_CODING_TYPE ) ) { - vout_SynchroReset( p_sys->p_synchro ); + if( p_sys->p_synchro ) vout_SynchroReset( p_sys->p_synchro ); } mpeg2_skip( p_sys->p_mpeg2dec, 1 ); p_sys->b_skip = 1; @@ -483,6 +511,10 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) p_sys->b_garbage_pic = 1; p_pic = p_sys->p_info->current_fbuf->id; } + else if( !p_sys->p_info->sequence ) + { + break; + } else { if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) @@ -501,10 +533,11 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) p_sys->p_info->sequence->width * p_sys->p_info->sequence->height / 4 ); - if ( p_sys->b_slice_i ) + if( p_sys->b_slice_i ) { vout_SynchroNewPicture( p_sys->p_synchro, - I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate ); + I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); vout_SynchroDecode( p_sys->p_synchro ); vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); } @@ -516,47 +549,23 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) } } - block_Release( p_block ); - return VLC_EGENERIC; + /* Never reached */ + return NULL; } /***************************************************************************** - * EndDecoder: libmpeg2 decoder destruction + * CloseDecoder: libmpeg2 decoder destruction *****************************************************************************/ -static int EndDecoder( decoder_t * p_dec ) +static void CloseDecoder( vlc_object_t *p_this ) { + decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - if( p_sys ) - { - int i_pic; - - if( p_sys->p_synchro ) - vout_SynchroRelease( p_sys->p_synchro ); - - if( p_sys->p_vout ) - { - /* Temporary hack to free the pictures in use by libmpeg2 */ - for( i_pic = 0; i_pic < p_sys->p_vout->render.i_pictures; i_pic++ ) - { - if( p_sys->p_vout->render.pp_picture[i_pic]->i_status == - RESERVED_PICTURE ) - vout_DestroyPicture( p_sys->p_vout, - p_sys->p_vout->render.pp_picture[i_pic] ); - if( p_sys->p_vout->render.pp_picture[i_pic]->i_refcount > 0 ) - vout_UnlinkPicture( p_sys->p_vout, - p_sys->p_vout->render.pp_picture[i_pic] ); - } - - vout_Request( p_dec, p_sys->p_vout, 0, 0, 0, 0 ); - } + if( p_sys->p_synchro ) vout_SynchroRelease( p_sys->p_synchro ); - if( p_sys->p_mpeg2dec ) mpeg2_close( p_sys->p_mpeg2dec ); + if( p_sys->p_mpeg2dec ) mpeg2_close( p_sys->p_mpeg2dec ); - free( p_sys ); - } - - return VLC_SUCCESS; + free( p_sys ); } /***************************************************************************** @@ -567,26 +576,42 @@ static picture_t *GetNewPicture( decoder_t *p_dec, uint8_t **pp_buf ) decoder_sys_t *p_sys = p_dec->p_sys; picture_t *p_pic; - vlc_bool_t b_progressive = p_sys->p_info->current_picture != NULL ? - p_sys->p_info->current_picture->flags & PIC_FLAG_PROGRESSIVE_FRAME : 1; - vlc_bool_t b_top_field_first = p_sys->p_info->current_picture != NULL ? - p_sys->p_info->current_picture->flags & PIC_FLAG_TOP_FIELD_FIRST : 1; - unsigned int i_nb_fields = p_sys->p_info->current_picture != NULL ? - p_sys->p_info->current_picture->nb_fields : 2; - - /* Get a new picture */ - while( !( p_pic = vout_CreatePicture( p_sys->p_vout, - b_progressive, b_top_field_first, i_nb_fields ) ) ) + p_dec->fmt_out.video.i_width = p_sys->p_info->sequence->width; + p_dec->fmt_out.video.i_visible_width = + p_sys->p_info->sequence->picture_width; + 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; + + if( p_sys->p_info->sequence->frame_period > 0 ) { - if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) - break; - - msleep( VOUT_OUTMEM_SLEEP ); + p_dec->fmt_out.video.i_frame_rate = + (uint32_t)( (uint64_t)1001000000 * 27 / + p_sys->p_info->sequence->frame_period ); + p_dec->fmt_out.video.i_frame_rate_base = 1001; } + p_dec->fmt_out.i_codec = + ( p_sys->p_info->sequence->chroma_height < + p_sys->p_info->sequence->height ) ? + VLC_FOURCC('I','4','2','0') : VLC_FOURCC('I','4','2','2'); + + /* Get a new picture */ + p_pic = p_dec->pf_vout_buffer_new( p_dec ); + if( p_pic == NULL ) return NULL; - vout_LinkPicture( p_sys->p_vout, p_pic ); + p_pic->b_progressive = p_sys->p_info->current_picture != NULL ? + p_sys->p_info->current_picture->flags & PIC_FLAG_PROGRESSIVE_FRAME : 1; + p_pic->b_top_field_first = p_sys->p_info->current_picture != NULL ? + p_sys->p_info->current_picture->flags & PIC_FLAG_TOP_FIELD_FIRST : 1; + p_pic->i_nb_fields = p_sys->p_info->current_picture != NULL ? + p_sys->p_info->current_picture->nb_fields : 2; + + p_dec->pf_picture_link( p_dec, p_pic ); pp_buf[0] = p_pic->p[0].p_pixels; pp_buf[1] = p_pic->p[1].p_pixels; @@ -594,3 +619,76 @@ static picture_t *GetNewPicture( decoder_t *p_dec, uint8_t **pp_buf ) return p_pic; } + +/***************************************************************************** + * GetAR: Get aspect ratio + *****************************************************************************/ +static void GetAR( decoder_t *p_dec ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + + /* Check whether the input gave a particular aspect ratio */ + if( p_dec->fmt_in.video.i_aspect ) + { + p_sys->i_aspect = p_dec->fmt_in.video.i_aspect; + if( p_sys->i_aspect <= AR_221_1_PICTURE ) + switch( p_sys->i_aspect ) + { + case AR_3_4_PICTURE: + p_sys->i_aspect = VOUT_ASPECT_FACTOR * 4 / 3; + p_sys->i_sar_num = p_sys->p_info->sequence->display_height * 4; + p_sys->i_sar_den = p_sys->p_info->sequence->display_width * 3; + break; + case AR_16_9_PICTURE: + p_sys->i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; + p_sys->i_sar_num = p_sys->p_info->sequence->display_height * 16; + p_sys->i_sar_den = p_sys->p_info->sequence->display_width * 9; + break; + case AR_221_1_PICTURE: + p_sys->i_aspect = VOUT_ASPECT_FACTOR * 221 / 100; + p_sys->i_sar_num = p_sys->p_info->sequence->display_height * 221; + p_sys->i_sar_den = p_sys->p_info->sequence->display_width * 100; + break; + case AR_SQUARE_PICTURE: + p_sys->i_aspect = VOUT_ASPECT_FACTOR * + p_sys->p_info->sequence->width / + p_sys->p_info->sequence->height; + p_sys->i_sar_num = p_sys->i_sar_den = 1; + break; + } + } + 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->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; + p_sys->i_sar_num = p_sys->p_info->sequence->pixel_width; + p_sys->i_sar_den = p_sys->p_info->sequence->pixel_height; + } + else + { + /* 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->display_height * 4; + p_sys->i_sar_den = p_sys->p_info->sequence->display_width * 3; + } + } + + msg_Dbg( p_dec, "%dx%d, aspect %d, sar %i:%i, %u.%03u fps", + 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) ); +} +