Remove the [Un]RegisterVoiceProcessor() API.

talk/media/webrtc/webrtcvoiceengine_unittest.cc

 /*
  * libjingle
  * Copyright 2008 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 12 matching lines @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/call.h"
 #include "talk/media/base/constants.h"
 #include "talk/media/base/fakemediaengine.h"
-#include "talk/media/base/fakemediaprocessor.h"
 #include "talk/media/base/fakenetworkinterface.h"
 #include "talk/media/base/fakertp.h"
 #include "talk/media/webrtc/fakewebrtccall.h"
 #include "talk/media/webrtc/fakewebrtcvoiceengine.h"
 #include "talk/media/webrtc/webrtcvoiceengine.h"
 #include "webrtc/p2p/base/fakesession.h"
 #include "talk/session/media/channel.h"
 
 // Tests for the WebRtcVoiceEngine/VoiceChannel code.
 
@@ skipping 18 matching lines @@
 static uint32 kSsrc2 = 0x98;
 
 class FakeVoEWrapper : public cricket::VoEWrapper {
  public:
   explicit FakeVoEWrapper(cricket::FakeWebRtcVoiceEngine* engine)
       : cricket::VoEWrapper(engine,  // processing
                             engine,  // base
                             engine,  // codec
                             engine,  // dtmf
                             engine,  // hw
-                            engine,  // media
                             engine,  // neteq
                             engine,  // network
                             engine,  // rtp
                             engine,  // sync
                             engine) {  // volume
   }
 };
 
 class FakeVoETraceWrapper : public cricket::VoETraceWrapper {
  public:
@@ skipping 2513 matching lines @@
   EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
   EXPECT_TRUE(channel_->SetSend(cricket::SEND_MICROPHONE));
   EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(2)));
   EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(3)));
   EXPECT_TRUE(channel_->SetPlayout(true));
   voe_.set_playout_fail_channel(voe_.GetLastChannel() - 1);
   EXPECT_TRUE(channel_->SetPlayout(false));
   EXPECT_FALSE(channel_->SetPlayout(true));
 }
 
-// Test that the Registering/Unregistering with the
-// webrtcvoiceengine works as expected
-TEST_F(WebRtcVoiceEngineTestFake, RegisterVoiceProcessor) {
-  EXPECT_TRUE(SetupEngine());
-  EXPECT_TRUE(channel_->AddRecvStream(
-      cricket::StreamParams::CreateLegacy(kSsrc2)));
-  cricket::FakeMediaProcessor vp_1;
-  cricket::FakeMediaProcessor vp_2;
-
-  EXPECT_FALSE(engine_.RegisterProcessor(kSsrc2, &vp_1, cricket::MPD_TX));
-  EXPECT_TRUE(engine_.RegisterProcessor(kSsrc2, &vp_1, cricket::MPD_RX));
-  EXPECT_TRUE(engine_.RegisterProcessor(kSsrc2, &vp_2, cricket::MPD_RX));
-  voe_.TriggerProcessPacket(cricket::MPD_RX);
-  voe_.TriggerProcessPacket(cricket::MPD_TX);
-
-  EXPECT_TRUE(voe_.IsExternalMediaProcessorRegistered());
-  EXPECT_EQ(1, vp_1.voice_frame_count());
-  EXPECT_EQ(1, vp_2.voice_frame_count());
-
-  EXPECT_TRUE(engine_.UnregisterProcessor(kSsrc2,
-                                          &vp_2,
-                                          cricket::MPD_RX));
-  voe_.TriggerProcessPacket(cricket::MPD_RX);
-  EXPECT_TRUE(voe_.IsExternalMediaProcessorRegistered());
-  EXPECT_EQ(1, vp_2.voice_frame_count());
-  EXPECT_EQ(2, vp_1.voice_frame_count());
-
-  EXPECT_TRUE(engine_.UnregisterProcessor(kSsrc2,
-                                          &vp_1,
-                                          cricket::MPD_RX));
-  voe_.TriggerProcessPacket(cricket::MPD_RX);
-  EXPECT_FALSE(voe_.IsExternalMediaProcessorRegistered());
-  EXPECT_EQ(2, vp_1.voice_frame_count());
-
-  EXPECT_FALSE(engine_.RegisterProcessor(kSsrc1, &vp_1, cricket::MPD_RX));
-  EXPECT_TRUE(engine_.RegisterProcessor(kSsrc1, &vp_1, cricket::MPD_TX));
-  voe_.TriggerProcessPacket(cricket::MPD_RX);
-  voe_.TriggerProcessPacket(cricket::MPD_TX);
-  EXPECT_TRUE(voe_.IsExternalMediaProcessorRegistered());
-  EXPECT_EQ(3, vp_1.voice_frame_count());
-
-  EXPECT_TRUE(engine_.UnregisterProcessor(kSsrc1,
-                                          &vp_1,
-                                          cricket::MPD_RX_AND_TX));
-  voe_.TriggerProcessPacket(cricket::MPD_TX);
-  EXPECT_FALSE(voe_.IsExternalMediaProcessorRegistered());
-  EXPECT_EQ(3, vp_1.voice_frame_count());
-  EXPECT_TRUE(channel_->RemoveRecvStream(kSsrc2));
-  EXPECT_FALSE(engine_.RegisterProcessor(kSsrc2, &vp_1, cricket::MPD_RX));
-  EXPECT_FALSE(voe_.IsExternalMediaProcessorRegistered());
-
-  // Test that we can register a processor on the receive channel on SSRC 0.
-  // This tests the 1:1 case when the receive SSRC is unknown.
-  EXPECT_TRUE(engine_.RegisterProcessor(0, &vp_1, cricket::MPD_RX));
-  voe_.TriggerProcessPacket(cricket::MPD_RX);
-  EXPECT_TRUE(voe_.IsExternalMediaProcessorRegistered());
-  EXPECT_EQ(4, vp_1.voice_frame_count());
-  EXPECT_TRUE(engine_.UnregisterProcessor(0,
-                                          &vp_1,
-                                          cricket::MPD_RX));
-
-  // The following tests test that FindChannelNumFromSsrc is doing
-  // what we expect.
-  // pick an invalid ssrc and make sure we can't register
-  EXPECT_FALSE(engine_.RegisterProcessor(99,
-                                         &vp_1,
-                                         cricket::MPD_RX));
-  EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(1)));
-  EXPECT_TRUE(engine_.RegisterProcessor(1,
-                                        &vp_1,
-                                        cricket::MPD_RX));
-  EXPECT_TRUE(engine_.UnregisterProcessor(1,
-                                          &vp_1,
-                                          cricket::MPD_RX));
-  EXPECT_FALSE(engine_.RegisterProcessor(1,
-                                         &vp_1,
-                                         cricket::MPD_TX));
-  EXPECT_TRUE(channel_->RemoveRecvStream(1));
-}
-
 TEST_F(WebRtcVoiceEngineTestFake, SetAudioOptions) {
   EXPECT_TRUE(SetupEngine());
 
   bool ec_enabled;
   webrtc::EcModes ec_mode;
   bool ec_metrics_enabled;
   webrtc::AecmModes aecm_mode;
   bool cng_enabled;
   bool agc_enabled;
   webrtc::AgcModes agc_mode;
@@ skipping 759 matching lines @@
   cricket::WebRtcVoiceEngine engine;
   EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
   rtc::scoped_ptr<webrtc::Call> call(
       webrtc::Call::Create(webrtc::Call::Config()));
   cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::AudioOptions(),
                                            call.get());
   cricket::AudioRecvParameters parameters;
   parameters.codecs = engine.codecs();
   EXPECT_TRUE(channel.SetRecvParameters(parameters));
 }