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

List:       helix-protocol-cvs
Subject:    [Protocol-cvs] rtsp rtspclnt.cpp, 1.247, 1.248 servrsnd.cpp, 1.10,
From:       dcollins () helixcommunity ! org
Date:       2010-04-22 15:07:37
Message-ID: 201004221507.o3MF7iFv028892 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/protocol/rtsp
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv9331/protocol/rtsp

Modified Files:
	rtspclnt.cpp servrsnd.cpp 
Log Message:
Synopsis
========
Updates to allow building in 64-bit mode on Solaris 10

Branches: SERVER_CURRENT_RN (HEAD)
Reviewer: Jamie


Description
===========

A number of minor tweaks to allow building in 64-bit mode on Solaris.
This is with Sun Studio 12.1.  This will allow it to build, run and
serve HTTP connections, though it does not yet stream via RTSP.

Several places where casting operators need to be examined more
closely are flagged with TODO comments.

PTR_INT is redefined on 64-bit platforms as uintptr_t.  While it could
be defined this way for all, not all 32-bit platforms define this yet,
so I left it unchanged as unsigned int for 32-bit platforms.

One source file which had a lot of casts to fix, and which is not used
on the server, was removed from the server build.

There should be little if any affect on 32-bit builds.


Files Affected
==============
client/common/util/hxpackage.cpp
common/container/hxstack.cpp
common/container/pub/hxslist.h
common/container/pub/hxstack.h
common/include/platform.h
common/netio/threngin.cpp
common/netio/unix.pcf
common_rn/include/rmadrmil.h
datatype/common/util/metautil.cpp
datatype/flash/flv/fileformat/flv_local_payload.cpp
datatype/image/common/rpparser.cpp
datatype/image/common/wirefmgr.cpp
datatype/image/jpg/import/jpeg-6b/jmorecfg.h
datatype/mp4/fileformat/qttrkmgr.cpp
datatype-restricted/rm/tools/file/crm2mix.cpp
datatype-restricted/rm/tools/file/crma2mix.cpp
datatype-restricted/rm/tools/file/rmobjwrp.cpp
datatype-restricted/rm/video/payload/crvupack.cpp
datatype/smil/renderer/smil2/smlparse.cpp
datatype/smil/renderer/smil2/smltime.cpp
protocol/rtsp/rtspclnt.cpp
protocol/rtsp/servrsnd.cpp
protocol/transport/rdt/rdttran.cpp
server/engine/core/_main.cpp
server/engine/core/pub/proc.h
server/engine/session/rateselinfo.cpp
server-restricted/datatype/switch/switchverifier.cpp
server-restricted/engine/bin/linux2.pcf
server-restricted/engine/bin/sunos5.pcf
server-restricted/engine/bin/unix.pcf
server-restricted/proxy/bin/linux2.pcf
server-restricted/proxy/bin/sunos5.pcf
server-restricted/proxy/bin/unix.pcf
server_rn/snmp/master/agent++/src/threads.cpp


Testing Performed
=================

Unit Tests:
- N/A

Integration Tests:
- 64-bit build starts and runs, and serves HTTP connections 
- 32-bit build also streams via RTSP

Leak Tests:
- N/A

Performance Tests:
- N/A

Platforms Tested: sunos-5.10-sparc64-server (new), sunos-5.10-sparc32-server (new)
Build verified: linux-rhel5-i686


QA Hints
========
* N/A


Index: servrsnd.cpp
===================================================================
RCS file: /cvsroot/protocol/rtsp/servrsnd.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- servrsnd.cpp	6 Jul 2007 20:51:35 -0000	1.10
+++ servrsnd.cpp	22 Apr 2010 15:07:34 -0000	1.11
@@ -268,7 +268,7 @@
 
     while(!m_pPacketDeque->empty())
     {
-        uTS = (UINT32)m_pTSWindowQ->front();
+        uTS = (UINT32)(PTR_INT)m_pTSWindowQ->front(); //TODO: 64-bit check
         pPacket = (BasePacket*)m_pPacketDeque->front();
 
         /*

Index: rtspclnt.cpp
===================================================================
RCS file: /cvsroot/protocol/rtsp/rtspclnt.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- rtspclnt.cpp	11 Jan 2010 16:24:04 -0000	1.247
+++ rtspclnt.cpp	22 Apr 2010 15:07:34 -0000	1.248
@@ -12209,7 +12209,7 @@
         if (m_pUDPPortToStreamNumMap->Lookup(lKey, pValue))
         {
             // Get the stream number
-            UINT32 ulStreamNumber = (UINT32) pValue;
+            UINT32 ulStreamNumber = (UINT32)(PTR_INT)pValue; //TODO: 64-bit check
             UINT16 usStreamNumber = (UINT16) ulStreamNumber;
             // Get the stream info
             RTSPStreamInfo* pStreamInfo = getStreamInfo(usStreamNumber);


_______________________________________________
Protocol-cvs mailing list
Protocol-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/protocol-cvs
[prev in list] [next in list] [prev in thread] [next in thread]