#include <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/vout.h>
-#include <vlc/input.h>
-
-#include "stream_output.h"
+#include <vlc_block.h>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
+#include <vlc_sout.h>
+#include <vlc_codec.h>
+#include <vlc_osd.h>
+
+#include <vlc_interface.h>
+#include "audio_output/aout_internal.h"
+#include "stream_output/stream_output.h"
#include "input_internal.h"
static decoder_t * CreateDecoder( input_thread_t *, es_format_t *, int );
static subpicture_t *spu_new_buffer( decoder_t * );
static void spu_del_buffer( decoder_t *, subpicture_t * );
-static es_format_t null_es_format = {0};
+static es_format_t null_es_format;
struct decoder_owner_sys_t
{
vlc_value_t val;
/* If we are in sout mode, search for packetizer module */
- if( p_input->p_sout && !b_force_decoder )
+ if( p_input->p->p_sout && !b_force_decoder )
{
/* Create the decoder configuration structure */
p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_PACKETIZER );
if( p_dec == NULL )
{
msg_Err( p_input, "could not create packetizer" );
+ intf_UserFatal( p_input, VLC_FALSE, _("Streaming / Transcoding failed"),
+ _("VLC could not open the packetizer module.") );
return NULL;
}
}
if( p_dec == NULL )
{
msg_Err( p_input, "could not create decoder" );
+ intf_UserFatal( p_input, VLC_FALSE, _("Streaming / Transcoding failed"),
+ _("VLC could not open the decoder module.") );
return NULL;
}
}
msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
"VLC probably does not support this sound or video format.",
(char*)&p_dec->fmt_in.i_codec );
+ intf_UserFatal( p_dec, VLC_FALSE, _("No suitable decoder module "
+ "for format"), _("VLC probably does not support the \"%4.4s\" "
+ "audio or video format. Unfortunately there is no way for you "
+ "to fix this."), (char*)&p_dec->fmt_in.i_codec );
DeleteDecoder( p_dec );
vlc_object_destroy( p_dec );
return NULL;
}
- if( p_input->p_sout && p_input->input.b_can_pace_control &&
+ if( p_input->p->p_sout && p_input->p->input.b_can_pace_control &&
!b_force_decoder )
{
msg_Dbg( p_input, "stream out mode -> no decoder thread" );
{
if( p_dec->p_owner->b_own_thread )
{
- if( p_dec->p_owner->p_input->b_out_pace_control )
+ if( p_dec->p_owner->p_input->p->b_out_pace_control )
{
/* FIXME !!!!! */
while( !p_dec->b_die && !p_dec->b_error &&
/* FIXME: ideally we would check the time amount of data
* in the fifo instead of its size. */
msg_Warn( p_dec, "decoder/packetizer fifo full (data not "
- "consummed quickly enough), resetting fifo!" );
+ "consumed quickly enough), resetting fifo!" );
block_FifoEmpty( p_dec->p_owner->p_fifo );
}
#if 0
unsigned int i_es, i;
- for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
+ for( i_es = 0; i_es < p_input->p->stream.i_selected_es_number; i_es++ )
{
- es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
+ es_descriptor_t * p_es = p_input->p->stream.pp_selected_es[i_es];
if( p_es->p_dec != NULL )
{
#if 0
unsigned int i_es, i;
- for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
+ for( i_es = 0; i_es < p_input->p->stream.i_selected_es_number; i_es++ )
{
- es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
+ es_descriptor_t * p_es = p_input->p->stream.pp_selected_es[i_es];
if( p_es->p_dec != NULL && p_es->i_cat == AUDIO_ES )
{
/* Initialize the decoder fifo */
p_dec->p_module = NULL;
-
+ memset( &null_es_format, 0, sizeof(es_format_t) );
es_format_Copy( &p_dec->fmt_in, fmt );
es_format_Copy( &p_dec->fmt_out, &null_es_format );
p_dec->p_owner->p_vout = NULL;
p_dec->p_owner->p_spu_vout = NULL;
p_dec->p_owner->i_spu_channel = 0;
- p_dec->p_owner->p_sout = p_input->p_sout;
+ p_dec->p_owner->p_sout = p_input->p->p_sout;
p_dec->p_owner->p_sout_input = NULL;
p_dec->p_owner->p_packetizer = NULL;
vlc_object_attach( p_dec, p_input );
- stats_Create( p_dec->p_parent, "decoded_audio", STATS_DECODED_AUDIO,
- VLC_VAR_INTEGER, STATS_COUNTER );
- stats_Create( p_dec->p_parent, "decoded_video", STATS_DECODED_VIDEO,
- VLC_VAR_INTEGER, STATS_COUNTER );
- stats_Create( p_dec->p_parent, "decoded_sub", STATS_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 );
/* For now it's enough, as only sout inpact on this flag */
if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 &&
- p_dec->p_owner->p_input->b_out_pace_control )
+ p_dec->p_owner->p_input->p->b_out_pace_control )
{
- msg_Dbg( p_dec, "switching to synch mode" );
- p_dec->p_owner->p_input->b_out_pace_control = VLC_FALSE;
+ msg_Dbg( p_dec, "switching to sync mode" );
+ p_dec->p_owner->p_input->p->b_out_pace_control = VLC_FALSE;
}
else if( p_dec->p_owner->p_sout->i_out_pace_nocontrol <= 0 &&
- !p_dec->p_owner->p_input->b_out_pace_control )
+ !p_dec->p_owner->p_input->p->b_out_pace_control )
{
- msg_Dbg( p_dec, "switching to asynch mode" );
- p_dec->p_owner->p_input->b_out_pace_control = VLC_TRUE;
+ msg_Dbg( p_dec, "switching to async mode" );
+ p_dec->p_owner->p_input->p->b_out_pace_control = VLC_TRUE;
}
}
}
while( (p_aout_buf = p_dec->pf_decode_audio( p_dec,
&p_packetized_block )) )
{
- stats_UpdateInteger( p_dec->p_parent,
- STATS_DECODED_AUDIO, 1, NULL );
- /* FIXME the best would be to handle the case start_date < preroll < end_date
+ input_thread_t *p_i =(input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->p->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->p->counters.p_decoded_audio, 1, NULL );
+ vlc_mutex_unlock( &p_i->p->counters.counters_lock );
+
+ /* 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 &&
p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
}
else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
{
- stats_UpdateInteger( p_dec->p_parent, STATS_DECODED_AUDIO, 1, NULL );
+ input_thread_t *p_i = (input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->p->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->p->counters.p_decoded_audio, 1, NULL );
+ vlc_mutex_unlock( &p_i->p->counters.counters_lock );
+
if( p_dec->p_owner->i_preroll_end > 0 &&
p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
{
while( (p_pic = p_dec->pf_decode_video( p_dec,
&p_packetized_block )) )
{
- stats_UpdateInteger( p_dec->p_parent, STATS_DECODED_VIDEO,
- 1, NULL );
+ input_thread_t *p_i =(input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->p->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->p->counters.p_decoded_video, 1, NULL );
+ vlc_mutex_unlock( &p_i->p->counters.counters_lock );
+
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, STATS_DECODED_VIDEO, 1 , NULL);
+ input_thread_t *p_i = (input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->p->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->p->counters.p_decoded_video, 1, NULL );
+ vlc_mutex_unlock( &p_i->p->counters.counters_lock );
+
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, STATS_DECODED_SUB, 1 , NULL);
+ input_thread_t *p_i = (input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->p->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->p->counters.p_decoded_sub, 1, NULL );
+ vlc_mutex_unlock( &p_i->p->counters.counters_lock );
+
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_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_in.video.i_visible_width &&
+ p_dec->fmt_in.video.i_visible_height )
+ {
+ p_dec->fmt_out.video.i_visible_width =
+ p_dec->fmt_in.video.i_visible_width;
+ p_dec->fmt_out.video.i_visible_height =
+ p_dec->fmt_in.video.i_visible_height;
+ }
+ else
+ {
+ 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 &&
projects / vlc / blobdiff