[vlc-devel] commit: Moved statistic update from sout to input. (Laurent Aimar )
git version control
git at videolan.org
Sat Nov 22 16:38:02 CET 2008
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Nov 22 12:36:35 2008 +0100| [d20c8d6613bfcd2363edfe267bc8456f40fd30bd] | committer: Laurent Aimar
Moved statistic update from sout to input.
It allows to avoid the inclusion of input_internal.h
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d20c8d6613bfcd2363edfe267bc8456f40fd30bd
---
src/input/input.c | 39 +++++++++++++++++++++++++++++++
src/input/input_interface.h | 20 +++++++++++++++-
src/stream_output/stream_output.c | 46 +++++++++++++++---------------------
3 files changed, 77 insertions(+), 28 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index bb15c4a..ebe7d28 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -3155,6 +3155,45 @@ bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
}
/*****************************************************************************
+ * Statistics
+ *****************************************************************************/
+void input_UpdateStatistic( input_thread_t *p_input,
+ input_statistic_t i_type, int i_delta )
+{
+ assert( p_input->i_state != INIT_S );
+
+ vlc_mutex_lock( &p_input->p->counters.counters_lock);
+ switch( i_type )
+ {
+#define I(c) stats_UpdateInteger( p_input, p_input->p->counters.c, i_delta, NULL )
+ case INPUT_STATISTIC_DECODED_VIDEO:
+ I(p_decoded_video);
+ break;
+ case INPUT_STATISTIC_DECODED_AUDIO:
+ I(p_decoded_audio);
+ break;
+ case INPUT_STATISTIC_DECODED_SUBTITLE:
+ I(p_decoded_sub);
+ break;
+ case INPUT_STATISTIC_SENT_PACKET:
+ I(p_sout_sent_packets);
+ break;
+#undef I
+ case INPUT_STATISTIC_SENT_BYTE:
+ {
+ int i_bytes; /* That's pretty stupid to define it as an integer, it will overflow
+ really fast ... */
+ 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_input, "Invalid statistic type %d (internal error)", i_type );
+ break;
+ }
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock);
+}
+/*****************************************************************************
* input_get_event_manager
*****************************************************************************/
vlc_event_manager_t *input_get_event_manager( input_thread_t *p_input )
diff --git a/src/input/input_interface.h b/src/input/input_interface.h
index 4b30375..050ddc5 100644
--- a/src/input/input_interface.h
+++ b/src/input/input_interface.h
@@ -39,7 +39,7 @@ int input_DownloadAndCacheArt( playlist_t *, input_item_t * );
void input_item_SetPreparsed( input_item_t *p_i, bool b_preparsed );
-typedef struct playlist_album_t
+typedef struct
{
char *psz_artist;
char *psz_album;
@@ -61,4 +61,22 @@ input_thread_t *__input_CreateThreadExtended ( vlc_object_t *, input_item_t *, c
sout_instance_t * input_DetachSout( input_thread_t *p_input );
+/* */
+typedef enum
+{
+ INPUT_STATISTIC_DECODED_VIDEO,
+ INPUT_STATISTIC_DECODED_AUDIO,
+ INPUT_STATISTIC_DECODED_SUBTITLE,
+
+ /* Use them only if you do not goes through a access_out module */
+ INPUT_STATISTIC_SENT_PACKET,
+ INPUT_STATISTIC_SENT_BYTE,
+
+} input_statistic_t;
+/**
+ * It will update internal input statistics from external sources.
+ * XXX For now, the only one allowed to do it is stream_out and input core.
+ */
+void input_UpdateStatistic( input_thread_t *, input_statistic_t, int i_delta );
+
#endif
diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index add8efd..3f81d26 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -42,8 +42,9 @@
#include "stream_output.h"
#include <vlc_meta.h>
+#include <vlc_block.h>
-#include "input/input_internal.h"
+#include "input/input_interface.h"
#undef DEBUG_BUFFER
/*****************************************************************************
@@ -154,52 +155,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 );
}
/*****************************************************************************
More information about the vlc-devel
mailing list