Do not crash if sout access is not specified - fixes #2665

[vlc] / src / stream_output / stream_output.c

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index add8efd8014dad8bdd646bec0493f4e5f6107092..2726a3510ce32cc54e2af8e92abaa240c84f9e24 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -42,8 +42,10 @@
 #include "stream_output.h"
 
 #include <vlc_meta.h>
+#include <vlc_block.h>
+#include <vlc_codec.h>
 
-#include "input/input_internal.h"
+#include "input/input_interface.h"
 
 #undef DEBUG_BUFFER
 /*****************************************************************************
@@ -154,52 +156,43 @@ void sout_DeleteInstance( sout_instance_t * p_sout )
  *****************************************************************************/
 void sout_UpdateStatistic( sout_instance_t *p_sout, sout_statistic_t i_type, int i_delta )
 {
-    input_thread_t *p_input;
-    int i_bytes; /* That's pretty stupid to define it as an integer, it will overflow
-                    really fast ... */
-
-    if( !libvlc_stats (p_sout) )
+    if( !libvlc_stats( p_sout ) )
         return;
 
-    /* FIXME that's ugly
-     * TODO add a private (ie not VLC_EXPORTed) input_UpdateStatistic for that */
-    p_input = vlc_object_find( p_sout, VLC_OBJECT_INPUT, FIND_PARENT );
-    if( !p_input || p_input->i_state == INIT_S || p_input->i_state == ERROR_S )
+    /* */
+    input_thread_t *p_input = vlc_object_find( p_sout, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( !p_input )
         return;
 
+    int i_input_type;
     switch( i_type )
     {
-#define I(c) stats_UpdateInteger( p_input, p_input->p->counters.c, i_delta, NULL )
     case SOUT_STATISTIC_DECODED_VIDEO:
-        I(p_decoded_video);
+        i_input_type = SOUT_STATISTIC_DECODED_VIDEO;
         break;
     case SOUT_STATISTIC_DECODED_AUDIO:
-        I(p_decoded_audio);
+        i_input_type = SOUT_STATISTIC_DECODED_AUDIO;
         break;
     case SOUT_STATISTIC_DECODED_SUBTITLE:
-        I(p_decoded_sub);
+        i_input_type = SOUT_STATISTIC_DECODED_SUBTITLE;
         break;
-#if 0
-    case SOUT_STATISTIC_ENCODED_VIDEO:
-    case SOUT_STATISTIC_ENCODED_AUDIO:
-    case SOUT_STATISTIC_ENCODED_SUBTITLE:
-        msg_Warn( p_sout, "Not yet supported statistic type %d", i_type );
-        break;
-#endif
 
     case SOUT_STATISTIC_SENT_PACKET:
-        I(p_sout_sent_packets);
+        i_input_type = SOUT_STATISTIC_SENT_PACKET;
         break;
-#undef I
+
     case SOUT_STATISTIC_SENT_BYTE:
-        if( !stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_bytes, i_delta, &i_bytes ) )
-            stats_UpdateFloat( p_input, p_input->p->counters.p_sout_send_bitrate, i_bytes, NULL );
+        i_input_type = SOUT_STATISTIC_SENT_BYTE;
         break;
 
     default:
-        msg_Err( p_sout, "Invalid statistic type %d (internal error)", i_type );
-        break;
+        msg_Err( p_sout, "Not yet supported statistic type %d", i_type );
+        vlc_object_release( p_input );
+        return;
     }
+
+    input_UpdateStatistic( p_input, i_input_type, i_delta );
+
     vlc_object_release( p_input );
 }
 /*****************************************************************************
@@ -307,6 +300,8 @@ sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout,
     psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg,
                                    psz_access );
     free( psz_next );
+    if( !p_access->psz_access )
+        p_access->psz_access = strdup( "" );
     p_access->psz_path   = strdup( psz_name ? psz_name : "" );
     p_access->p_sys      = NULL;
     p_access->pf_seek    = NULL;
@@ -882,3 +877,11 @@ rtp:
     mrl_Clean( &mrl );
     return psz_chain;
 }
+
+#undef sout_EncoderCreate
+encoder_t *sout_EncoderCreate( vlc_object_t *p_this )
+{
+    static const char type[] = "encoder";
+    return vlc_custom_create( p_this, sizeof( encoder_t ), VLC_OBJECT_GENERIC,
+                              type );
+}