X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Flibmpeg2.c;h=13ec4c512a79b7a56c3e5c6e9c826636b7f715bd;hb=d253749f68a85d8c720e66e4a0f7ad9693ba84e3;hp=249272dab9e96cfa287ec4c23909a722b9e15b85;hpb=735fedde2df3dd5e447ce44b0cc84bf38c28c6e6;p=vlc diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c old mode 100755 new mode 100644 index 249272dab9..13ec4c512a --- a/modules/codec/libmpeg2.c +++ b/modules/codec/libmpeg2.c @@ -1,16 +1,17 @@ /***************************************************************************** * libmpeg2.c: mpeg2 video decoder module making use of libmpeg2. ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN - * $Id: libmpeg2.c,v 1.16 2003/05/04 01:36:20 massiot 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 * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -18,77 +19,91 @@ * * 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 -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include /* malloc(), free() */ -#include /* memcpy(), memset() */ +#include +#include +#include +#include -#include +#include -#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_4_3_PICTURE 2 /* 4:3 picture (TV) */ #define AR_16_9_PICTURE 3 /* 16:9 picture (wide screen) */ #define AR_221_1_PICTURE 4 /* 2.21:1 picture (movie) */ /***************************************************************************** - * dec_thread_t : libmpeg2 decoder thread descriptor + * decoder_sys_t : libmpeg2 decoder descriptor *****************************************************************************/ -typedef struct dec_thread_t +struct decoder_sys_t { /* * libmpeg2 properties */ mpeg2dec_t *p_mpeg2dec; const mpeg2_info_t *p_info; + bool b_skip; /* * Input properties */ - decoder_fifo_t *p_fifo; /* stores the PES stream data */ - 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_period_remainder; + mtime_t i_previous_dts; + mtime_t i_current_dts; int i_current_rate; picture_t * p_picture_to_destroy; + bool b_garbage_pic; + bool b_after_sequence_header; /* is it the next frame after + * the sequence header ? */ + bool b_slice_i; /* intra-slice refresh stream */ + bool b_second_field; + + bool b_preroll; /* * Output properties */ - vout_thread_t *p_vout; - vout_synchro_t *p_synchro; + decoder_synchro_t *p_synchro; + int i_aspect; + int i_sar_num; + int i_sar_den; + mtime_t i_last_frame_pts; -} dec_thread_t; +}; /***************************************************************************** * Local prototypes *****************************************************************************/ -static int OpenDecoder ( vlc_object_t * ); -static int RunDecoder ( decoder_fifo_t * ); -static void CloseDecoder ( dec_thread_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( dec_thread_t *, uint8_t ** ); +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", 40 ); - set_callbacks( OpenDecoder, NULL ); + 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(); @@ -97,109 +112,194 @@ vlc_module_end(); *****************************************************************************/ static int OpenDecoder( vlc_object_t *p_this ) { - decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this; + decoder_t *p_dec = (decoder_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') && + p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','2','v') && + 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; + } + + /* 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 ) + 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_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; + +#if defined( __i386__ ) || defined( __x86_64__ ) + if( vlc_CPU() & CPU_CAPABILITY_MMX ) + { + i_accel |= MPEG2_ACCEL_X86_MMX; + } + + if( vlc_CPU() & CPU_CAPABILITY_3DNOW ) + { + i_accel |= MPEG2_ACCEL_X86_3DNOW; + } + + if( vlc_CPU() & CPU_CAPABILITY_MMXEXT ) + { + i_accel |= MPEG2_ACCEL_X86_MMXEXT; + } + +#elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) + if( vlc_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 ); - if( p_fifo->i_fourcc != VLC_FOURCC('m','p','g','v') ) + /* Initialize decoder */ + p_sys->p_mpeg2dec = mpeg2_init(); + if( p_sys->p_mpeg2dec == NULL) { + msg_Err( p_dec, "mpeg2_init() failed" ); + free( p_sys ); return VLC_EGENERIC; } - p_fifo->pf_run = RunDecoder; + p_sys->p_info = mpeg2_info( p_sys->p_mpeg2dec ); + + p_dec->pf_decode_video = DecodeBlock; + return VLC_SUCCESS; } /***************************************************************************** * RunDecoder: the libmpeg2 decoder *****************************************************************************/ -static int RunDecoder( decoder_fifo_t *p_fifo ) +static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { - dec_thread_t *p_dec; - data_packet_t *p_data = NULL; + decoder_sys_t *p_sys = p_dec->p_sys; mpeg2_state_t state; picture_t *p_pic; - int i_aspect, i_chroma; - - /* Allocate the memory needed to store the thread's structure */ - if( (p_dec = (dec_thread_t *)malloc (sizeof(dec_thread_t)) ) - == NULL) - { - msg_Err( p_fifo, "out of memory" ); - goto error; - } - /* Initialize the thread properties */ - memset( p_dec, 0, sizeof(dec_thread_t) ); - p_dec->p_fifo = p_fifo; - p_dec->p_pes = NULL; - p_dec->p_vout = NULL; - p_dec->p_mpeg2dec = NULL; - p_dec->p_synchro = NULL; - p_dec->p_info = NULL; - p_dec->i_pts = mdate() + DEFAULT_PTS_DELAY; - p_dec->i_current_pts = 0; - p_dec->i_previous_pts = 0; - p_dec->i_period_remainder = 0; - p_dec->p_picture_to_destroy = NULL; + block_t *p_block; - /* Initialize decoder */ - p_dec->p_mpeg2dec = mpeg2_init(); - if( p_dec->p_mpeg2dec == NULL) - goto error; + if( !pp_block || !*pp_block ) return NULL; - p_dec->p_info = mpeg2_info( p_dec->p_mpeg2dec ); + p_block = *pp_block; - /* libmpeg2 decoder thread's main loop */ - while( (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) ) + while( 1 ) { - state = mpeg2_parse( p_dec->p_mpeg2dec ); + state = mpeg2_parse( p_sys->p_mpeg2dec ); switch( state ) { case STATE_BUFFER: - /* Feed libmpeg2 a data packet at a time */ - if( p_data == NULL ) + if( !p_block->i_buffer ) { - /* Get the next PES */ - if( p_dec->p_pes ) - input_DeletePES( p_dec->p_fifo->p_packets_mgt, - p_dec->p_pes ); + block_Release( p_block ); + return NULL; + } - input_ExtractPES( p_dec->p_fifo, &p_dec->p_pes ); - if( !p_dec->p_pes ) + 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 ) + { + decoder_SynchroReset( p_sys->p_synchro ); + if( p_sys->p_info->current_fbuf != NULL + && p_sys->p_info->current_fbuf->id != NULL ) { - p_dec->p_fifo->b_error = 1; - break; + p_sys->b_garbage_pic = 1; + p_pic = p_sys->p_info->current_fbuf->id; } - - if( p_dec->p_pes->b_discontinuity && p_dec->p_synchro ) + else { - vout_SynchroReset( p_dec->p_synchro ); - if ( p_dec->p_info->current_fbuf != NULL ) - p_dec->p_picture_to_destroy - = p_dec->p_info->current_fbuf->id; + uint8_t *buf[3]; + buf[0] = buf[1] = buf[2] = NULL; + 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; - if( p_dec->p_pes->i_pts ) + if ( p_sys->b_slice_i ) { - mpeg2_pts( p_dec->p_mpeg2dec, - (uint32_t)p_dec->p_pes->i_pts ); - p_dec->i_previous_pts = p_dec->i_current_pts; - p_dec->i_current_pts = p_dec->p_pes->i_pts; + decoder_SynchroNewPicture( p_sys->p_synchro, + I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate, + 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_dec->i_current_rate = p_dec->p_pes->i_rate; - p_data = p_dec->p_pes->p_first; + 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 ); } - if( p_data != NULL ) +#ifdef PIC_FLAG_PTS + if( p_block->i_pts ) { - mpeg2_buffer( p_dec->p_mpeg2dec, - p_data->p_payload_start, - p_data->p_payload_end ); + mpeg2_pts( p_sys->p_mpeg2dec, (uint32_t)p_block->i_pts ); - p_data = p_data->p_next; +#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 = 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: { @@ -207,133 +307,188 @@ static int RunDecoder( decoder_fifo_t *p_fifo ) 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_dec->p_info->sequence->width / - p_dec->p_info->sequence->height; - break; - } - } - else - { - /* Use the value provided in the MPEG sequence header */ - i_aspect = ((uint64_t)p_dec->p_info->sequence->display_width) * - p_dec->p_info->sequence->pixel_width * VOUT_ASPECT_FACTOR / - p_dec->p_info->sequence->display_height / - p_dec->p_info->sequence->pixel_height; - } + GetAR( p_dec ); - i_chroma = VLC_FOURCC('Y','V','1','2'); + mpeg2_custom_fbuf( p_sys->p_mpeg2dec, 1 ); - p_dec->p_vout = vout_Request( p_dec->p_fifo, p_dec->p_vout, - p_dec->p_info->sequence->width, - p_dec->p_info->sequence->height, - i_chroma, i_aspect ); + /* Set the first 2 reference frames */ + mpeg2_set_buf( p_sys->p_mpeg2dec, buf, NULL ); - msg_Dbg( p_dec->p_fifo, "%dx%d, aspect %d, %u.%03u fps", - p_dec->p_info->sequence->width, - p_dec->p_info->sequence->height, i_aspect, - (u32)((u64)1001000000 * 27 / p_dec->p_info->sequence->frame_period / 1001), - (u32)((u64)1001000000 * 27 / p_dec->p_info->sequence->frame_period % 1001) ); + if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) + { + block_Release( p_block ); + return NULL; + } - mpeg2_custom_fbuf( p_dec->p_mpeg2dec, 1 ); + mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); - /* Set the first 2 reference frames */ - mpeg2_set_buf( p_dec->p_mpeg2dec, buf, NULL ); - mpeg2_set_buf( p_dec->p_mpeg2dec, buf, NULL ); + /* This picture will never go through display_picture. */ + p_pic->date = 0; - p_dec->p_synchro = vout_SynchroInit( p_dec->p_fifo, p_dec->p_vout, - (u32)((u64)1001000000 * 27 / p_dec->p_info->sequence->frame_period) ); + /* 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 ); + + 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) ); + p_sys->b_after_sequence_header = 1; } break; + case STATE_PICTURE_2ND: + p_sys->b_second_field = 1; + break; + case STATE_PICTURE: { uint8_t *buf[3]; + mtime_t i_pts, i_dts; buf[0] = buf[1] = buf[2] = NULL; - vout_SynchroNewPicture( p_dec->p_synchro, - p_dec->p_info->current_picture->flags & PIC_MASK_CODING_TYPE, - p_dec->p_info->current_picture->nb_fields, - (p_dec->p_info->current_picture->flags & PIC_FLAG_PTS) ? - ( (p_dec->p_info->current_picture->pts == - (uint32_t)p_dec->i_current_pts) ? - p_dec->i_current_pts : p_dec->i_previous_pts ) : 0, - 0, - p_dec->i_current_rate ); - - if ( !vout_SynchroChoose( p_dec->p_synchro, - p_dec->p_info->current_picture->flags & PIC_MASK_CODING_TYPE ) ) + 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" ); + decoder_SynchroNewPicture( p_sys->p_synchro, + I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate, + 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; + +#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 + + /* 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 == 1 ? 2 : + 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_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)) + && !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_info->sequence->flags & SEQ_FLAG_LOW_DELAY ) ) { - mpeg2_skip( p_dec->p_mpeg2dec, 1 ); - vout_SynchroTrash( p_dec->p_synchro ); - mpeg2_set_buf( p_dec->p_mpeg2dec, buf, NULL ); + mpeg2_skip( p_sys->p_mpeg2dec, 1 ); + p_sys->b_skip = 1; + decoder_SynchroTrash( p_sys->p_synchro ); + mpeg2_set_buf( p_sys->p_mpeg2dec, buf, NULL ); } else { - mpeg2_skip( p_dec->p_mpeg2dec, 0 ); - vout_SynchroDecode( p_dec->p_synchro ); - if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) break; - mpeg2_set_buf( p_dec->p_mpeg2dec, buf, p_pic ); + mpeg2_skip( p_sys->p_mpeg2dec, 0 ); + p_sys->b_skip = 0; + decoder_SynchroDecode( p_sys->p_synchro ); + + if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) + { + block_Release( p_block ); + return NULL; + } + + mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); + mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); } } break; case STATE_END: case STATE_SLICE: - if( p_dec->p_info->display_fbuf - && p_dec->p_info->display_fbuf->id ) + p_pic = NULL; + if( p_sys->p_info->display_fbuf + && p_sys->p_info->display_fbuf->id ) { - p_pic = (picture_t *)p_dec->p_info->display_fbuf->id; + p_pic = (picture_t *)p_sys->p_info->display_fbuf->id; - if ( p_pic != NULL ) - { - if ( p_dec->p_picture_to_destroy != p_pic ) - { - vout_SynchroEnd( p_dec->p_synchro, - p_dec->p_info->display_picture->flags + decoder_SynchroEnd( p_sys->p_synchro, + p_sys->p_info->display_picture->flags & PIC_MASK_CODING_TYPE, - 0 ); - vout_DatePicture( p_dec->p_vout, p_pic, - vout_SynchroDate( p_dec->p_synchro ) ); - vout_DisplayPicture( p_dec->p_vout, p_pic ); - } - else - { - p_dec->p_picture_to_destroy = NULL; - vout_SynchroEnd( p_dec->p_synchro, - p_dec->p_info->display_picture->flags - & PIC_MASK_CODING_TYPE, - 1 ); - vout_DatePicture( p_dec->p_vout, p_pic, 0 ); - vout_DisplayPicture( p_dec->p_vout, p_pic ); - } + p_sys->b_garbage_pic ); + p_sys->b_garbage_pic = 0; + + if ( p_sys->p_picture_to_destroy != p_pic ) + { + p_pic->date = decoder_SynchroDate( p_sys->p_synchro ); + } + else + { + p_sys->p_picture_to_destroy = NULL; + p_pic->date = 0; } } - if( p_dec->p_info->discard_fbuf && - p_dec->p_info->discard_fbuf->id ) + if( p_sys->p_info->discard_fbuf && + p_sys->p_info->discard_fbuf->id ) { - p_pic = (picture_t *)p_dec->p_info->discard_fbuf->id; - vout_UnlinkPicture( p_dec->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 = 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: @@ -341,22 +496,53 @@ static int RunDecoder( decoder_fifo_t *p_fifo ) uint8_t *buf[3]; buf[0] = buf[1] = buf[2] = NULL; - msg_Warn( p_dec->p_fifo, "invalid picture encountered" ); - if ( (p_dec->p_info->current_picture->flags & PIC_MASK_CODING_TYPE) - != B_CODING_TYPE ) + 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 ) ) { - vout_SynchroReset( p_dec->p_synchro ); + if( p_sys->p_synchro ) decoder_SynchroReset( p_sys->p_synchro ); } - mpeg2_skip( p_dec->p_mpeg2dec, 1 ); + mpeg2_skip( p_sys->p_mpeg2dec, 1 ); + p_sys->b_skip = 1; - if( p_dec->p_info->current_fbuf && - p_dec->p_info->current_fbuf->id ) + if( p_sys->p_info->current_fbuf && + p_sys->p_info->current_fbuf->id ) { - p_pic = (picture_t *)p_dec->p_info->current_fbuf->id; - vout_UnlinkPicture( p_dec->p_vout, p_pic ); - vout_DestroyPicture( p_dec->p_vout, p_pic ); + 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 ) + 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; + + 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 ) + { + decoder_SynchroNewPicture( p_sys->p_synchro, + I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate, + 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 ); } - mpeg2_set_buf( p_dec->p_mpeg2dec, buf, NULL ); break; } @@ -365,91 +551,147 @@ static int RunDecoder( decoder_fifo_t *p_fifo ) } } - /* If b_error is set, the libmpeg2 decoder thread enters the error loop */ - if( p_dec->p_fifo->b_error ) - { - DecoderError( p_dec->p_fifo ); - } - - /* End of the libmpeg2 decoder thread */ - CloseDecoder( p_dec ); + /* Never reached */ + return NULL; +} - return 0; +/***************************************************************************** + * CloseDecoder: libmpeg2 decoder destruction + *****************************************************************************/ +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; - error: - DecoderError( p_fifo ); - if( p_dec ) - { - if( p_dec->p_fifo ) - p_dec->p_fifo->b_error = 1; + if( p_sys->p_synchro ) decoder_SynchroRelease( p_sys->p_synchro ); - /* End of the libmpeg2 decoder thread */ - CloseDecoder( p_dec ); - } + if( p_sys->p_mpeg2dec ) mpeg2_close( p_sys->p_mpeg2dec ); - return -1; + free( p_sys ); } /***************************************************************************** - * CloseDecoder: libmpeg2 decoder destruction + * GetNewPicture: Get a new picture from the vout and set the buf struct *****************************************************************************/ -static void CloseDecoder( dec_thread_t * p_dec ) +static picture_t *GetNewPicture( decoder_t *p_dec, uint8_t **pp_buf ) { - if( p_dec ) + decoder_sys_t *p_sys = p_dec->p_sys; + 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 ) { - int i_pic; + 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; + } - if( p_dec->p_pes ) - input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_dec->p_pes ); + 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'); - if( p_dec->p_vout ) - { - /* Temporary hack to free the pictures in use by libmpeg2 */ - for( i_pic = 0; i_pic < p_dec->p_vout->render.i_pictures; i_pic++ ) - { - if( p_dec->p_vout->render.pp_picture[i_pic]->i_status == - RESERVED_PICTURE ) - vout_DestroyPicture( p_dec->p_vout, - p_dec->p_vout->render.pp_picture[i_pic] ); - if( p_dec->p_vout->render.pp_picture[i_pic]->i_refcount > 0 ) - vout_UnlinkPicture( p_dec->p_vout, - p_dec->p_vout->render.pp_picture[i_pic] ); - } + /* Get a new picture */ + p_pic = p_dec->pf_vout_buffer_new( p_dec ); - vout_Request( p_dec->p_fifo, p_dec->p_vout, 0, 0, 0, 0 ); - } + if( p_pic == NULL ) return NULL; - if( p_dec->p_synchro ) - vout_SynchroRelease( p_dec->p_synchro ); + 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; - if( p_dec->p_mpeg2dec ) mpeg2_close( p_dec->p_mpeg2dec ); + p_dec->pf_picture_link( p_dec, p_pic ); - free( p_dec ); - } + pp_buf[0] = p_pic->p[0].p_pixels; + pp_buf[1] = p_pic->p[1].p_pixels; + pp_buf[2] = p_pic->p[2].p_pixels; + + return p_pic; } /***************************************************************************** - * GetNewPicture: Get a new picture from the vout and set the buf struct + * GetAR: Get aspect ratio *****************************************************************************/ -static picture_t *GetNewPicture( dec_thread_t *p_dec, uint8_t **pp_buf ) +static void GetAR( decoder_t *p_dec ) { - picture_t *p_pic; + decoder_sys_t *p_sys = p_dec->p_sys; - /* Get a new picture */ - while( !(p_pic = vout_CreatePicture( p_dec->p_vout, 0, 0, 0 ) ) ) + /* Check whether the input gave a particular aspect ratio */ + if( p_dec->fmt_in.video.i_aspect ) { - if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) + 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_4_3_PICTURE: + 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; break; - - msleep( VOUT_OUTMEM_SLEEP ); + case AR_16_9_PICTURE: + p_sys->i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; + p_sys->i_sar_num = p_sys->p_info->sequence->picture_height * 16; + p_sys->i_sar_den = p_sys->p_info->sequence->picture_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->picture_height * 221; + p_sys->i_sar_den = p_sys->p_info->sequence->picture_width * 100; + break; + case AR_SQUARE_PICTURE: + p_sys->i_aspect = VOUT_ASPECT_FACTOR * + p_sys->p_info->sequence->picture_width / + p_sys->p_info->sequence->picture_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->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; + } } - if( p_pic == NULL ) - return NULL; - vout_LinkPicture( p_dec->p_vout, p_pic ); - - pp_buf[0] = p_pic->p[0].p_pixels; - pp_buf[1] = p_pic->p[1].p_pixels; - pp_buf[2] = p_pic->p[2].p_pixels; - return p_pic; + 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) ); }