From 9de632a100d4f4cb9c0772d6106f911dcb738bf1 Mon Sep 17 00:00:00 2001 From: nisse Date: Mon, 25 Jan 2016 01:56:50 -0800 Subject: [PATCH] Deleted unused enums MediaChannelOptions and VoiceMediaChannelOptions, with constants OPT_CONFERENCE and OPT_AGC_MINUS_10DB. BUG=webrtc:5426 TBR=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1610543002 Cr-Commit-Position: refs/heads/master@{#11365} --- talk/media/base/mediachannel.h | 10 ---------- talk/media/webrtc/webrtcvideoengine2_unittest.cc | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h index f6fb77d8a6..c18847465c 100644 --- a/talk/media/base/mediachannel.h +++ b/talk/media/base/mediachannel.h @@ -441,16 +441,6 @@ inline const RtpHeaderExtension* FindHeaderExtension( return NULL; } -enum MediaChannelOptions { - // Tune the stream for conference mode. - OPT_CONFERENCE = 0x0001 -}; - -enum VoiceMediaChannelOptions { - // Tune the audio stream for vcs with different target levels. - OPT_AGC_MINUS_10DB = 0x80000000 -}; - class MediaChannel : public sigslot::has_slots<> { public: class NetworkInterface { diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc index dfff00af66..4c357f16c6 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc @@ -3138,7 +3138,7 @@ TEST_F(WebRtcVideoEngine2SimulcastTest, DISABLED_NoSimulcastWith1on1) { FAIL() << "Not implemented."; } -// Test SetOptions with OPT_CONFERENCE flag. +// Test SetOptions with conference mode. TEST_F(WebRtcVideoEngine2SimulcastTest, DISABLED_SetOptionsWithConferenceMode) { // TODO(pbos): Implement. FAIL() << "Not implemented.";