/*****************************************************************************
* decoder.c: Functions for the management of decoders
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
p_dec->pf_decode_sub = 0;
p_dec->pf_packetize = 0;
- /* Initialize the decoder fifo */
+ /* Initialize the decoder fifo */
p_dec->p_module = NULL;
vlc_object_attach( p_dec, p_input );
+ stats_Create( p_dec->p_parent, "decoded_audio",
+ VLC_VAR_INTEGER, STATS_COUNTER );
+ stats_Create( p_dec->p_parent, "decoded_video",
+ VLC_VAR_INTEGER, STATS_COUNTER );
+ stats_Create( p_dec->p_parent, "decoded_sub",
+ VLC_VAR_INTEGER, STATS_COUNTER );
/* Find a suitable decoder/packetizer module */
if( i_object_type == VLC_OBJECT_DECODER )
p_dec->p_module = module_Need( p_dec, "decoder", "$codec", 0 );
p_dec->p_owner->sout.i_id = p_dec->fmt_in.i_id;
if( p_dec->fmt_in.psz_language )
{
+ if( p_dec->p_owner->sout.psz_language )
+ free( p_dec->p_owner->sout.psz_language );
p_dec->p_owner->sout.psz_language =
strdup( p_dec->fmt_in.psz_language );
}
if( p_dec->p_owner->p_sout_input == NULL )
{
- msg_Err( p_dec, "cannot create packetizer output" );
+ msg_Err( p_dec, "cannot create packetizer output (%4.4s)",
+ (char *)&p_dec->p_owner->sout.i_codec );
p_dec->b_error = VLC_TRUE;
while( p_sout_block )
while( (p_aout_buf = p_dec->pf_decode_audio( p_dec,
&p_packetized_block )) )
{
+ stats_UpdateInteger( p_dec->p_parent, "decoded_audio", 1 );
/* FIXME the best would be to handle the case start_date < preroll < end_date
* but that's not easy with non raw audio stream */
if( p_dec->p_owner->i_preroll_end > 0 &&
}
else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
{
+ stats_UpdateInteger( p_dec->p_parent, "decoded_audio", 1 );
if( p_dec->p_owner->i_preroll_end > 0 &&
p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
{
while( (p_packetized_block =
p_packetizer->pf_packetize( p_packetizer, &p_block )) )
{
+ if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
+ {
+ p_dec->fmt_in.i_extra = p_packetizer->fmt_out.i_extra;
+ p_dec->fmt_in.p_extra = malloc( p_dec->fmt_in.i_extra );
+ memcpy( p_dec->fmt_in.p_extra,
+ p_packetizer->fmt_out.p_extra,
+ p_dec->fmt_in.i_extra );
+ }
+
while( p_packetized_block )
{
block_t *p_next = p_packetized_block->p_next;
while( (p_pic = p_dec->pf_decode_video( p_dec,
&p_packetized_block )) )
{
+ stats_UpdateInteger( p_dec->p_parent, "decoded_video",
+ 1 );
if( p_dec->p_owner->i_preroll_end > 0 &&
p_pic->date < p_dec->p_owner->i_preroll_end )
{
}
else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
{
+ stats_UpdateInteger( p_dec->p_parent, "decoded_video", 1 );
if( p_dec->p_owner->i_preroll_end > 0 &&
p_pic->date < p_dec->p_owner->i_preroll_end )
{
subpicture_t *p_spu;
while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
{
+ stats_UpdateInteger( p_dec->p_parent, "decoded_sub", 1 );
if( p_dec->p_owner->i_preroll_end > 0 &&
p_spu->i_start < p_dec->p_owner->i_preroll_end &&
( p_spu->i_stop <= 0 || p_spu->i_stop <= p_dec->p_owner->i_preroll_end ) )
if( p_sys->p_aout_input == NULL )
{
+ audio_sample_format_t format;
+ int i_force_dolby = config_GetInt( p_dec, "force-dolby-surround" );
+
p_dec->fmt_out.audio.i_format = p_dec->fmt_out.i_codec;
p_sys->audio = p_dec->fmt_out.audio;
+
+ memcpy( &format, &p_sys->audio, sizeof( audio_sample_format_t ) );
+ if ( i_force_dolby && (format.i_original_channels&AOUT_CHAN_PHYSMASK)
+ == (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT) )
+ {
+ if ( i_force_dolby == 1 )
+ {
+ format.i_original_channels = format.i_original_channels |
+ AOUT_CHAN_DOLBYSTEREO;
+ }
+ else /* i_force_dolby == 2 */
+ {
+ format.i_original_channels = format.i_original_channels &
+ ~AOUT_CHAN_DOLBYSTEREO;
+ }
+ }
+
p_sys->p_aout_input =
- aout_DecNew( p_dec, &p_sys->p_aout, &p_sys->audio );
+ aout_DecNew( p_dec, &p_sys->p_aout, &format );
if( p_sys->p_aout_input == NULL )
{
msg_Err( p_dec, "failed to create audio output" );
return NULL;
}
+ if( !p_dec->fmt_out.video.i_visible_width ||
+ !p_dec->fmt_out.video.i_visible_height )
+ {
+ p_dec->fmt_out.video.i_visible_width =
+ p_dec->fmt_out.video.i_width;
+ p_dec->fmt_out.video.i_visible_height =
+ p_dec->fmt_out.video.i_height;
+ }
+
+ if( p_dec->fmt_out.video.i_visible_height == 1088 &&
+ var_CreateGetBool( p_dec, "hdtv-fix" ) )
+ {
+ p_dec->fmt_out.video.i_visible_height = 1080;
+ p_dec->fmt_out.video.i_sar_num *= 135;
+ p_dec->fmt_out.video.i_sar_den *= 136;
+ msg_Warn( p_dec, "Fixing broken HDTV stream (display_height=1088)");
+ }
+
if( !p_dec->fmt_out.video.i_sar_num ||
!p_dec->fmt_out.video.i_sar_den )
{
- p_dec->fmt_out.video.i_sar_num =
- p_dec->fmt_out.video.i_aspect * p_dec->fmt_out.video.i_height;
+ p_dec->fmt_out.video.i_sar_num = p_dec->fmt_out.video.i_aspect *
+ p_dec->fmt_out.video.i_visible_height;
p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
- p_dec->fmt_out.video.i_width;
+ p_dec->fmt_out.video.i_visible_width;
}
- vlc_reduce( &p_dec->fmt_out.video.i_sar_num,
- &p_dec->fmt_out.video.i_sar_den,
- p_dec->fmt_out.video.i_sar_num,
- p_dec->fmt_out.video.i_sar_den, 0 );
-
- if( !p_dec->fmt_out.video.i_visible_width ||
- !p_dec->fmt_out.video.i_visible_height )
- {
- p_dec->fmt_out.video.i_visible_width =
- p_dec->fmt_out.video.i_width;
- p_dec->fmt_out.video.i_visible_height =
- p_dec->fmt_out.video.i_height;
- }
+ vlc_ureduce( &p_dec->fmt_out.video.i_sar_num,
+ &p_dec->fmt_out.video.i_sar_den,
+ p_dec->fmt_out.video.i_sar_num,
+ p_dec->fmt_out.video.i_sar_den, 50000 );
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
p_sys->video = p_dec->fmt_out.video;
static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
{
- spu_DestroySubpicture( p_dec->p_owner->p_vout->p_spu, p_subpic );
+ decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
+ vout_thread_t *p_vout = NULL;
+
+ p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( !p_vout || p_sys->p_spu_vout != p_vout )
+ {
+ if( p_vout )
+ vlc_object_release( p_vout );
+ msg_Warn( p_dec, "no vout found, leaking subpicture" );
+ return;
+ }
+
+ spu_DestroySubpicture( p_vout->p_spu, p_subpic );
+
+ vlc_object_release( p_vout );
}
+
projects / vlc / blobdiff