[Opalvoip-svn] SF.net SVN: opalvoip:[33611] opal/branches/Bb
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2015-05-20 00:24:33
|
Revision: 33611 http://sourceforge.net/p/opalvoip/code/33611 Author: rjongbloed Date: 2015-05-20 00:24:30 +0000 (Wed, 20 May 2015) Log Message: ----------- Merged revision(s) 33610 from opal/trunk: Removed PPROFILE_BLOCK() 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/opal/patch.cxx opal/branches/Bb/src/rtp/srtp_session.cxx Property Changed: ---------------- opal/branches/Bb/ Index: opal/branches/Bb =================================================================== --- opal/branches/Bb 2015-05-20 00:21:52 UTC (rev 33610) +++ opal/branches/Bb 2015-05-20 00:24:30 UTC (rev 33611) 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,33602,33605 +/opal/trunk:33566,33588,33602,33605,33610 /ptlib/branches/v2_8:24136 /ptlib/trunk:20820 \ No newline at end of property Modified: opal/branches/Bb/src/opal/patch.cxx =================================================================== --- opal/branches/Bb/src/opal/patch.cxx 2015-05-20 00:21:52 UTC (rev 33610) +++ opal/branches/Bb/src/opal/patch.cxx 2015-05-20 00:24:30 UTC (rev 33611) @@ -1059,10 +1059,8 @@ } OpalVideoFormat::VideoFrameType frameType; - if (m_videoFormat.IsValid()) { - PPROFILE_BLOCK("OpalMediaPatch::Sink::WriteFrame - video detect"); + if (m_videoFormat.IsValid()) frameType = m_videoFormat.GetVideoFrameType(sourceFrame.GetPayloadPtr(), sourceFrame.GetPayloadSize(), m_keyFrameDetectContext); - } else frameType = OpalVideoFormat::e_UnknownFrameType; #endif // OPAL_VIDEO Modified: opal/branches/Bb/src/rtp/srtp_session.cxx =================================================================== --- opal/branches/Bb/src/rtp/srtp_session.cxx 2015-05-20 00:21:52 UTC (rev 33610) +++ opal/branches/Bb/src/rtp/srtp_session.cxx 2015-05-20 00:24:30 UTC (rev 33611) @@ -595,7 +595,6 @@ int len = frame.GetPacketSize(); { - PPROFILE_BLOCK("srtp_protect"); frame.MakeUnique(); frame.SetMinSize(len + SRTP_MAX_TRAILER_LEN); @@ -631,7 +630,6 @@ int len = frame.GetPacketSize(); { - PPROFILE_BLOCK("srtp_protect_rtcp"); frame.MakeUnique(); frame.SetMinSize(len + SRTP_MAX_TRAILER_LEN); @@ -664,7 +662,6 @@ int len = frame.GetPacketSize(); { - PPROFILE_BLOCK("srtp_unprotect"); frame.MakeUnique(); if (!CHECK_ERROR(srtp_unprotect, (m_context, frame.GetPointer(), &len), frame.GetSyncSource(), frame.GetSequenceNumber())) return ++m_consecutiveErrors[e_Receiver][e_Data] > MaxConsecutiveErrors ? e_AbortTransport : e_IgnorePacket; @@ -694,7 +691,6 @@ int len = frame.GetSize(); { - PPROFILE_BLOCK("srtp_unprotect_rtcp"); frame.MakeUnique(); /* Need to guarantee a receiver SSRC (their sender) even if never been told This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |