Changeset 07e7a9048dbad0d54d73d8c8b92e4f99fd3da0a5

Timestamp:

08/01/08 09:15:54 (1 year ago)

Author:

Ilkka Ollakka <ileoo@videolan.org>

git-committer:

Ilkka Ollakka <ileoo@videolan.org> 1199780154 +0000

git-parent:

[7c69beacd9ee900a4e04a66b09bb0aa749e76d89]

git-author:

Ilkka Ollakka <ileoo@videolan.org> 1199780154 +0000

Message:

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

not all video. enables to restream/transcode rtsp/h264 streams.
Should also partly fix #397, it seems that most of h264 streams are
with packetization-mode=1 eg. in decoding order (thou it should be
checked here, and FIXME is for that).

- only start GET_PARAMETER keepalive-thread if x-asf is setted eg. when

server is wms, DSS 5.5.4 & 5.5.5 doesn't like GET_PARAMETER at all and
closes the connection when getting that, and they seem to use
rtcp-data for liveness. Kasenna uses that KA in useragent-string.

Files:

• modules/demux/live555.cpp (modified) (2 diffs)

modules/demux/live555.cpp

@@ -981 +981 @@
-        if( p_sys->i_timeout <= 0 )
-            p_sys->i_timeout = 60; /* default value from RFC2326 */
-
+
+
+
+
+
-        {
-            msg_Dbg( p_demux, "We have a timeout of %d seconds",  p_sys->i_timeout );
@@ -1649 +1653 @@
-    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;
-    }
-