Changeset 7c359c66acbc65bede22e11bf6e8a510fbac5fc7

Timestamp:

05/23/08 23:59:16 (4 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1211579956 +0200

git-parent:

[8fe54e490872687b20e52581d84a94ffa7f443b0]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1211575664 +0200

Message:

transcode: Measure the time taken to encode one audio or video frame.

Files:

• include/vlc_messages.h (modified) (1 diff)
• modules/stream_out/transcode.c (modified) (6 diffs)

include/vlc_messages.h

@@ -178 +178 @@
-    STATS_TIMER_INPUT_LAUNCHING,
-    STATS_TIMER_MODULE_NEED,
+    STATS_TIMER_VIDEO_FRAME_ENCODING,
+    STATS_TIMER_AUDIO_FRAME_ENCODING,
-
-    STATS_TIMER_SKINS_PLAYTREE_IMAGE,

modules/stream_out/transcode.c

@@ -1223 +1223 @@
-
-/****************************************************************************
+ * decoder helper
+ ****************************************************************************/
+static inline void video_timer_start( encoder_t * p_encoder )
+{
+    stats_TimerStart( p_encoder, "encoding video frame",
+                      STATS_TIMER_VIDEO_FRAME_ENCODING );
+}
+
+static inline void video_timer_stop( encoder_t * p_encoder )
+{
+    stats_TimerStop( p_encoder, STATS_TIMER_VIDEO_FRAME_ENCODING );
+}
+
+static inline void video_timer_close( encoder_t * p_encoder )
+{
+    stats_TimerDump(  p_encoder, STATS_TIMER_VIDEO_FRAME_ENCODING );
+    stats_TimerClean( p_encoder, STATS_TIMER_VIDEO_FRAME_ENCODING );
+}
+
+static inline void audio_timer_start( encoder_t * p_encoder )
+{
+    stats_TimerStart( p_encoder, "encoding audio frame",
+                      STATS_TIMER_AUDIO_FRAME_ENCODING );
+}
+
+static inline void audio_timer_stop( encoder_t * p_encoder )
+{
+    stats_TimerStop( p_encoder, STATS_TIMER_AUDIO_FRAME_ENCODING );
+}
+
+static inline void audio_timer_close( encoder_t * p_encoder )
+{
+    stats_TimerDump(  p_encoder, STATS_TIMER_AUDIO_FRAME_ENCODING );
+    stats_TimerClean( p_encoder, STATS_TIMER_AUDIO_FRAME_ENCODING );
+}
+
+/****************************************************************************
- * decoder reencoder part
- ****************************************************************************/
+
-static int audio_BitsPerSample( vlc_fourcc_t i_format )
-{
@@ -1501 +1539 @@
-    int i;
-
+    audio_timer_close( id->p_encoder );
+
-    /* Close decoder */
-    if( id->p_decoder->p_module )
@@ -1593 +1633 @@
-        p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
-
+        audio_timer_start( id->p_encoder );
-        p_block = id->p_encoder->pf_encode_audio( id->p_encoder, p_audio_buf );
+        audio_timer_stop( id->p_encoder );
+
-        block_ChainAppend( out, p_block );
-        block_Release( p_audio_block );
@@ -2146 +2189 @@
-        vlc_cond_destroy( &p_stream->p_sys->cond );
-    }
+
+    video_timer_close( id->p_encoder );
-
-    /* Close decoder */
@@ -2456 +2501 @@
-        {
-            block_t *p_block;
+
+            video_timer_start( id->p_encoder );
-            p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
+            video_timer_stop( id->p_encoder );
+
-            block_ChainAppend( out, p_block );
-        }
@@ -2553 +2602 @@
-        vlc_mutex_unlock( &p_sys->lock_out );
-
+        video_timer_start( id->p_encoder );
-        p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
+        video_timer_stop( id->p_encoder );
+
-        vlc_mutex_lock( &p_sys->lock_out );
-        block_ChainAppend( &p_sys->p_buffers, p_block );