Regression: SAP sends all announcements to live555

Please use http://git.videolan.org to browse the branch.

Also, note that when you clone the git tree you can browse the full history locally with git gui, or qgit, or whatever.

And then, does it fails to play ? or is it just using live555 instead of the udp module ?

People at centrale have test with win and gentoo and reported it works. i need to ask them to check which module was used to parse the sap

Replying to xtophe:

And then, does it fails to play ? or is it just using live555 instead of the udp module ?

It plays, but only for limited time period. Depending on the clock drift, after e.g. 30 minutes it starts skipping (buffer underruns). live555 does not use clock synchro adaptation, thus it breaks sooner or later.

On the other hand, native VLC's rtp input can play a stream for days without any clocking drift problems. Thus we definitely need to restore the behaviour from 0.8.6e.

Also git.videolan.org doesn't seem to help - vlc.git is again trunk and there's no project for branch.

The problem is most probably here (diff between 0.8.6e and 0.8.6f):

@@ -1041,31 +1041,33 @@
         if( psz_eof )
         {
             *psz_eof = '\0';
-            psz_proto = strdup( psz_parse );
-
-            psz_parse = psz_eof + 1;
-            p_sdp->i_media_type = atoi( psz_parse );

+            if( !strcmp( psz_parse, "RTP/AVP" ) )
+            {
+                psz_proto = "rtp";
+                p_sdp->i_media_type = atoi( psz_parse );
+            }

Apparently, the line

psz_parse = psz_eof + 1;

has been incorrectly deleted and now RTP media type is undefined.

Replying to md:

Also git.videolan.org doesn't seem to help - vlc.git is again trunk and there's no project for branch.

There is! See the different branch name at the bottom of the page. Here is a link to 0.8.6-bugfix:

http://git.videolan.org/?p=vlc.git;a=shortlog;h=0.8.6-bugfix

Pierre.

Oh, I see. So - as mentioned above, the problem was introduced in this commit:

http://git.videolan.org/?p=vlc.git;a=commitdiff;h=29a99a61010ec44c61ca6c1614c116e4436e8b12

can you test the following patch. here it seems to fix the problem but testing only with one pc streaming to itself

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 797099e..3d664de 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c

@@ -1045,6 +1045,7 @@ static int ParseConnection( vlc_object_t *p_obj, sdp_t *p$
             if( !strcmp( psz_parse, "RTP/AVP" ) )
             {
                 psz_proto = "rtp";
+                psz_parse = psz_eof + 1;
                 p_sdp->i_media_type = atoi( psz_parse );
             }
             else

Thanks xtophe, it completely fixes the problem.

Fixed in 5e015e

in 5e015eeedede726d17ab542c3f3a20296c5d411b