[xiph-commits] r10783 - trunk/xiph-rtp

[lu_zero at svn.xiph.org]

Author: lu_zero
Date: 2006-02-03 15:12:56 -0800 (Fri, 03 Feb 2006)
New Revision: 10783

Modified:
   trunk/xiph-rtp/xiph_rtp.c
Log:
Fix for ticket #837 - Support for chained ogg

Modified: trunk/xiph-rtp/xiph_rtp.c
===================================================================
--- trunk/xiph-rtp/xiph_rtp.c	2006-02-02 14:43:31 UTC (rev 10782)
+++ trunk/xiph-rtp/xiph_rtp.c	2006-02-03 23:12:56 UTC (rev 10783)
@@ -191,21 +191,59 @@
 	int sleeptime, frag, position = 0;
 	unsigned short framesize;
 	unsigned char *packet;
-
+	framestack_t *fs = &xr->fs;
 	const unsigned int max_payload = 1000;
 
 /*  Set sleeptime value based on timestamp */
 
 	if (type)
 		sleeptime = 300; //  ((1 / (float) bitrate) * 1000000);
+		// flush any other packet in queue (chained ogg!)
+		if ( fs->stackcount ) { //FIXME avoid code duplication!
+			/*  Set Vorbis header flags  */
+			xr->bitfield.frag_type = 0;
+			xr->bitfield.data_type = 0;
+			xr->bitfield.pkts = fs->stackcount;
+
+			packet = malloc (fs->stacksize + 4);
+
+			makeheader (xr, packet, fs->stacksize + 4);
+			memcpy (packet + 4, fs->framestack, fs->stacksize);
+
+			/*  Swap RTP headers from host to network order  */
+			xr->headers.sequence = htons (xr->headers.sequence);
+			xr->headers.timestamp = htonl (xr->headers.timestamp);
+
+			sendrtp (xr, packet, fs->stacksize + 4);
+
+			/*  Swap headers back to host order  */
+			xr->headers.sequence = htons (xr->headers.sequence);
+			xr->headers.timestamp = ntohl (xr->headers.timestamp);
+
+			if (fs->stackcount == 1) 
+				progressmarker (0);
+			else
+				progressmarker (5);
+
+			usleep (sleeptime);
+
+			xr->headers.sequence++;
+			xr->headers.timestamp += timestamp;
+
+			fs->stacksize = 0;
+			fs->stackcount = 0;
+
+			free (packet);
+		}
+			
 	else
 		sleeptime = timestamp;
 
 
 /*  Frame packing.  Used only for type 0 packets (raw Vorbis data) */
 
-	if ((length < max_payload && type == 0 ) || xr->fs.stacksize ) {
-		framestack_t *fs = &xr->fs;
+	if ((length < max_payload && type == 0 ) || fs->stacksize ) {
+		
 		if (length + fs->stacksize < max_payload 
 				&& fs->stackcount < 15) 
 		{
@@ -247,7 +285,7 @@
 			else
 				progressmarker (5);
 
-			usleep (sleeptime); /* WRONG */
+			usleep (sleeptime);
 
 			xr->headers.sequence++;
 			xr->headers.timestamp += timestamp;