Changeset 211100f4853aa5cfcc8a735355e0971fe84596c1

Timestamp:

15/05/04 16:42:16 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[62b379567e145f0ae9eb6204fc86cdbbb11faeb6]

git-author:

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

Message:

• all: improved perfs (using block_ChainLastAppend).
  

Files:

• include/vlc_block.h (modified) (1 diff)
• modules/demux/ts.c (modified) (9 diffs)
• modules/packetizer/mpegvideo.c (modified) (7 diffs)
• src/misc/block.c (modified) (2 diffs)

include/vlc_block.h

@@ -113 +113 @@
-}
-VLC_EXPORT( void,       block_ChainAppend,  ( block_t **, block_t * ) );
+VLC_EXPORT( void,       block_ChainLastAppend,  ( block_t ***ppp_last, block_t * ) );
-VLC_EXPORT( void,       block_ChainRelease, ( block_t * ) );
-VLC_EXPORT( int,        block_ChainExtract, ( block_t *, void *, int ) );

modules/demux/ts.c

@@ -187 +187 @@
-    es_out_id_t *id;
-    block_t     *p_pes;
+    block_t     **pp_last;
-
-    es_mpeg4_descriptor_t *p_mpeg4desc;
+    int         b_gather;
-} ts_es_t;
-
@@ -791 +793 @@
-        pid->es->id      = NULL;
-        pid->es->p_pes   = NULL;
+        pid->es->pp_last = &pid->es->p_pes;
-        pid->es->p_mpeg4desc = NULL;
+        pid->es->b_gather = VLC_FALSE;
-    }
-}
@@ -858 +862 @@
-    /* remove the pes from pid */
-    pid->es->p_pes = NULL;
+    pid->es->pp_last = &pid->es->p_pes;
-
-    /* FIXME find real max size */
@@ -1004 +1009 @@
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        for( i = 0; i < pid->i_extra_es; i++ )
@@ -1155 +1167 @@
-            }
-
-pid->es->p_pes = p_bk
+block_ChainLastAppend( &pid->es->pp_last, p_bk )
-        }
-        else
@@ -1168 +1180 @@
-                /* TODO check if when have gathered enough packets to form a
-                 * PES (ie read PES size)*/
-Append( &pid->es->p_pes
+LastAppend( &pid->es->pp_last
-            }
-        }
@@ -1197 +1209 @@
-        case 0x10:  /* MPEG4 (video) */
-            es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
+            pid->es->b_gather = VLC_TRUE;
-            break;
-        case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
@@ -1231 +1244 @@
-            break;
-
+        case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
+            es_format_Init( fmt, UNKNOWN_ES, 0 );
+            pid->es->b_gather = VLC_TRUE;
+            break;
+
-        case 0x06:  /* PES_PRIVATE  (fixed later) */
-        case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
-        default:
-            es_format_Init( fmt, UNKNOWN_ES, 0 );
@@ -1850 +1867 @@
-                        p_es->id = NULL;
-                        p_es->p_pes = NULL;
+                        p_es->pp_last = &p_es->p_pes;
-                        p_es->p_mpeg4desc = NULL;
-

modules/packetizer/mpegvideo.c

@@ -83 +83 @@
-    /* Current frame being built */
-    block_t    *p_frame;
+    block_t    **pp_last;
+
-    vlc_bool_t b_frame_slice;
-    mtime_t i_pts;
@@ -148 +150 @@
-    p_sys->p_ext = NULL;
-    p_sys->p_frame = NULL;
+    p_sys->pp_last = &p_sys->p_frame;
-    p_sys->b_frame_slice = VLC_FALSE;
-
@@ -217 +220 @@
-        if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
-        p_sys->p_frame = NULL;
+        p_sys->pp_last = &p_sys->p_frame;
-        p_sys->b_frame_slice = VLC_FALSE;
-        block_Release( *pp_block );
@@ -333 +337 @@
-        if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
-        p_sys->p_frame = NULL;
+        p_sys->pp_last = &p_sys->p_frame;
-        p_sys->b_frame_slice = VLC_FALSE;
-
@@ -441 +446 @@
-        /* Reset context */
-        p_sys->p_frame = NULL;
+        p_sys->pp_last = &p_sys->p_frame;
-        p_sys->b_frame_slice = VLC_FALSE;
-    }
@@ -454 +460 @@
-        {
-            /* Usefull for mpeg1: repeat sequence header every second */
-
-
+
-            if( p_sys->p_ext )
-            {
-
-
+
-            }
-
@@ -573 +577 @@
-
-    /* Append the block */
-Append( &p_sys->p_frame
+LastAppend( &p_sys->pp_last
-
-    return p_pic;

src/misc/block.c

@@ -240 +240 @@
-void block_ChainAppend( block_t **pp_list, block_t *p_block )
-{
-
-    if( *pp_list == NULL )
-    {
@@ -255 +254 @@
-        p->p_next = p_block;
-    }
+}
+
+void block_ChainLastAppend( block_t ***ppp_last, block_t *p_block  )
+{
+    block_t *p_last = p_block;
+
+    /* Append the block */
+    **ppp_last = p_block;
+
+    /* Update last pointer */
+    while( p_last->p_next ) p_last = p_last->p_next;
+    *ppp_last = &p_last->p_next;
-}
-