Remove default receive channel from WVoE; baby step 2.

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 2838 matching lines @@
   EXPECT_EQ(rtc::DSCP_DEFAULT, network_interface->dscp());
 }
 
 // Test that GetReceiveChannelId returns the default channel for the first
 // recv stream in 1-1 calls.
 TEST_F(WebRtcVoiceEngineTestFake, TestGetReceiveChannelIdIn1To1Calls) {
   EXPECT_TRUE(SetupEngine());
   cricket::WebRtcVoiceMediaChannel* media_channel =
         static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
   // Test that GetChannelNum returns the default channel if the SSRC is unknown.
-  EXPECT_EQ(media_channel->voe_channel(),
+  EXPECT_EQ(media_channel->default_send_channel_id(),
             media_channel->GetReceiveChannelId(0));
   cricket::StreamParams stream;
   stream.ssrcs.push_back(kSsrc2);
   EXPECT_TRUE(channel_->AddRecvStream(stream));
-  EXPECT_EQ(media_channel->voe_channel(),
+  EXPECT_EQ(media_channel->default_send_channel_id(),
             media_channel->GetReceiveChannelId(kSsrc2));
 }
 
 // Test that GetReceiveChannelId doesn't return the default channel for the
 // first recv stream in conference calls.
 TEST_F(WebRtcVoiceEngineTestFake, TestGetChannelNumInConferenceCalls) {
   EXPECT_TRUE(SetupEngine());
   send_parameters_.options = options_conference_;
   EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
   cricket::StreamParams stream;
   stream.ssrcs.push_back(kSsrc2);
   EXPECT_TRUE(channel_->AddRecvStream(stream));
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
-  EXPECT_LT(media_channel->voe_channel(),
+  EXPECT_LT(media_channel->default_send_channel_id(),
             media_channel->GetReceiveChannelId(kSsrc2));
 }
 
 TEST_F(WebRtcVoiceEngineTestFake, SetOutputVolume) {
   EXPECT_TRUE(SetupEngine());
   float scale;
   EXPECT_TRUE(channel_->SetOutputVolume(0, 2));
   int channel_id = voe_.GetLastChannel();
   EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));
   EXPECT_DOUBLE_EQ(2, scale);
@@ skipping 184 matching lines @@
   EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(1)));
   int recv_ch = voe_.GetLastChannel();
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), -1);
 }
 
 // This test is an extension of AssociateChannelUnset1On1. We create two receive
 // channels. The second should be associated with the default channel, since it
 // does not send RTCP SR.
 TEST_F(WebRtcVoiceEngineTestFake, AssociateDefaultChannelOnSecondRecvChannel) {
   EXPECT_TRUE(SetupEngine());
-  cricket::WebRtcVoiceMediaChannel* media_channel =
-      static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
-  int default_channel = media_channel->voe_channel();
+  int default_channel = voe_.GetLastChannel();
   EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(1)));
   int recv_ch_1 = voe_.GetLastChannel();
   EXPECT_EQ(recv_ch_1, default_channel);
   EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(2)));
   int recv_ch_2 = voe_.GetLastChannel();
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch_1), -1);
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch_2), default_channel);
   // Add send stream, the association remains.
   EXPECT_TRUE(channel_->AddSendStream(cricket::StreamParams::CreateLegacy(3)));
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch_1), -1);
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch_2), default_channel);
 }
 
 // In conference mode, all receive channels should be associated with the
 // default channel, since they do not send RTCP SR.
 TEST_F(WebRtcVoiceEngineTestFake, AssociateDefaultChannelOnConference) {
   EXPECT_TRUE(SetupEngine());
   send_parameters_.options = options_conference_;
   EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
-  cricket::WebRtcVoiceMediaChannel* media_channel =
-      static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
-  int default_channel = media_channel->voe_channel();
+  int default_channel = voe_.GetLastChannel();
   EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(1)));
   int recv_ch = voe_.GetLastChannel();
   EXPECT_NE(recv_ch, default_channel);
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), default_channel);
   EXPECT_TRUE(channel_->AddSendStream(cricket::StreamParams::CreateLegacy(2)));
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), default_channel);
 }
 
 TEST_F(WebRtcVoiceEngineTestFake, AssociateChannelResetUponDeleteChannnel) {
   EXPECT_TRUE(SetupEngine());
@@ skipping 159 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));
 }