Remove channel ids from various interfaces.

webrtc/voice_engine/test/auto_test/standard/mixing_test.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 17 matching lines @@
 const CodecInst kCodecOpus = {kPayloadType, "opus", 48000, 960, 1, 32000};
 
 }  // namespace
 
 class MixingTest : public AfterInitializationFixture {
  protected:
   MixingTest()
       : output_filename_(test::OutputPath() + "mixing_test_output.pcm") {
   }
   void SetUp() {
-    transport_ = new LoopBackTransport(voe_network_);
+    transport_ = new LoopBackTransport(voe_network_, 0);
   }
   void TearDown() {
     delete transport_;
   }
 
   // Creates and mixes |num_remote_streams| which play a file "as microphone"
   // with |num_local_streams| which play a file "locally", using a constant
   // amplitude of |input_value|. The local streams manifest as "anonymous"
   // mixing participants, meaning they will be mixed regardless of the number
   // of participants. (A stream is a VoiceEngine "channel").
@@ skipping 126 matching lines @@
     codec_inst_stereo.pltype++;
     for (size_t i = num_remote_streams_using_mono; i < streams.size(); ++i) {
       StartRemoteStream(streams[i], codec_inst_stereo, 1234 + 2 * i);
     }
   }
 
   // Start up a single remote stream.
   void StartRemoteStream(int stream, const CodecInst& codec_inst, int port) {
     EXPECT_EQ(0, voe_codec_->SetRecPayloadType(stream, codec_inst));
     EXPECT_EQ(0, voe_network_->RegisterExternalTransport(stream, *transport_));
+    EXPECT_EQ(0, voe_rtp_rtcp_->SetLocalSSRC(
+                     stream, static_cast<unsigned int>(stream)));
+    transport_->AddChannel(stream, stream);
     EXPECT_EQ(0, voe_base_->StartReceive(stream));
     EXPECT_EQ(0, voe_base_->StartPlayout(stream));
     EXPECT_EQ(0, voe_codec_->SetSendCodec(stream, codec_inst));
     EXPECT_EQ(0, voe_base_->StartSend(stream));
     EXPECT_EQ(0, voe_file_->StartPlayingFileAsMicrophone(stream,
         input_filename_.c_str(), true));
   }
 
   void StopRemoteStreams(const std::vector<int>& streams) {
     for (size_t i = 0; i < streams.size(); ++i) {
@@ skipping 81 matching lines @@
 
 TEST_F(MixingTest, VerifyStereoAndMonoMixing) {
   const int16_t kInputValue = 1000;
   const int16_t kExpectedOutput = kInputValue * 2;
   RunMixingTest(2, 0, 1, false, kInputValue, 1.1 * kExpectedOutput,
                 // Lower than 0.9 due to observed flakiness on bots.
                 0.8 * kExpectedOutput, kCodecL16);
 }
 
 }  // namespace webrtc