From 4392d5f9f859b5d55b8017fafb09a496a110beb3 Mon Sep 17 00:00:00 2001
From: "henrika@webrtc.org"
 <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 17 Apr 2013 07:34:25 +0000
Subject: [PATCH] Fix for "RTP dynamic payload type 100 is reserved"

TBR=perkj
BUG=227036 (in crbug.com)

TEST=out\Debug\voe_auto_test.exe --automated --gtest_filter=Dtmf* where I
manually modified the test and used 100 as new PT (which I first verified was
already used by CN, 48000).

BUG=

Review URL: https://webrtc-codereview.appspot.com/1319010

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3859 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/voice_engine/channel.cc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 7abf7d4ff2..d6629029bc 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -3182,11 +3182,14 @@ Channel::SetSendTelephoneEventPayloadType(unsigned char type)
     memcpy(codec.plname, "telephone-event", 16);
     if (_rtpRtcpModule->RegisterSendPayload(codec) != 0)
     {
-        _engineStatisticsPtr->SetLastError(
-            VE_RTP_RTCP_MODULE_ERROR, kTraceError,
-            "SetSendTelephoneEventPayloadType() failed to register send"
-            "payload type");
-        return -1;
+        _rtpRtcpModule->DeRegisterSendPayload(codec.pltype);
+        if (_rtpRtcpModule->RegisterSendPayload(codec) != 0) {
+            _engineStatisticsPtr->SetLastError(
+                VE_RTP_RTCP_MODULE_ERROR, kTraceError,
+                "SetSendTelephoneEventPayloadType() failed to register send"
+                "payload type");
+            return -1;
+        }
     }
     _sendTelephoneEventPayloadType = type;
     return 0;