[Mplayer-cvslog] CVS: main/libmpdemux demux_rtp.cpp,1.18,1.19

[Ross Finlayson CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv26343

Modified Files:
	demux_rtp.cpp 
Log Message:
Changed the criteria for when to drop RTP packets whose timestamp is too far
behind that of the other (audio or video) stream.  Now, this is done only
if both streams have been synchronized using RTCP.


Index: demux_rtp.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- demux_rtp.cpp	27 Jul 2003 10:15:10 -0000	1.18
+++ demux_rtp.cpp	24 Sep 2003 08:41:57 -0000	1.19
@@ -501,8 +501,11 @@
   scheduler.doEventLoop(&bufferQueue->blockingFlag);
 
   // Set the "ptsBehind" result parameter:
-  if (bufferQueue->prevPacketPTS != 0.0 && *(bufferQueue->otherQueue) != NULL
-      && (*(bufferQueue->otherQueue))->prevPacketPTS != 0.0) {
+  if (bufferQueue->prevPacketPTS != 0.0
+      && bufferQueue->prevPacketWasSynchronized
+      && *(bufferQueue->otherQueue) != NULL
+      && (*(bufferQueue->otherQueue))->prevPacketPTS != 0.0
+      && (*(bufferQueue->otherQueue))->prevPacketWasSynchronized) {
     ptsBehind = (*(bufferQueue->otherQueue))->prevPacketPTS
 		 - bufferQueue->prevPacketPTS;
   } else {