Changeset 396d77133092ff6a127824ac3a669192e8a8b07d

Timestamp:

08/10/05 22:07:20 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1123704440 +0000

git-parent:

[af44196ee69a672807560c64b3a3359e8101ff17]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1123704440 +0000

Message:

Flagging BLOCK_FLAG_DISCONTINUITY for every PID in the input when the slider is moved on the GUI or a jump in the stream is made. It is also propagated to the mpegvideo packetizer. The packetizer has a new mode to sync on I-frame boundary after such a jump. It avoids sending some broken frames to the client. (Forward port of branches/0.8.1-jpsaman-thedj revision 11067 and 11842.)

Files:

• modules/demux/ts.c (modified) (8 diffs)
• modules/mux/mpeg/ts.c (modified) (7 diffs)
• modules/packetizer/mpegvideo.c (modified) (9 diffs)
• src/input/es_out.c (modified) (5 diffs)

modules/demux/ts.c

@@ -2 +2 @@
- * ts.c: Transport Stream input module for VLC.
- *****************************************************************************
-the VideoLAN team
+VideoLAN (Centrale Réseaux) and its contributors
- * $Id$
- *
@@ -1614 +1614 @@
-    const vlc_bool_t b_payload    = p[3]&0x10;
-    const int        i_cc         = p[3]&0x0f;   /* continuity counter */
+    vlc_bool_t       b_discontinuity = VLC_FALSE;/* discontinuity */    
-
-    /* transport_scrambling_control is ignored */
-
-    int         i_skip = 0;
-    vlc_bool_t  i_ret  = VLC_FALSE;
@@ -1661 +1661 @@
-                          "ignored", pid->i_pid );
-            }
+            /* discontinuity indicator found in stream */
+            b_discontinuity = p[5]&0x80 ? VLC_TRUE : VLC_FALSE;
+            if( p[5]&0x40 )
+                msg_Dbg( p_demux, "random access indicator (pid=%d) ", pid->i_pid );
-        }
-    }
@@ -1671 +1675 @@
-        *   test the content ?
-     */
-
-    i_diff = ( i_cc - pid->i_cc )&0x0f;
-    if( b_payload && i_diff == 1 )
@@ -1685 +1688 @@
-            pid->i_cc = i_cc;
-        }
-
+&& !b_discontinuity 
-        {
-            /* FIXME what to do when discontinuity_indicator is set ? */
@@ -1692 +1695 @@
-
-            pid->i_cc = i_cc;
-
-            if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES )
-            {
@@ -1758 +1760 @@
-        }
-    }
-
+
+
+
+
+
+
+
-    return i_ret;
-}
@@ -1950 +1958 @@
-    if( i_iod_tag != 0x02 )
-    {
+#ifdef DEBUG    
-        fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag );
+#endif        
-        return p_iod;
-    }

modules/mux/mpeg/ts.c

@@ -2 +2 @@
- * ts.c: MPEG-II TS Muxer
- *****************************************************************************
-, 2002 the VideoLAN team
+-2005 VideoLAN (Centrale Réseaux) and its contributors
- * $Id$
- *
@@ -271 +271 @@
-    int             i_stream_id;
-    int             i_continuity_counter;
+    vlc_bool_t      b_discontinuity;
-
-    /* to be used for carriege of DIV3 */
@@ -654 +655 @@
-    p_stream->i_codec = p_input->p_fmt->i_codec;
-    p_stream->i_continuity_counter    = 0;
+    p_stream->b_discontinuity         = VLC_FALSE;
-    p_stream->i_decoder_specific_info = 0;
-    p_stream->p_decoder_specific_info = NULL;
@@ -1569 +1571 @@
-
-    p_stream->i_continuity_counter = (p_stream->i_continuity_counter+1)%16;
+    p_stream->b_discontinuity = (p_pes->i_flags & BLOCK_FLAG_DISCONTINUITY);
-
-    if( b_adaptation_field )
@@ -1582 +1585 @@
-            p_ts->p_buffer[4] = 7 + i_stuffing;
-            p_ts->p_buffer[5] = 0x10;   /* flags */
+            if( p_stream->b_discontinuity )
+            {
+                p_ts->p_buffer[5] |= 0x80; /* flag TS dicontinuity */
+                p_stream->b_discontinuity = VLC_FALSE;
+            }            
-            p_ts->p_buffer[6] = ( 0 )&0xff;
-            p_ts->p_buffer[7] = ( 0 )&0xff;
@@ -1646 +1654 @@
-    return p_ts;
-}
-
-
-static void TSSetPCR( block_t *p_ts, mtime_t i_dts )
@@ -1801 +1808 @@
-            {
-                p_ts->p_buffer[5] = 0x00;
+                if( p_stream->b_discontinuity )
+                {
+                    p_ts->p_buffer[5] |= 0x80;
+                    p_stream->b_discontinuity = VLC_FALSE;
+                }
-                for( i = 6; i < 6 + i_stuffing - 2; i++ )
-                {

modules/packetizer/mpegvideo.c

@@ -2 +2 @@
- * mpegvideo.c: parse and packetize an MPEG1/2 video stream
- *****************************************************************************
-, 2002 the VideoLAN team
+-2005 VideoLAN (Centrale Réseaux) and its contributors
- * $Id$
- *
@@ -8 +8 @@
- *          Eric Petit <titer@videolan.org>
- *          Gildas Bazin <gbazin@videolan.org>
+ *          Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -49 +50 @@
-#include "vlc_block_helper.h"
-
+#define SYNC_INTRAFRAME_TEXT N_("Sync on intraframe")
+#define SYNC_INTRAFRAME_LONGTEXT N_("Normally the packetizer would " \
+    "sync on the next full frame. This flags instructs the packetizer " \
+    "to sync on the first intraframe found.")
+
-/*****************************************************************************
- * Module descriptor
@@ -61 +67 @@
-    set_capability( "packetizer", 50 );
-    set_callbacks( Open, Close );
+
+    add_bool( "packetizer-mpegvideo-sync-iframe", 1, NULL, SYNC_INTRAFRAME_TEXT,
+              SYNC_INTRAFRAME_LONGTEXT, VLC_TRUE );
-vlc_module_end();
-
@@ -113 +122 @@
-    /* Number of pictures since last sequence header */
-    int i_seq_old;
-
+
+
+
+
-};
-
@@ -175 +187 @@
-    p_sys->i_last_ref_pts = 0;
-
+    p_sys->b_discontinuity = VLC_FALSE;
+    p_sys->b_sync_on_intra_frame = var_CreateGetBool( p_dec, "packetizer-mpegvideo-sync-iframe" );
+    if( p_sys->b_sync_on_intra_frame )
+        msg_Dbg( p_dec, "syncing happens on intraframe now." );
+        
-    return VLC_SUCCESS;
-}
@@ -200 +217 @@
-        block_ChainRelease( p_sys->p_frame );
-    }
+    
+    var_Destroy( p_dec, "packetizer-mpegvideo-sync-iframe" );
-
-    free( p_sys );
@@ -220 +239 @@
-    {
-        p_sys->i_state = STATE_NOSYNC;
-
+
+
+
-        p_sys->p_frame = NULL;
-        p_sys->pp_last = &p_sys->p_frame;
@@ -295 +316 @@
-            }
-
+            /* If a discontinuity has been encountered, then wait till
+             * the next Intra frame before continuing with packetizing */
+            if( p_sys->b_discontinuity &&
+                p_sys->b_sync_on_intra_frame )
+            {
+                if( p_pic->i_flags & BLOCK_FLAG_TYPE_I )
+                {
+                    msg_Dbg( p_dec, "synced on Intra frame" );
+                    p_sys->b_discontinuity = VLC_FALSE;
+                    p_pic->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+                }
+                else
+                {
+                    p_sys->i_state = STATE_NOSYNC;
+                    break;
+                }
+            }
+            
-            /* We've just started the stream, wait for the first PTS.
-             * We discard here so we can still get the sequence header. */

src/input/es_out.c

@@ -6 +6 @@
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -64 +65 @@
-    es_out_pgrm_t *p_pgrm;
-
-
+
+
+
+
-    int64_t i_preroll_end;
-
@@ -277 +281 @@
-    {
-        es_out_id_t *es = p_sys->es[i];
-
+
+
-        /* Send a dummy block to let decoder know that
-         * there is a discontinuity */
@@ -670 +675 @@
-    es_format_Copy( &es->fmt, fmt );
-    es->i_preroll_end = -1;
+    es->b_discontinuity = VLC_FALSE;
-
-    switch( fmt->i_cat )
@@ -1032 +1038 @@
-
-    p_block->i_rate = p_input->i_rate;
+    if( es->b_discontinuity )
+    {
+        p_block->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+        es->b_discontinuity = VLC_FALSE;
+    }
-
-    /* TODO handle mute */