* browsed through all code files starting with A to F and added non-blocking intf_Use...

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index f7694c5b046f9d517fc76e9739c286b5e581a7a5..1fe7b04316164b423bc87ef3d49444a04315fc93 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -20,7 +20,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -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 FOURCC \"4.4s\" found"), _("VLC probably does not support this "
+            "audio or video format. Regrettably, there is no way for you to "
+            "fix this.") );
 
         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 );
         }
 
@@ -384,7 +393,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
     p_dec->pf_decode_sub = 0;
     p_dec->pf_packetize = 0;
 
-    /* Initialize the decoder fifo */
+   /* Initialize the decoder fifo */
     p_dec->p_module = NULL;
 
 
@@ -621,7 +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 )) )
                     {
-                        /* 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 )
@@ -644,6 +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 )) )
         {
+            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 )
             {
@@ -689,6 +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 )) )
                     {
+                        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 )
                         {
@@ -709,6 +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 )) )
         {
+            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 )
             {
@@ -728,6 +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 ) ) )
         {
+            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 ) )
@@ -920,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_num /= 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 *