*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/decoder.h>
#include <vlc/vout.h>
#include <vlc/input.h>
+#include <vlc_interaction.h>
#include "stream_output.h"
#include "input_internal.h"
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 );
/* 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 );
}
p_dec->pf_decode_sub = 0;
p_dec->pf_packetize = 0;
- /* Initialize the decoder fifo */
+ /* Initialize the decoder fifo */
p_dec->p_module = NULL;
if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 &&
p_dec->p_owner->p_input->b_out_pace_control )
{
- msg_Dbg( p_dec, "switching to synch mode" );
+ msg_Dbg( p_dec, "switching to sync mode" );
p_dec->p_owner->p_input->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 )
{
- msg_Dbg( p_dec, "switching to asynch mode" );
+ msg_Dbg( p_dec, "switching to async mode" );
p_dec->p_owner->p_input->b_out_pace_control = VLC_TRUE;
}
}
while( (p_aout_buf = p_dec->pf_decode_audio( p_dec,
&p_packetized_block )) )
{
- /* 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->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->counters.p_decoded_audio, 1, NULL );
+ vlc_mutex_unlock( &p_i->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 )) )
{
+ input_thread_t *p_i = (input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->counters.p_decoded_audio, 1, NULL );
+ vlc_mutex_unlock( &p_i->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 )) )
{
+ input_thread_t *p_i =(input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->counters.p_decoded_video, 1, NULL );
+ vlc_mutex_unlock( &p_i->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 )) )
{
+ input_thread_t *p_i = (input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->counters.p_decoded_video, 1, NULL );
+ vlc_mutex_unlock( &p_i->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 ) ) )
{
+ input_thread_t *p_i = (input_thread_t*)(p_dec->p_parent);
+ vlc_mutex_lock( &p_i->counters.counters_lock );
+ stats_UpdateInteger( p_dec,
+ p_i->counters.p_decoded_sub, 1, NULL );
+ vlc_mutex_unlock( &p_i->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 ) )
return NULL;
}
+ if( !p_dec->fmt_out.video.i_visible_width ||
+ !p_dec->fmt_out.video.i_visible_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 &&
+ 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_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, 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;
- }
+ 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;
projects / vlc / blobdiff