Remove the send-side cname getter APIs from voice and video engine.

These APIs aren't being used, and introduces deadlocks when using GetStats() in the new Call api. Having getters for cname at the send-side is pointless, as it's always the user who sets the cname.

R=henrika@webrtc.org, pbos@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6659 4adac7df-926f-26a2-2b94-8c16560cd09d

5 files changed, 5 insertions, 42 deletions

diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc
index f99e590a..72dd51a1 100644
--- a/voice_engine/channel.cc
+++ b/voice_engine/channel.cc
@@ -3179,22 +3179,6 @@ Channel::SetRTCP_CNAME(const char cName[256])
 }
 
 int
-Channel::GetRTCP_CNAME(char cName[256])
-{
-    if (_rtpRtcpModule->CNAME(cName) != 0)
-    {
-        _engineStatisticsPtr->SetLastError(
-            VE_RTP_RTCP_MODULE_ERROR, kTraceError,
-            "GetRTCP_CNAME() failed to retrieve RTCP CNAME");
-        return -1;
-    }
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId, _channelId),
-                 "GetRTCP_CNAME() => cName=%s", cName);
-    return 0;
-}
-
-int
 Channel::GetRemoteRTCP_CNAME(char cName[256])
 {
     if (cName == NULL)
diff --git a/voice_engine/channel.h b/voice_engine/channel.h
index 3c49d9bd..5cb2b9c3 100644
--- a/voice_engine/channel.h
+++ b/voice_engine/channel.h
@@ -327,7 +327,6 @@ public:
     int SetRTCPStatus(bool enable);
     int GetRTCPStatus(bool& enabled);
     int SetRTCP_CNAME(const char cName[256]);
-    int GetRTCP_CNAME(char cName[256]);
     int GetRemoteRTCP_CNAME(char cName[256]);
     int GetRemoteRTCPData(unsigned int& NTPHigh, unsigned int& NTPLow,
                           unsigned int& timestamp,
diff --git a/voice_engine/include/voe_rtp_rtcp.h b/voice_engine/include/voe_rtp_rtcp.h
index ce6f8499..6223bd6e 100644
--- a/voice_engine/include/voe_rtp_rtcp.h
+++ b/voice_engine/include/voe_rtp_rtcp.h
@@ -171,9 +171,11 @@ public:
     // specific |channel|.
     virtual int SetRTCP_CNAME(int channel, const char cName[256]) = 0;
 
-    // Gets the canonical name (CNAME) parameter for RTCP reports on a
-    // specific |channel|.
-    virtual int GetRTCP_CNAME(int channel, char cName[256]) = 0;
+    // TODO(holmer): Remove this API once it has been removed from
+    // fakewebrtcvoiceengine.h.
+    virtual int GetRTCP_CNAME(int channel, char cName[256]) {
+      return -1;
+    }
 
     // Gets the canonical name (CNAME) parameter for incoming RTCP reports
     // on a specific channel.
diff --git a/voice_engine/voe_rtp_rtcp_impl.cc b/voice_engine/voe_rtp_rtcp_impl.cc
index 8f0e717e..370e6007 100644
--- a/voice_engine/voe_rtp_rtcp_impl.cc
+++ b/voice_engine/voe_rtp_rtcp_impl.cc
@@ -292,26 +292,6 @@ int VoERTP_RTCPImpl::SetRTCP_CNAME(int channel, const char cName[256])
     return channelPtr->SetRTCP_CNAME(cName);
 }
 
-int VoERTP_RTCPImpl::GetRTCP_CNAME(int channel, char cName[256])
-{
-    WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-                 "GetRTCP_CNAME(channel=%d, cName=?)", channel);
-    if (!_shared->statistics().Initialized())
-    {
-        _shared->SetLastError(VE_NOT_INITED, kTraceError);
-        return -1;
-    }
-    voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
-    voe::Channel* channelPtr = ch.channel();
-    if (channelPtr == NULL)
-    {
-        _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
-            "GetRTCP_CNAME() failed to locate channel");
-        return -1;
-    }
-    return channelPtr->GetRTCP_CNAME(cName);
-}
-
 int VoERTP_RTCPImpl::GetRemoteRTCP_CNAME(int channel, char cName[256])
 {
     WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
diff --git a/voice_engine/voe_rtp_rtcp_impl.h b/voice_engine/voe_rtp_rtcp_impl.h
index c73fcdd2..c2599a26 100644
--- a/voice_engine/voe_rtp_rtcp_impl.h
+++ b/voice_engine/voe_rtp_rtcp_impl.h
@@ -27,8 +27,6 @@ public:
 
     virtual int SetRTCP_CNAME(int channel, const char cName[256]);
 
-    virtual int GetRTCP_CNAME(int channel, char cName[256]);
-
     virtual int GetRemoteRTCP_CNAME(int channel, char cName[256]);
 
     virtual int GetRemoteRTCPData(int channel,