aboutsummaryrefslogtreecommitdiff
path: root/webrtc/call/rtc_event_log.cc
diff options
context:
space:
mode:
authorpbos <pbos@webrtc.org>2015-10-02 02:36:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-02 09:37:18 +0000
commitda903eaabbb6c6830efcafc3c2ade1d36f511e43 (patch)
treedacc68cfb573d4bfdd42474a5e572e4323081769 /webrtc/call/rtc_event_log.cc
parentc8ba10588945d1a93bd66d4eaca3d7520376ea24 (diff)
downloadwebrtc-da903eaabbb6c6830efcafc3c2ade1d36f511e43.tar.gz
Unify newapi::RtcpMode and RTCPMethod.
BUG=webrtc:1695 R=solenberg@webrtc.org, stefan@webrtc.org TBR=mflodman@webrtc.org Review URL: https://codereview.webrtc.org/1373903003 Cr-Commit-Position: refs/heads/master@{#10143}
Diffstat (limited to 'webrtc/call/rtc_event_log.cc')
-rw-r--r--webrtc/call/rtc_event_log.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/webrtc/call/rtc_event_log.cc b/webrtc/call/rtc_event_log.cc
index 23b120cb8e..058879ae0b 100644
--- a/webrtc/call/rtc_event_log.cc
+++ b/webrtc/call/rtc_event_log.cc
@@ -111,13 +111,15 @@ namespace {
// unnamed namespace. The intention is to make the compiler warn if anyone
// adds unhandled new events/modes/etc.
-rtclog::VideoReceiveConfig_RtcpMode ConvertRtcpMode(
- newapi::RtcpMode rtcp_mode) {
+rtclog::VideoReceiveConfig_RtcpMode ConvertRtcpMode(RtcpMode rtcp_mode) {
switch (rtcp_mode) {
- case newapi::kRtcpCompound:
+ case RtcpMode::kCompound:
return rtclog::VideoReceiveConfig::RTCP_COMPOUND;
- case newapi::kRtcpReducedSize:
+ case RtcpMode::kReducedSize:
return rtclog::VideoReceiveConfig::RTCP_REDUCEDSIZE;
+ case RtcpMode::kOff:
+ RTC_NOTREACHED();
+ return rtclog::VideoReceiveConfig::RTCP_COMPOUND;
}
RTC_NOTREACHED();
return rtclog::VideoReceiveConfig::RTCP_COMPOUND;