[Opalvoip-svn] SF.net SVN: opalvoip:[26099] opal/branches/v3_10/src/opal/connection.cxx
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2011-06-30 03:59:45
|
Revision: 26099 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=26099&view=rev Author: rjongbloed Date: 2011-06-30 03:59:39 +0000 (Thu, 30 Jun 2011) Log Message: ----------- Fixed inclusion of in-band DTMF detection when two stage transcoding used. Modified Paths: -------------- opal/branches/v3_10/src/opal/connection.cxx Modified: opal/branches/v3_10/src/opal/connection.cxx =================================================================== --- opal/branches/v3_10/src/opal/connection.cxx 2011-06-30 03:43:04 UTC (rev 26098) +++ opal/branches/v3_10/src/opal/connection.cxx 2011-06-30 03:59:39 UTC (rev 26099) @@ -997,26 +997,17 @@ #if OPAL_PTLIB_DTMF if (m_detectInBandDTMF && isSource) { - if (mediaFormat != OpalPCM16) - PTRACE(3, "OpalCon\tCould not add detect DTMF filter for " << mediaFormat - << " on connection " << *this << ", patch " << patch); - else { - patch.AddFilter(m_dtmfDetectNotifier, OpalPCM16); - PTRACE(4, "OpalCon\tAdded detect DTMF filter on connection " << *this << ", patch " << patch); - } + patch.AddFilter(m_dtmfDetectNotifier, OpalPCM16); + PTRACE(4, "OpalCon\tAdded detect DTMF filter on connection " << *this << ", patch " << patch); } if (m_sendInBandDTMF && !isSource) { - if (mediaFormat != OpalPCM16 && - mediaFormat != OpalG711_ULAW_64K && - mediaFormat != OpalG711_ALAW_64K) - PTRACE(3, "OpalCon\tCould not add send DTMF filter for " << mediaFormat - << " on connection " << *this << ", patch " << patch); - else { + if (mediaFormat == OpalG711_ULAW_64K || mediaFormat == OpalG711_ALAW_64K) m_dtmfSendFormat = mediaFormat; - patch.AddFilter(m_dtmfSendNotifier, mediaFormat); - PTRACE(4, "OpalCon\tAdded send DTMF filter on connection " << *this << ", patch " << patch); - } + else + m_dtmfSendFormat = OpalPCM16; + patch.AddFilter(m_dtmfSendNotifier, mediaFormat); + PTRACE(4, "OpalCon\tAdded send DTMF filter on connection " << *this << ", patch " << patch); } #endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |