X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fps.c;h=97dd218ff400b589a55a11054e0914a58b938920;hb=65abf030acb9d0e88b0e3e36666ab5d2c5b613db;hp=da61b1284db382cccade30f66011d77e39b46ad0;hpb=55e26be2db6bf444085c04c33abe291b6684fb0a;p=vlc

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index da61b1284d..97dd218ff4 100644
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -36,6 +36,11 @@
  *  - ...
  */
 
+#define TIME_TEXT N_("Trust MPEG timestamps")
+#define TIME_LONGTEXT N_("Normally we use the timestamps of the MPEG files " \
+    "to calculate position and duration. However sometimes this might not " \
+    "be usable. Disable this option to calculate from the bitrate instead." )
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -44,15 +49,18 @@ static int  OpenAlt( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("PS demuxer") );
+    set_description( _("MPEG-PS demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 1 );
     set_callbacks( Open, Close );
     add_shortcut( "ps" );
 
+    add_integer( "ps-trust-timestamps", VLC_TRUE, NULL, TIME_TEXT,
+                 TIME_LONGTEXT, VLC_TRUE );
+
     add_submodule();
-    set_description( _("PS demuxer") );
+    set_description( _("MPEG-PS demuxer") );
     set_capability( "demux2", 9 );
     set_callbacks( OpenAlt, Close );
 vlc_module_end();
@@ -68,8 +76,13 @@ struct demux_sys_t
 
     int64_t     i_scr;
     int         i_mux_rate;
+    int64_t     i_length;
+    int         i_time_track;
+    int64_t     i_current_pts;
 
     vlc_bool_t  b_lost_sync;
+    vlc_bool_t  b_have_pack;
+    vlc_bool_t  b_seekable;
 };
 
 static int Demux  ( demux_t *p_demux );
@@ -109,7 +122,15 @@ static int Open( vlc_object_t *p_this )
     /* Init p_sys */
     p_sys->i_mux_rate = 0;
     p_sys->i_scr      = -1;
+    p_sys->i_length   = -1;
+    p_sys->i_current_pts = (mtime_t) 0;
+    p_sys->i_time_track = -1;
+    
     p_sys->b_lost_sync = VLC_FALSE;
+    p_sys->b_have_pack = VLC_FALSE;
+    p_sys->b_seekable  = VLC_FALSE;
+
+    stream_Control( p_demux->s, STREAM_CAN_SEEK, &p_sys->b_seekable );
 
     ps_psm_init( &p_sys->psm );
     ps_track_init( p_sys->tk );
@@ -163,6 +184,96 @@ static void Close( vlc_object_t *p_this )
     free( p_sys );
 }
 
+static int Demux2( demux_t *p_demux, vlc_bool_t b_end )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    int i_ret, i_id;
+    uint32_t i_code;
+    block_t *p_pkt;
+
+    i_ret = ps_pkt_resynch( p_demux->s, &i_code );
+    if( i_ret < 0 )
+    {
+        return 0;
+    }
+    else if( i_ret == 0 )
+    {
+        if( !p_sys->b_lost_sync )
+            msg_Warn( p_demux, "garbage at input, trying to resync..." );
+
+        p_sys->b_lost_sync = VLC_TRUE;
+        return 1;
+    }
+
+    if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" );
+    p_sys->b_lost_sync = VLC_FALSE;
+
+    if( ( p_pkt = ps_pkt_read( p_demux->s, i_code ) ) == NULL )
+    {
+        return 0;
+    }
+    if( (i_id = ps_pkt_id( p_pkt )) >= 0xc0 )
+    {
+        ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)];
+        if( !ps_pkt_parse_pes( p_pkt, tk->i_skip ) )
+        {
+            if( b_end && p_pkt->i_pts > tk->i_last_pts )
+            {
+                tk->i_last_pts = p_pkt->i_pts;
+            }
+            else if ( tk->i_first_pts == -1 )
+            {
+                tk->i_first_pts = p_pkt->i_pts;
+            }
+        }
+    }
+    block_Release( p_pkt );
+    return 1;
+}
+
+static void FindLength( demux_t *p_demux )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    int64_t i_current_pos = -1, i_size = 0, i_end = 0;
+    int i;
+
+    if( !var_CreateGetInteger( p_demux, "ps-trust-timestamps" ) )
+        return;
+
+    if( p_sys->i_length == -1 ) /* First time */
+    {
+        p_sys->i_length = 0;
+        /* Check beginning */
+        i = 0;
+        i_current_pos = stream_Tell( p_demux->s );
+        while( !p_demux->b_die && i < 40 && Demux2( p_demux, VLC_FALSE ) > 0 ) i++;
+
+        /* Check end */
+        i_size = stream_Size( p_demux->s );
+        i_end = __MAX( 0, __MIN( 200000, i_size ) );
+        stream_Seek( p_demux->s, i_size - i_end );
+    
+        while( !p_demux->b_die && Demux2( p_demux, VLC_TRUE ) > 0 );
+        if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
+    }
+
+    for( i = 0; i < PS_TK_COUNT; i++ )
+    {
+        ps_track_t *tk = &p_sys->tk[i];
+        if( tk->i_first_pts >= 0 && tk->i_last_pts > 0 )
+            if( tk->i_last_pts > tk->i_first_pts )
+            {
+                int64_t i_length = (int64_t)tk->i_last_pts - tk->i_first_pts;
+                if( i_length > p_sys->i_length )
+                {
+                    p_sys->i_length = i_length;
+                    p_sys->i_time_track = i;
+                    msg_Dbg( p_demux, "we found a length of: %lld", p_sys->i_length );
+                }
+            }
+    }
+}
+
 /*****************************************************************************
  * Demux:
  *****************************************************************************/
@@ -190,6 +301,9 @@ static int Demux( demux_t *p_demux )
     if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" );
     p_sys->b_lost_sync = VLC_FALSE;
 
+    if( p_sys->i_length < 0 && p_sys->b_seekable )
+        FindLength( p_demux );
+
     if( ( p_pkt = ps_pkt_read( p_demux->s, i_code ) ) == NULL )
     {
         return 0;
@@ -204,6 +318,7 @@ static int Demux( demux_t *p_demux )
     case 0x1ba:
         if( !ps_pkt_parse_pack( p_pkt, &p_sys->i_scr, &i_mux_rate ) )
         {
+            if( !p_sys->b_have_pack ) p_sys->b_have_pack = VLC_TRUE;
             /* done later on to work around bad vcd/svcd streams */
             /* es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_scr ); */
             if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate;
@@ -239,6 +354,7 @@ static int Demux( demux_t *p_demux )
     default:
         if( (i_id = ps_pkt_id( p_pkt )) >= 0xc0 )
         {
+            vlc_bool_t b_new = VLC_FALSE;
             ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)];
 
             if( !tk->b_seen )
@@ -246,6 +362,7 @@ static int Demux( demux_t *p_demux )
                 if( !ps_track_fill( tk, &p_sys->psm, i_id ) )
                 {
                     tk->es = es_out_Add( p_demux->out, &tk->fmt );
+                    b_new = VLC_TRUE;
                 }
                 else
                 {
@@ -271,6 +388,18 @@ static int Demux( demux_t *p_demux )
             if( tk->b_seen && tk->es &&
                 !ps_pkt_parse_pes( p_pkt, tk->i_skip ) )
             {
+                if( !b_new && !p_sys->b_have_pack && tk->fmt.i_cat == AUDIO_ES && p_pkt->i_pts > 0 )
+                {
+                    /* A hack to sync the A/V on PES files. */
+                    msg_Dbg( p_demux, "force SCR: %lld", p_pkt->i_pts );
+                    es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts );
+                }
+
+                if( (int64_t)p_pkt->i_pts > p_sys->i_current_pts )
+                {
+                    p_sys->i_current_pts = (int64_t)p_pkt->i_pts;
+                }
+
                 es_out_Send( p_demux->out, tk->es, p_pkt );
             }
             else
@@ -315,13 +444,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         case DEMUX_SET_POSITION:
             f = (double) va_arg( args, double );
             i64 = stream_Size( p_demux->s );
-
+            p_sys->i_current_pts = 0;
             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 
             return stream_Seek( p_demux->s, (int64_t)(i64 * f) );
 
         case DEMUX_GET_TIME:
             pi64 = (int64_t*)va_arg( args, int64_t * );
+            if( p_sys->i_time_track >= 0 && p_sys->i_current_pts > 0 )
+            {
+                *pi64 = p_sys->i_current_pts - p_sys->tk[p_sys->i_time_track].i_first_pts;
+                return VLC_SUCCESS;
+            }
             if( p_sys->i_mux_rate > 0 )
             {
                 *pi64 = (int64_t)1000000 * ( stream_Tell( p_demux->s ) / 50 ) /
@@ -333,7 +467,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_LENGTH:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            if( p_sys->i_mux_rate > 0 )
+            if( p_sys->i_length > 0 )
+            {
+                *pi64 = p_sys->i_length;
+                return VLC_SUCCESS;
+            }
+            else if( p_sys->i_mux_rate > 0 )
             {
                 *pi64 = (int64_t)1000000 * ( stream_Size( p_demux->s ) / 50 ) /
                     p_sys->i_mux_rate;