Changeset e7d9e5601fe3603405749091d0eef49630ac7ee8

Timestamp:

21/10/07 01:22:48 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1192922568 +0000

git-parent:

[9b62d7452507c8cbdd6c83fb137da9b6a0e3016d]

git-author:

Laurent Aimar <fenrir@videolan.org> 1192922568 +0000

Message:

Added sout_UpdateStatistic and fixed transcode module to use it.
As a side effect, it fixed a potential segfault (race condition) when using

sout-keep (but I am not sure if we have a stream_out module that can show the
problem)

sout_UpdateStatistic still uses input internal data and that need to

be fixed. Audio output need such a clean too.

Files:

• include/vlc_sout.h (modified) (1 diff)
• modules/stream_out/transcode.c (modified) (7 diffs)
• src/stream_output/stream_output.c (modified) (2 diffs)

include/vlc_sout.h

@@ -58 +58 @@
-    sout_instance_sys_t *p_sys;
-};
+
+/** Stream output statistics */
+typedef enum
+{
+    SOUT_STATISTIC_DECODED_VIDEO,
+    SOUT_STATISTIC_DECODED_AUDIO,
+    SOUT_STATISTIC_DECODED_SUBTITLE,
+
+    /* Use them only if you do not goes through a access_out module */
+    SOUT_STATISTIC_SENT_PACKET,
+    SOUT_STATISTIC_SENT_BYTE,
+
+} sout_statistic_t;
+
+VLC_EXPORT( void, sout_UpdateStatistic, ( sout_instance_t *p_sout, sout_statistic_t, int ) );
-
-/****************************************************************************

modules/stream_out/transcode.c

@@ -40 +40 @@
-
-#define MASTER_SYNC_MAX_DRIFT 100000
-
-/* FIXME Ugly, needed for (disabled) stats updates  */
-#if 0
-#include "../../src/input/input_internal.h"
-#endif
-
-/*****************************************************************************
@@ -1320 +1315 @@
-    id->p_decoder->fmt_out.i_extra = 0;
-    id->p_decoder->fmt_out.p_extra = 0;
-0
+NULL
-    id->p_decoder->pf_aout_buffer_new = audio_new_buffer;
-    id->p_decoder->pf_aout_buffer_del = audio_del_buffer;
@@ -1552 +1547 @@
-    int i;
-    *out = NULL;
-    input_thread_t *p_input = NULL;
-
-    if( p_stream->p_parent->p_parent && p_stream->p_parent->p_parent->
-                                i_object_type == VLC_OBJECT_INPUT )
-        p_input = (input_thread_t *)p_stream->p_parent->p_parent;
-
-    while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
-                                                          &in )) )
-    {
-
-
-
-
-
-
+
-        if( p_sys->b_master_sync )
-        {
@@ -1684 +1669 @@
-    id->p_decoder->fmt_out.i_extra = 0;
-    id->p_decoder->fmt_out.p_extra = 0;
-
+
+
-    id->p_decoder->pf_get_cc = 0;
-    id->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
@@ -2156 +2142 @@
-    picture_t *p_pic, *p_pic2 = NULL;
-    *out = NULL;
-    input_thread_t *p_input = NULL;
-
-    if( p_stream->p_parent->p_parent && p_stream->p_parent->p_parent->
-                                i_object_type == VLC_OBJECT_INPUT )
-        p_input = (input_thread_t *)p_stream->p_parent->p_parent;
-
-    while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
-    {
-        subpicture_t *p_subpic = NULL;
-
-
-
-
-
-
+
+
-
-        if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
@@ -2709 +2686 @@
-
-    /* Initialization of decoder structures */
+    id->p_decoder->pf_decode_sub = NULL;
-    id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
-    id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
@@ -2772 +2750 @@
-
-    p_subpic = id->p_decoder->pf_decode_sub( id->p_decoder, &in );
-
+
+
+
+
-
-    if( p_sys->b_master_sync && p_sys->i_master_drift )

src/stream_output/stream_output.c

@@ -149 +149 @@
-
-/*****************************************************************************
+ * 
+ *****************************************************************************/
+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( !p_sout->p_libvlc->b_stats )
+        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 )
+        return;
+
+    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);
+        break;
+    case SOUT_STATISTIC_DECODED_AUDIO:
+        I(p_decoded_audio);
+        break;
+    case SOUT_STATISTIC_DECODED_SUBTITLE:
+        I(p_decoded_sub);
+        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);
+        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 );
+        break;
+
+    default:
+        msg_Err( p_sout, "Invalid statistic type %d (internal error)", i_type );
+        break;
+    }
+    vlc_object_release( p_input );
+}
+/*****************************************************************************
- * Packetizer/Input
- *****************************************************************************/
@@ -324 +377 @@
-int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
-{
-int i_total = 
+const int i_packets_gather = 3
-    p_access->i_writes++;
-    p_access->i_sent_bytes += p_buffer->i_buffer;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-    return p_access->pf_write( p_access, p_buffer );