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

List:       helix-protocol-cvs
Subject:    [Protocol-cvs] transport/rtp rtpproxy.cpp, 1.1.98.2,
From:       ehyche () helixcommunity ! org
Date:       2005-04-22 21:52:51
[Download RAW message or body]

Update of /cvsroot/protocol/transport/rtp
In directory cvs-new:/tmp/cvs-serv9346/transport/rtp

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	rtpproxy.cpp rtptran.cpp 
Log Message:
Merge from HEAD.
Warning removals.
Contributed by: Alberto Meza (ameza@dextratech.com)


Index: rtptran.cpp
===================================================================
RCS file: /cvsroot/protocol/transport/rtp/rtptran.cpp,v
retrieving revision 1.88.2.4
retrieving revision 1.88.2.5
diff -u -d -r1.88.2.4 -r1.88.2.5
--- rtptran.cpp	5 Apr 2005 14:50:16 -0000	1.88.2.4
+++ rtptran.cpp	22 Apr 2005 21:52:49 -0000	1.88.2.5
@@ -171,7 +171,7 @@
     , m_pSyncServer(NULL)
     , m_streamNumber(0)
     , m_lRefCount(0)
-    , m_rtpPayloadType(-1)
+    , m_rtpPayloadType(0xFF)
     , m_bHasMarkerRule(FALSE)
     , m_markerRuleNumber(0)
     , m_bIsSyncMaster(FALSE)
@@ -886,9 +886,6 @@
 
         ulRTPTS = GetDwordFromBufAndInc(pcOrig);
 
-        UINT16 nA = unSeqNo;
-        UINT32 lA = ulRTPTS;
-
         // update
         unSeqNo += unSeqNoOffset;
         ulRTPTS += ulRTPTSOffset;
@@ -937,7 +934,6 @@
         pcOrig += 16;
         ulRTPTS = GetDwordFromBufAndInc(pcOrig);
 
-        UINT32 lA = ulRTPTS;
         // update
         ulRTPTS += ulRTPTSOffset;
 
@@ -1068,7 +1064,6 @@
      */
     RTPPacket pkt;
     HX_RESULT hresult = HXR_OK;
-    BOOL bCompressed = FALSE; //XXXBAB don't compress anything yet...
     UINT32 packetLen = 0;
     pkt.version_flag = 2;
     pkt.padding_flag = 0;
@@ -3349,7 +3344,6 @@
     RTCPPacket* pPktSDES = NULL;
 
     HXTimeval rmatv = m_pScheduler->GetCurrentSchedulerTime();
-    UINT32 ulNow = rmatv.tv_sec*1000 + rmatv.tv_usec/1000;
     Timeval tvNow((INT32) rmatv.tv_sec, (INT32)rmatv.tv_usec);
 
     RTCPPacker packer;

Index: rtpproxy.cpp
===================================================================
RCS file: /cvsroot/protocol/transport/rtp/rtpproxy.cpp,v
retrieving revision 1.1.98.2
retrieving revision 1.1.98.3
diff -u -d -r1.1.98.2 -r1.1.98.3
--- rtpproxy.cpp	8 Mar 2005 06:04:05 -0000	1.1.98.2
+++ rtpproxy.cpp	22 Apr 2005 21:52:49 -0000	1.1.98.3
@@ -21,7 +21,6 @@
 BOOL proxiesSupportFlash4(IHXBuffer* pViaStr)
 {
     BOOL cachesFlash4 = TRUE;
-    HX_RESULT err = HXR_FAIL;
 
     // check via header to verify that al proxies support RS 8.0 features
     // (ie latest flash datatype)



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