| Index: talk/media/webrtc/webrtcvoiceengine_unittest.cc
|
| diff --git a/talk/media/webrtc/webrtcvoiceengine_unittest.cc b/talk/media/webrtc/webrtcvoiceengine_unittest.cc
|
| index 70318d14f72c5cbaada7e39359a9eb5f6e3fe969..97abede502a32e384e251d46b7b597d04dafe5d5 100644
|
| --- a/talk/media/webrtc/webrtcvoiceengine_unittest.cc
|
| +++ b/talk/media/webrtc/webrtcvoiceengine_unittest.cc
|
| @@ -2899,25 +2899,21 @@ TEST_F(WebRtcVoiceEngineTestFake, TestGetChannelNumInConferenceCalls) {
|
|
|
| TEST_F(WebRtcVoiceEngineTestFake, SetOutputScaling) {
|
| EXPECT_TRUE(SetupEngine());
|
| - float scale, left, right;
|
| - EXPECT_TRUE(channel_->SetOutputScaling(0, 1, 2));
|
| + float scale;
|
| + EXPECT_TRUE(channel_->SetOutputScaling(0, 2));
|
| int channel_id = voe_.GetLastChannel();
|
| EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));
|
| - EXPECT_EQ(0, voe_.GetOutputVolumePan(channel_id, left, right));
|
| - EXPECT_DOUBLE_EQ(1, left * scale);
|
| - EXPECT_DOUBLE_EQ(2, right * scale);
|
| + EXPECT_DOUBLE_EQ(2, scale);
|
|
|
| - EXPECT_FALSE(channel_->SetOutputScaling(kSsrc2, 1, 2));
|
| + EXPECT_FALSE(channel_->SetOutputScaling(kSsrc2, 0.5));
|
| cricket::StreamParams stream;
|
| stream.ssrcs.push_back(kSsrc2);
|
| EXPECT_TRUE(channel_->AddRecvStream(stream));
|
|
|
| - EXPECT_TRUE(channel_->SetOutputScaling(kSsrc2, 2, 1));
|
| + EXPECT_TRUE(channel_->SetOutputScaling(kSsrc2, 3));
|
| channel_id = voe_.GetLastChannel();
|
| EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));
|
| - EXPECT_EQ(0, voe_.GetOutputVolumePan(channel_id, left, right));
|
| - EXPECT_DOUBLE_EQ(2, left * scale);
|
| - EXPECT_DOUBLE_EQ(1, right * scale);
|
| + EXPECT_DOUBLE_EQ(3, scale);
|
| }
|
|
|
| TEST_F(WebRtcVoiceEngineTestFake, SetsSyncGroupFromSyncLabel) {
|
|
|