* "synch" -> "sync" (gniihiihiimineeeeerveuh)

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index c078dbba5494d29fbcf595b74e4d2ed95d621fdf..f5c2e7c43fbf8738fb5d23c3a92218ccebd98fb1 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -32,6 +32,7 @@
 #include <vlc/decoder.h>
 #include <vlc/vout.h>
 #include <vlc/input.h>
+#include <vlc_interaction.h>
 
 #include "stream_output.h"
 #include "input_internal.h"
@@ -109,6 +110,8 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
         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;
         }
     }
@@ -119,6 +122,8 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
         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;
         }
     }
@@ -128,6 +133,10 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
         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 );
@@ -232,7 +241,7 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
             /* 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 );
         }
 
@@ -429,12 +438,6 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
 
     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 );
@@ -586,13 +589,13 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
             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;
             }
         }
@@ -627,8 +630,14 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
                     while( (p_aout_buf = p_dec->pf_decode_audio( p_dec,
                                                        &p_packetized_block )) )
                     {
-                        stats_UpdateInteger( p_dec->p_parent, "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->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 )
@@ -651,7 +660,12 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
         }
         else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
         {
-            stats_UpdateInteger( p_dec->p_parent, "decoded_audio", 1, NULL );
+            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 )
             {
@@ -697,8 +711,12 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
                     while( (p_pic = p_dec->pf_decode_video( p_dec,
                                                        &p_packetized_block )) )
                     {
-                        stats_UpdateInteger( p_dec->p_parent, "decoded_video",
-                                                             1, NULL );
+                        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 )
                         {
@@ -719,7 +737,12 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
         }
         else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
         {
-            stats_UpdateInteger( p_dec->p_parent, "decoded_video", 1 , NULL);
+            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 )
             {
@@ -739,7 +762,12 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
         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 , NULL);
+            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 ) )
@@ -932,25 +960,36 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
         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 &&
             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; 
+            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_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 *