[Opalvoip-svn] SF.net SVN: opalvoip:[33604] opal/branches/Bb
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
[Opalvoip-svn] SF.net SVN: opalvoip:[33604] opal/branches/Bb
|
From: <rjo...@us...> - 2015-05-15 02:03:32
|
Revision: 33604
http://sourceforge.net/p/opalvoip/code/33604
Author: rjongbloed
Date: 2015-05-15 02:03:30 +0000 (Fri, 15 May 2015)
Log Message:
-----------
Merged revision(s) 33602 from opal/trunk:
Removed PPROFILE_FUNCTION() calls within PTLib/OPAL as produce a lot of "noise" when trying to profile limited code subsets. Analysis tool just not good enough for all but the most basic of profiling.
Modified Paths:
--------------
opal/branches/Bb/src/codec/opalpluginmgr.cxx
opal/branches/Bb/src/opal/patch.cxx
opal/branches/Bb/src/rtp/rtp_fec.cxx
opal/branches/Bb/src/rtp/rtp_session.cxx
opal/branches/Bb/src/rtp/rtp_stream.cxx
Property Changed:
----------------
opal/branches/Bb/
Index: opal/branches/Bb
===================================================================
--- opal/branches/Bb 2015-05-15 02:00:55 UTC (rev 33603)
+++ opal/branches/Bb 2015-05-15 02:03:30 UTC (rev 33604)
Property changes on: opal/branches/Bb
___________________________________________________________________
Modified: svn:mergeinfo
## -13,6 +13,6 ##
/opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
/opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346,24809
/opal/branches/v3_8:24025,24027,24029,24036,24038,24040,24042,24048,24050,24058,24061,24068,24071,24074,24076,24080,24082,24086-24087,24092,24099,24101,24105,24107,24109,24111,24114,24116-24117,24120-24121,24125,24127,24130,24132,24134,24138,24140,24144,24146,24148,24150-24151,24154,24156,24158,24162,24170,24218,24245,24257,24261,24340,24362-24363,24365,24369,24373,24422,24440,24442,24447,24489,24504,24506,24532,24536,24545,24547,24552,24554,24614,24678,24687,24699,24705,24775,24833,24861,24903,25146
-/opal/trunk:33566,33588
+/opal/trunk:33566,33588,33602
/ptlib/branches/v2_8:24136
/ptlib/trunk:20820
\ No newline at end of property
Modified: opal/branches/Bb/src/codec/opalpluginmgr.cxx
===================================================================
--- opal/branches/Bb/src/codec/opalpluginmgr.cxx 2015-05-15 02:00:55 UTC (rev 33603)
+++ opal/branches/Bb/src/codec/opalpluginmgr.cxx 2015-05-15 02:03:30 UTC (rev 33604)
@@ -749,7 +749,6 @@
BYTE * output,
PINDEX & created)
{
- PPROFILE_FUNCTION();
if (context == NULL)
return false;
@@ -919,7 +918,6 @@
bool OpalPluginVideoTranscoder::EncodeFrames(const RTP_DataFrame & src, RTP_DataFrameList & dstList)
{
- PPROFILE_FUNCTION();
dstList.RemoveAll();
if (src.GetPayloadSize() == 0)
@@ -1005,7 +1003,6 @@
bool OpalPluginVideoTranscoder::DecodeFrames(const RTP_DataFrame & src, RTP_DataFrameList & dstList)
{
- PPROFILE_FUNCTION();
// We use the data size indicated by plug in as a payload size, we do not adjust the size
// downward as many plug ins forget to add the RTP header size in its output data size and
// it doesn't hurt to make this buffer an extra few bytes longer than needed.
Modified: opal/branches/Bb/src/opal/patch.cxx
===================================================================
--- opal/branches/Bb/src/opal/patch.cxx 2015-05-15 02:00:55 UTC (rev 33603)
+++ opal/branches/Bb/src/opal/patch.cxx 2015-05-15 02:03:30 UTC (rev 33604)
@@ -1027,8 +1027,6 @@
bool OpalMediaPatch::Sink::WriteFrame(RTP_DataFrame & sourceFrame, bool bypassing)
{
- PPROFILE_FUNCTION();
-
if (!m_writeSuccessful)
return false;
Modified: opal/branches/Bb/src/rtp/rtp_fec.cxx
===================================================================
--- opal/branches/Bb/src/rtp/rtp_fec.cxx 2015-05-15 02:00:55 UTC (rev 33603)
+++ opal/branches/Bb/src/rtp/rtp_fec.cxx 2015-05-15 02:03:30 UTC (rev 33604)
@@ -89,8 +89,6 @@
if (m_session.m_ulpFecPayloadType == RTP_DataFrame::IllegalPayloadType)
return e_ProcessPacket; // No redundancies, add primary data and return
- PPROFILE_FUNCTION();
-
FecData fec;
fec.m_level.resize(m_session.m_ulpFecSendLevel);
@@ -169,8 +167,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::SyncSource::OnReceiveRedundantFrame(RTP_DataFrame & frame)
{
- PPROFILE_FUNCTION();
-
const BYTE * payload = frame.GetPayloadPtr();
PINDEX size = frame.GetPayloadSize();
Modified: opal/branches/Bb/src/rtp/rtp_session.cxx
===================================================================
--- opal/branches/Bb/src/rtp/rtp_session.cxx 2015-05-15 02:00:55 UTC (rev 33603)
+++ opal/branches/Bb/src/rtp/rtp_session.cxx 2015-05-15 02:03:30 UTC (rev 33604)
@@ -526,8 +526,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::SyncSource::OnSendData(RTP_DataFrame & frame, RewriteMode rewrite)
{
- PPROFILE_FUNCTION();
-
if (rewrite != e_RewriteNothing)
frame.SetSyncSource(m_sourceIdentifier);
@@ -584,8 +582,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::SyncSource::OnReceiveData(RTP_DataFrame & frame, bool newData)
{
- PPROFILE_FUNCTION();
-
frame.SetBundleId(m_mediaStreamId);
RTP_SequenceNumber sequenceNumber = frame.GetSequenceNumber();
@@ -728,8 +724,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::SyncSource::OnOutOfOrderPacket(RTP_DataFrame & frame)
{
- PPROFILE_FUNCTION();
-
RTP_SequenceNumber sequenceNumber = frame.GetSequenceNumber();
RTP_SequenceNumber expectedSequenceNumber = m_lastSequenceNumber + 1;
@@ -781,8 +775,6 @@
bool OpalRTPSession::SyncSource::HandlePendingFrames()
{
- PPROFILE_FUNCTION();
-
while (!m_pendingPackets.empty()) {
RTP_DataFrame resequencedPacket = m_pendingPackets.back();
@@ -1114,8 +1106,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::OnSendData(RTP_DataFrame & frame, RewriteMode rewrite)
{
- PPROFILE_FUNCTION();
-
SendReceiveStatus status;
#if OPAL_ICE
if ((status = OnSendICE(e_Data)) != e_ProcessPacket)
@@ -1493,8 +1483,6 @@
if (frame.GetPacketSize() == 0)
return e_IgnorePacket;
- PPROFILE_FUNCTION();
-
PTRACE(6, *this << "OnReceiveControl - " << frame);
++m_rtcpPacketsReceived;
@@ -2709,8 +2697,6 @@
if (m_iceServer == NULL)
return m_candidates[channel].empty() ? e_ProcessPacket : e_IgnorePacket;
- PPROFILE_FUNCTION();
-
PSTUNMessage message(framePtr, frameSize, ap);
if (!message.IsValid())
return m_candidates[channel].empty() ? e_ProcessPacket : e_IgnorePacket;
@@ -2781,8 +2767,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::ReadRawPDU(BYTE * framePtr, PINDEX & frameSize, Channel channel)
{
- PPROFILE_FUNCTION();
-
if (PAssertNULL(m_socket[channel]) == NULL)
return e_AbortTransport;
@@ -2890,8 +2874,6 @@
bool OpalRTPSession::InternalRead()
{
- PPROFILE_FUNCTION();
-
/* Note this should only be called from within the RTP read thread.
The locking strategy depends on it. */
@@ -2933,8 +2915,6 @@
bool OpalRTPSession::InternalReadData()
{
- PPROFILE_FUNCTION();
-
/* Note this should only be called from within the RTP read thread.
The locking strategy depends on it. */
@@ -3012,8 +2992,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::WriteData(RTP_DataFrame & frame, RewriteMode rewrite, const PIPSocketAddressAndPort * remote)
{
- PPROFILE_FUNCTION();
-
WRITE_PERFORMANCE_HACK(0,e_ProcessPacket)
PSafeLockReadWrite lock(*this);
@@ -3048,8 +3026,6 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::WriteRawPDU(const BYTE * framePtr, PINDEX frameSize, Channel channel, const PIPSocketAddressAndPort * remote)
{
- PPROFILE_FUNCTION();
-
PIPSocketAddressAndPort remoteAddressAndPort;
if (remote == NULL) {
remoteAddressAndPort.SetAddress(m_remoteAddress, m_remotePort[channel]);
Modified: opal/branches/Bb/src/rtp/rtp_stream.cxx
===================================================================
--- opal/branches/Bb/src/rtp/rtp_stream.cxx 2015-05-15 02:00:55 UTC (rev 33603)
+++ opal/branches/Bb/src/rtp/rtp_stream.cxx 2015-05-15 02:03:30 UTC (rev 33604)
@@ -256,8 +256,6 @@
PBoolean OpalRTPMediaStream::ReadPacket(RTP_DataFrame & packet)
{
- PPROFILE_FUNCTION();
-
if (!IsOpen()) {
PTRACE(4, "Read from closed stream");
return false;
@@ -285,8 +283,6 @@
PBoolean OpalRTPMediaStream::WritePacket(RTP_DataFrame & packet)
{
- PPROFILE_FUNCTION();
-
if (!IsOpen()) {
PTRACE(4, "Write to closed stream");
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|