r4383 - in vdr/vdr-plugin-xineliboutput/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-03-30 21:18:00 +0000 (Fri, 30 Mar 2007)
New Revision: 4383

Added:
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_udp-crash-fix.dpatch
Modified:
   vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
Log:
* Added 01_udp-crash-fix.dpatch

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2007-03-30 19:32:27 UTC (rev 4382)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2007-03-30 21:18:00 UTC (rev 4383)
@@ -5,6 +5,7 @@
     debian/copyright
   * Removed 11_posix-fixes.dpatch (fixed upstream)
   * Removed 91_xineliboutput-1.0.0pre7-1.5.1.dpatch (fixed upstream)
+  * Added 01_udp-crash-fix.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Fri, 30 Mar 2007 20:41:23 +0200
 

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2007-03-30 19:32:27 UTC (rev 4382)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2007-03-30 21:18:00 UTC (rev 4383)
@@ -1 +1,2 @@
+01_udp-crash-fix
 10_nosignal

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_udp-crash-fix.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_udp-crash-fix.dpatch	2007-03-30 19:32:27 UTC (rev 4382)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_udp-crash-fix.dpatch	2007-03-30 21:18:00 UTC (rev 4383)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_udp-crash-fix.dpatch by Petri Hintukainen <Petri.Hintukainen at hut.fi>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes problems with UDP connections.
+## DP: Downloaded from: http://phivdr.dyndns.org/vdr/vdr-xineliboutput/
+
+ at DPATCH@
+diff -urNad vdr-plugin-xineliboutput-1.0.0~rc1~/tools/udp_pes_scheduler.c vdr-plugin-xineliboutput-1.0.0~rc1/tools/udp_pes_scheduler.c
+--- vdr-plugin-xineliboutput-1.0.0~rc1~/tools/udp_pes_scheduler.c	2007-03-17 13:41:21.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0~rc1/tools/udp_pes_scheduler.c	2007-03-30 23:09:48.000000000 +0200
+@@ -268,8 +268,11 @@
+     // Flush all buffers
+     m_QueueNextSeq = 0;
+     m_QueuePending = 0;
++
++    m_BackLogDeleteMutex.Lock();
+     delete m_BackLog; 
+     m_BackLog = new cUdpBackLog;
++    m_BackLogDeleteMutex.Unlock();
+ 
+     m_Frames = 0;
+     m_Octets = 0;
+@@ -674,7 +677,7 @@
+     m_QueuePending--;
+ 
+     m_Cond.Broadcast();
+- 
++    m_BackLogDeleteMutex.Lock(); /* ensure frame will not be deleted from queue */
+     m_Lock.Unlock();
+ 
+     // Schedule frame
+@@ -748,7 +751,9 @@
+       }
+     }
+ 
++    m_BackLogDeleteMutex.Unlock(); /* release queue */
+     m_Lock.Lock();
++
+     m_Frames ++;
+     m_Octets += PayloadSize;
+     if(m_fd_rtcp.open() && (m_Frames & 0xff) == 1) { // every 256th frame
+diff -urNad vdr-plugin-xineliboutput-1.0.0~rc1~/tools/udp_pes_scheduler.h vdr-plugin-xineliboutput-1.0.0~rc1/tools/udp_pes_scheduler.h
+--- vdr-plugin-xineliboutput-1.0.0~rc1~/tools/udp_pes_scheduler.h	2007-01-29 00:20:48.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0~rc1/tools/udp_pes_scheduler.h	2007-03-30 23:09:48.000000000 +0200
+@@ -68,6 +68,7 @@
+     int m_QueueNextSeq;      /* next outgoing */
+     int m_QueuePending;      /* outgoing queue size */
+     cUdpBackLog *m_BackLog;  /* queue for incoming data (not yet send) and retransmissions */
++    cMutex m_BackLogDeleteMutex;
+ 
+     // Data for scheduling algorithm
+     cTimePts  MasterClock;   /* Current MPEG PTS (synchronized to current stream) */


Property changes on: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_udp-crash-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *