- narrow r10012 to remove dts only stuff that goes to libmpeg2 (mpgv) and

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 648a800fc3ab73b3d0d37a6eef674fd35b82f681..dc1bc0ab6d8078cf6143906a5a3c44c8e9f00705 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -937,7 +937,7 @@ static int SessionsSetup( demux_t *p_demux )
     delete iter;
     if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the starttime if possible */
     p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -946,7 +946,7 @@ static int SessionsSetup( demux_t *p_demux )
     if( p_sys->i_npt_start < 0 )
         p_sys->i_npt_start = -1;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the duration if possible */
     p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -980,7 +980,11 @@ static int Play( demux_t *p_demux )
         p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter();
         if( p_sys->i_timeout <= 0 )
             p_sys->i_timeout = 60; /* default value from RFC2326 */
-        if( !p_sys->p_timeout )
+
+        /* start timeout-thread only on x-asf streams (wms), it has rtcp support but doesn't 
+         * seem to use it for liveness/keep-alive, get_parameter seems to work for it. get_parameter
+         * doesn't work with dss 5.5.4 & 5.5.5, they seems to work with rtcp */
+        if( !p_sys->p_timeout && p_sys->p_out_asf )
         {
             msg_Dbg( p_demux, "We have a timeout of %d seconds",  p_sys->i_timeout );
             p_sys->p_timeout = (timeout_thread_t *)vlc_object_create( p_demux, sizeof(timeout_thread_t) );
@@ -1007,7 +1011,7 @@ static int Play( demux_t *p_demux )
     }
 #endif
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the starttime if possible */
     p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1021,7 +1025,7 @@ static int Play( demux_t *p_demux )
     else
         p_sys->i_npt = p_sys->i_npt_start;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the duration if possible */
     p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -1226,7 +1230,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq );
                 }
 #endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
                 /* Retrieve the starttime if possible */
                 p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1240,7 +1244,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 else
                     p_sys->i_npt = p_sys->i_npt_start;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
                 /* Retrieve the duration if possible */
                 p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -1367,7 +1371,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq );
             }
 #endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
             /* Retrieve the starttime if possible */
             p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1381,7 +1385,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             else
                 p_sys->i_npt = p_sys->i_npt_start;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
             /* Retrieve the duration if possible */
             p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -1648,9 +1652,13 @@ static void StreamRead( void *p_private, unsigned int i_size,
 
     if( (i_pts != tk->i_pts) && (!tk->b_muxed) )
     {
-        p_block->i_dts = ( tk->fmt.i_cat == VIDEO_ES ) ? 0 : i_pts;
         p_block->i_pts = i_pts;
     }
+    if( !tk->b_muxed )
+    {
+        /*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */
+        p_block->i_dts = ( tk->fmt.i_codec == VLC_FOURCC( 'm', 'p', 'g', 'v' ) ) ? 0 : i_pts;
+    }
 
     if( tk->b_muxed )
     {