[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] common/util livepacketq.cpp,1.6,1.6.20.1
From:       packard () helixcommunity ! org
Date:       2013-04-28 7:24:48
[Download RAW message or body]

Update of /cvsroot/server/common/util
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25049

Modified Files:
      Tag: SERVER_VHOST_YIJI_2
	livepacketq.cpp 
Log Message:
Reviewed by Richard

Synopsis
========
CR: rtp ingress support for vhost

Branches: SERVER_VHOST_YIJI_2

Reviewer: Anyone

Description
===========
Add vhost support for rtp ingress.

Files Affected
==============
/cvsroot/server/broadcast/transport/rtp/recv/rtpbcobj.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/rtpbcplin.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/rtpbcstreams.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/rtpdirmgr.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/rtplivestream.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/rtpreceiver.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/rtpstream.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/rtpworkercb.cpp,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtpbcobj.h,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtpbcplin.h,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtpbcstreams.h,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtpdirmgr.h,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtplivestream.h,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtpreceiver.h,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtpstream.h,v
/cvsroot/server/broadcast/transport/rtp/recv/pub/rtpworkercb.h,v
/cvsroot/server/common/util/livepacketq.cpp,v
/cvsroot/server/common/util/pub/livepacketq.h

Testing Performed
=================
Integration Tests: enable dir scan or disable dir scan both work.





Index: livepacketq.cpp
===================================================================
RCS file: /cvsroot/server/common/util/livepacketq.cpp,v
retrieving revision 1.6
retrieving revision 1.6.20.1
diff -u -d -r1.6 -r1.6.20.1
--- livepacketq.cpp	31 Jan 2012 02:49:37 -0000	1.6
+++ livepacketq.cpp	28 Apr 2013 07:24:39 -0000	1.6.20.1
@@ -48,7 +48,8 @@
 //#define PACKET_BUFFER_DEBUG
 
 CLivePacketQueue::CLivePacketQueue(IHXCommonClassFactory* pClassFactory,
-                                   BrcvStatistics* pSharedStats) : 
+                                   BrcvStatistics* pSharedStats,
+                                   BrcvStatistics* pVhostSharedStats) : 
     CInorderPacketQueue(), 
     m_pClassFactory(pClassFactory),
     m_bFirstPacket(TRUE),
@@ -56,7 +57,8 @@
     m_ulLastRTPTime(0),
     m_ulLastMSTS(0),
     m_ulNextSeq(0),
-    m_pSharedStats(pSharedStats)
+    m_pSharedStats(pSharedStats),
+    m_pVhostSharedStats(pVhostSharedStats)
 {
     HX_ASSERT(pClassFactory);
     pClassFactory->AddRef();
@@ -177,6 +179,11 @@
             HXAtomicIncUINT32(&m_pSharedStats->m_uLost);
         }
 
+        if (m_pVhostSharedStats)
+        {
+            HXAtomicIncUINT32(&m_pVhostSharedStats->m_uLost);
+        }
+
 #ifdef PACKET_BUFFER_DEBUG
         printf("PacketQueue (%x) LostPacket stream=%d rule=%d seq=%u del-time=%u \
                media-time=%u rtp-time=%u\n",
             this, pPacket->GetStreamNumber(), pPacket->GetASMRuleNumber(), 


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]