X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Flibmpeg2.c;h=36f55696d151201e91c56c701aa3fe1074627b2d;hb=dfe8c5c087b8e968890136575cfc64dd82d7df6e;hp=6bff4241d1c30fb42ad4ec3b0d1e971f810fceb0;hpb=eb1fc1f88b5eaeac8e7d3d3f980ad62b846bee58;p=vlc diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c old mode 100755 new mode 100644 index 6bff4241d1..36f55696d1 --- 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 + * 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 @@ -19,25 +19,26 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include +#include +#include +#include +#include "../codec/cc.h" -#include "vout_synchro.h" +#include -/* Aspect ratio (ISO/IEC 13818-2 section 6.3.3, table 6-3) */ -#define AR_SQUARE_PICTURE 1 /* square pixels */ -#define AR_3_4_PICTURE 2 /* 3:4 picture (TV) */ -#define AR_16_9_PICTURE 3 /* 16:9 picture (wide screen) */ -#define AR_221_1_PICTURE 4 /* 2.21:1 picture (movie) */ +#include /***************************************************************************** * decoder_sys_t : libmpeg2 decoder descriptor @@ -49,27 +50,40 @@ struct decoder_sys_t */ mpeg2dec_t *p_mpeg2dec; const mpeg2_info_t *p_info; - vlc_bool_t b_skip; + bool b_skip; /* * Input properties */ - mtime_t i_pts; mtime_t i_previous_pts; mtime_t i_current_pts; - int i_current_rate; + mtime_t i_previous_dts; + mtime_t i_current_dts; picture_t * p_picture_to_destroy; - vlc_bool_t b_garbage_pic; - vlc_bool_t b_after_sequence_header; /* is it the next frame after + bool b_garbage_pic; + bool b_after_sequence_header; /* is it the next frame after * the sequence header ? */ - vlc_bool_t b_slice_i; /* intra-slice refresh stream */ + bool b_slice_i; /* intra-slice refresh stream */ + bool b_second_field; + + bool b_preroll; /* * Output properties */ - vout_synchro_t *p_synchro; - int i_aspect; - + decoder_synchro_t *p_synchro; + int i_aspect; + int i_sar_num; + int i_sar_den; + mtime_t i_last_frame_pts; + + /* Closed captioning support */ + uint32_t i_cc_flags; + mtime_t i_cc_pts; + mtime_t i_cc_dts; + cc_data_t cc; + uint8_t *p_gop_user_data; + uint32_t i_gop_user_data; }; /***************************************************************************** @@ -79,18 +93,22 @@ static int OpenDecoder( vlc_object_t * ); static void CloseDecoder( vlc_object_t * ); static picture_t *DecodeBlock( decoder_t *, block_t ** ); +static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] ); static picture_t *GetNewPicture( decoder_t *, uint8_t ** ); +static void GetAR( decoder_t *p_dec ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("MPEG I/II video decoder (using libmpeg2)") ); - set_capability( "decoder", 150 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "libmpeg2" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("MPEG I/II video decoder (using libmpeg2)") ) + set_capability( "decoder", 150 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "libmpeg2" ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score @@ -101,56 +119,71 @@ static int OpenDecoder( vlc_object_t *p_this ) decoder_sys_t *p_sys; uint32_t i_accel = 0; - 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->fmt_in.i_codec != VLC_FOURCC('P','I','M','1') && - /* ATI Video */ - p_dec->fmt_in.i_codec != VLC_FOURCC('V','C','R','2') && - p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','2') ) - { + if( p_dec->fmt_in.i_codec != VLC_CODEC_MPGV ) return VLC_EGENERIC; - } - /* Allocate the memory needed to store the decoder's structure */ - if( ( p_dec->p_sys = p_sys = - (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) + /* Select onl recognized original format (standard mpeg video) */ + switch( p_dec->fmt_in.i_original_fourcc ) { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; + case VLC_FOURCC('m','p','g','1'): + case VLC_FOURCC('m','p','g','2'): + case VLC_FOURCC('m','p','g','v'): + case VLC_FOURCC('P','I','M','1'): + case VLC_FOURCC('h','d','v','2'): + break; + default: + if( p_dec->fmt_in.i_original_fourcc ) + return VLC_EGENERIC; + break; } + /* Allocate the memory needed to store the decoder's structure */ + if( ( p_dec->p_sys = p_sys = calloc( 1, sizeof(*p_sys)) ) == NULL ) + return VLC_ENOMEM; + /* Initialize the thread properties */ - 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_pts = mdate() + DEFAULT_PTS_DELAY; 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_second_field = 0; p_sys->b_skip = 0; + p_sys->b_preroll = false; + + p_sys->i_cc_pts = 0; + p_sys->i_cc_dts = 0; + p_sys->i_cc_flags = 0; +#if MPEG2_RELEASE >= MPEG2_VERSION (0, 5, 0) + p_dec->pf_get_cc = GetCc; + cc_Init( &p_sys->cc ); +#endif + p_sys->p_gop_user_data = NULL; + p_sys->i_gop_user_data = 0; -#if defined( __i386__ ) - if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX ) +#if defined( __i386__ ) || defined( __x86_64__ ) + if( vlc_CPU() & CPU_CAPABILITY_MMX ) { i_accel |= MPEG2_ACCEL_X86_MMX; } - if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW ) + if( vlc_CPU() & CPU_CAPABILITY_3DNOW ) { i_accel |= MPEG2_ACCEL_X86_3DNOW; } - if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT ) + if( vlc_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 ) +#elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) + if( vlc_CPU() & CPU_CAPABILITY_ALTIVEC ) { i_accel |= MPEG2_ACCEL_PPC_ALTIVEC; } @@ -176,6 +209,8 @@ static int OpenDecoder( vlc_object_t *p_this ) p_sys->p_info = mpeg2_info( p_sys->p_mpeg2dec ); p_dec->pf_decode_video = DecodeBlock; + p_dec->fmt_out.i_cat = VIDEO_ES; + p_dec->fmt_out.i_codec = 0; return VLC_SUCCESS; } @@ -207,13 +242,17 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) block_Release( p_block ); return NULL; } + if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY + | BLOCK_FLAG_CORRUPTED)) + cc_Flush( &p_sys->cc ); - if( (p_block->i_flags&BLOCK_FLAG_DISCONTINUITY) && + 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 ); + decoder_SynchroReset( p_sys->p_synchro ); if( p_sys->p_info->current_fbuf != NULL && p_sys->p_info->current_fbuf->id != NULL ) { @@ -225,98 +264,74 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) uint8_t *buf[3]; buf[0] = buf[1] = buf[2] = NULL; if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) + { + p_block->i_buffer = 0; break; + } mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); } p_sys->p_picture_to_destroy = p_pic; if ( p_sys->b_slice_i ) { - vout_SynchroNewPicture( p_sys->p_synchro, - I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate ); - vout_SynchroDecode( p_sys->p_synchro ); - vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); + decoder_SynchroNewPicture( p_sys->p_synchro, + I_CODING_TYPE, 2, 0, 0, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); + decoder_SynchroDecode( p_sys->p_synchro ); + decoder_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); } } - if( p_block->i_pts ) + if( p_block->i_flags & BLOCK_FLAG_PREROLL ) + { + p_sys->b_preroll = true; + } + else if( p_sys->b_preroll ) { + p_sys->b_preroll = false; + /* Reset synchro */ + decoder_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, 0/*dts*/ ); + (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 = p_block->i_rate; - mpeg2_buffer( p_sys->p_mpeg2dec, p_block->p_buffer, p_block->p_buffer + p_block->i_buffer ); p_block->i_buffer = 0; break; +#if MPEG2_RELEASE >= MPEG2_VERSION (0, 5, 0) + + 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 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; - break; - case AR_16_9_PICTURE: - p_sys->i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; - break; - case AR_221_1_PICTURE: - p_sys->i_aspect = VOUT_ASPECT_FACTOR * 221 / 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; - 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; - } - 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; - } - } - - msg_Dbg( p_dec, "%dx%d, aspect %d, %u.%03u fps", - p_sys->p_info->sequence->width, - p_sys->p_info->sequence->height, p_sys->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) ); + GetAR( p_dec ); mpeg2_custom_fbuf( p_sys->p_mpeg2dec, 1 ); @@ -330,19 +345,20 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) } mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); /* This picture will never go through display_picture. */ p_pic->date = 0; /* For some reason, libmpeg2 will put this pic twice in * discard_picture. This can be considered a bug in libmpeg2. */ - p_dec->pf_picture_link( p_dec, p_pic ); + decoder_LinkPicture( p_dec, p_pic ); if( p_sys->p_synchro ) { - vout_SynchroRelease( p_sys->p_synchro ); + decoder_SynchroRelease( p_sys->p_synchro ); } - p_sys->p_synchro = vout_SynchroInit( p_dec, + p_sys->p_synchro = decoder_SynchroInit( p_dec, (uint32_t)((uint64_t)1001000000 * 27 / p_sys->p_info->sequence->frame_period) ); p_sys->b_after_sequence_header = 1; @@ -350,25 +366,13 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) break; case STATE_PICTURE_2ND: - 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 ); - - if( p_sys->b_skip ) - { - vout_SynchroTrash( p_sys->p_synchro ); - } - else - { - vout_SynchroDecode( p_sys->p_synchro ); - } + p_sys->b_second_field = 1; break; case STATE_PICTURE: { uint8_t *buf[3]; - mtime_t i_pts; + mtime_t i_pts, i_dts; buf[0] = buf[1] = buf[2] = NULL; if ( p_sys->b_after_sequence_header && @@ -377,10 +381,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { /* 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 ); - vout_SynchroDecode( p_sys->p_synchro ); - vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); + decoder_SynchroNewPicture( p_sys->p_synchro, + I_CODING_TYPE, 2, 0, 0, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); + decoder_SynchroDecode( p_sys->p_synchro ); + decoder_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); p_sys->b_slice_i = 1; } p_sys->b_after_sequence_header = 0; @@ -390,14 +395,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ( ( 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; - -#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; -#endif + i_dts = 0; /* Hack to handle demuxers which only have DTS timestamps */ if( !i_pts && !p_block->i_pts && p_block->i_dts > 0 ) @@ -412,41 +410,111 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_block->i_pts = p_block->i_dts = 0; /* End hack */ - vout_SynchroNewPicture( p_sys->p_synchro, +#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 + + /* If nb_fields == 1, it is a field picture, and it will be + * followed by another field picture for which we won't call + * decoder_SynchroNewPicture() because this would have other + * problems, so we take it into account here. + * This kind of sucks, but I didn't think better. --Meuuh + */ + decoder_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, - 0, p_sys->i_current_rate ); + p_sys->p_info->current_picture->nb_fields == 1 ? 2 : + p_sys->p_info->current_picture->nb_fields, i_pts, i_dts, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); + - if ( !(p_sys->b_slice_i + bool b_skip = false; + 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, + & PIC_MASK_CODING_TYPE) == PIC_FLAG_CODING_TYPE_P)) + && !decoder_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*/, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ) ) + { + b_skip = true; + } + + p_pic = NULL; + if( !b_skip ) + p_pic = GetNewPicture( p_dec, buf ); + + if( b_skip || !p_pic ) { mpeg2_skip( p_sys->p_mpeg2dec, 1 ); p_sys->b_skip = 1; - vout_SynchroTrash( p_sys->p_synchro ); + decoder_SynchroTrash( p_sys->p_synchro ); mpeg2_set_buf( p_sys->p_mpeg2dec, buf, NULL ); + + if( !b_skip ) + { + block_Release( p_block ); + return NULL; + } } else { mpeg2_skip( p_sys->p_mpeg2dec, 0 ); p_sys->b_skip = 0; - vout_SynchroDecode( p_sys->p_synchro ); + decoder_SynchroDecode( p_sys->p_synchro ); - if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) + mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); + } + if( p_sys->p_info->user_data_len > 2 || p_sys->i_gop_user_data > 2 ) + { + p_sys->i_cc_pts = i_pts; + p_sys->i_cc_dts = i_dts; + if( (p_sys->p_info->current_picture->flags + & PIC_MASK_CODING_TYPE) == PIC_FLAG_CODING_TYPE_P ) + p_sys->i_cc_flags = BLOCK_FLAG_TYPE_P; + else if( (p_sys->p_info->current_picture->flags + & 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; + + if( p_sys->i_gop_user_data > 2 ) { - block_Release( p_block ); - return NULL; + /* 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 ); + p_sys->i_gop_user_data = 0; } - mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + /* Extract the CC from the user_data of the picture */ + if( p_sys->p_info->user_data_len > 2 ) + cc_Extract( &p_sys->cc, &p_sys->p_info->user_data[0], p_sys->p_info->user_data_len ); } } break; + case STATE_GOP: + /* There can be userdata in a GOP. It needs to be remembered for the next picture. */ + if( p_sys->p_info->user_data_len > 2 ) + { + free( p_sys->p_gop_user_data ); + p_sys->p_gop_user_data = calloc( p_sys->p_info->user_data_len, sizeof(uint8_t) ); + if( p_sys->p_gop_user_data ) + { + p_sys->i_gop_user_data = p_sys->p_info->user_data_len; + memcpy( p_sys->p_gop_user_data, p_sys->p_info->user_data, p_sys->p_info->user_data_len ); + } + } + break; + case STATE_END: case STATE_SLICE: p_pic = NULL; @@ -455,15 +523,15 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { p_pic = (picture_t *)p_sys->p_info->display_fbuf->id; - vout_SynchroEnd( p_sys->p_synchro, + decoder_SynchroEnd( p_sys->p_synchro, p_sys->p_info->display_picture->flags & PIC_MASK_CODING_TYPE, p_sys->b_garbage_pic ); p_sys->b_garbage_pic = 0; - if ( p_sys->p_picture_to_destroy != p_pic ) + if( p_sys->p_picture_to_destroy != p_pic ) { - p_pic->date = vout_SynchroDate( p_sys->p_synchro ); + p_pic->date = decoder_SynchroDate( p_sys->p_synchro ); } else { @@ -475,12 +543,22 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( p_sys->p_info->discard_fbuf && p_sys->p_info->discard_fbuf->id ) { - p_dec->pf_picture_unlink( p_dec, - p_sys->p_info->discard_fbuf->id ); + decoder_UnlinkPicture( p_dec, + p_sys->p_info->discard_fbuf->id ); } - if( p_pic ) return p_pic; + /* For still frames */ + if( state == STATE_END && p_pic ) p_pic->b_force = 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: @@ -491,12 +569,13 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_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 ) ) + PIC_MASK_CODING_TYPE) != PIC_FLAG_CODING_TYPE_B ) ) { - if( p_sys->p_synchro ) vout_SynchroReset( p_sys->p_synchro ); + if( p_sys->p_synchro ) decoder_SynchroReset( p_sys->p_synchro ); } mpeg2_skip( p_sys->p_mpeg2dec, 1 ); p_sys->b_skip = 1; + cc_Flush( &p_sys->cc ); if( p_sys->p_info->current_fbuf && p_sys->p_info->current_fbuf->id ) @@ -513,6 +592,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) break; mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); } p_sys->p_picture_to_destroy = p_pic; @@ -528,10 +608,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( p_sys->b_slice_i ) { - vout_SynchroNewPicture( p_sys->p_synchro, - I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate ); - vout_SynchroDecode( p_sys->p_synchro ); - vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); + decoder_SynchroNewPicture( p_sys->p_synchro, + I_CODING_TYPE, 2, 0, 0, + p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY ); + decoder_SynchroDecode( p_sys->p_synchro ); + decoder_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 ); } break; } @@ -553,7 +634,9 @@ 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->p_synchro ) vout_SynchroRelease( p_sys->p_synchro ); + free( p_sys->p_gop_user_data ); + + if( p_sys->p_synchro ) decoder_SynchroRelease( p_sys->p_synchro ); if( p_sys->p_mpeg2dec ) mpeg2_close( p_sys->p_mpeg2dec ); @@ -569,16 +652,30 @@ static picture_t *GetNewPicture( decoder_t *p_dec, uint8_t **pp_buf ) picture_t *p_pic; 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 ) + { + 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'); + VLC_CODEC_I420 : VLC_CODEC_I422; /* Get a new picture */ - p_pic = p_dec->pf_vout_buffer_new( p_dec ); + p_pic = decoder_NewPicture( p_dec ); if( p_pic == NULL ) return NULL; @@ -589,7 +686,7 @@ static picture_t *GetNewPicture( decoder_t *p_dec, uint8_t **pp_buf ) 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 ); + decoder_LinkPicture( p_dec, p_pic ); pp_buf[0] = p_pic->p[0].p_pixels; pp_buf[1] = p_pic->p[1].p_pixels; @@ -597,3 +694,79 @@ static picture_t *GetNewPicture( decoder_t *p_dec, uint8_t **pp_buf ) return p_pic; } + +/***************************************************************************** + * GetCc: Retrieves the Closed Captions for the CC decoder. + *****************************************************************************/ +static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_cc = NULL; + int i; + + for( i = 0; i < 4; i++ ) + pb_present[i] = p_sys->cc.pb_present[i]; + + if( p_sys->cc.i_data <= 0 ) + return NULL; + + p_cc = block_New( p_dec, p_sys->cc.i_data); + if( p_cc ) + { + memcpy( p_cc->p_buffer, p_sys->cc.p_data, p_sys->cc.i_data ); + p_cc->i_dts = + p_cc->i_pts = p_sys->cc.b_reorder ? p_sys->i_cc_pts : p_sys->i_cc_dts; + p_cc->i_flags = ( p_sys->cc.b_reorder ? p_sys->i_cc_flags : BLOCK_FLAG_TYPE_P ) & ( BLOCK_FLAG_TYPE_I|BLOCK_FLAG_TYPE_P|BLOCK_FLAG_TYPE_B); + } + cc_Flush( &p_sys->cc ); + return p_cc; +} + +/***************************************************************************** + * 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; + } + 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; + } + 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->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) ); +}