aboutsummaryrefslogtreecommitdiff
path: root/talk/app/webrtc/webrtcsession_unittest.cc
diff options
context:
space:
mode:
authorsolenberg <solenberg@webrtc.org>2015-10-09 02:32:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-09 09:32:58 +0000
commit4bac9c53da9988741d59753c2d789adb94de5e68 (patch)
tree6f337e69968b1b4ca773e27c577451f064e23e25 /talk/app/webrtc/webrtcsession_unittest.cc
parent0b67546d8c080f376565a4c1cedd14947fdbaf2b (diff)
downloadwebrtc-4bac9c53da9988741d59753c2d789adb94de5e68.tar.gz
Change SetOutputScaling to set a single level, not left/right levels.
BUG=webrtc:4690 Review URL: https://codereview.webrtc.org/1397773002 Cr-Commit-Position: refs/heads/master@{#10234}
Diffstat (limited to 'talk/app/webrtc/webrtcsession_unittest.cc')
-rw-r--r--talk/app/webrtc/webrtcsession_unittest.cc17
1 files changed, 7 insertions, 10 deletions
diff --git a/talk/app/webrtc/webrtcsession_unittest.cc b/talk/app/webrtc/webrtcsession_unittest.cc
index 2853ca43a7..ab8c14cb26 100644
--- a/talk/app/webrtc/webrtcsession_unittest.cc
+++ b/talk/app/webrtc/webrtcsession_unittest.cc
@@ -3108,20 +3108,17 @@ TEST_F(WebRtcSessionTest, SetAudioPlayout) {
ASSERT_TRUE(channel != NULL);
ASSERT_EQ(1u, channel->recv_streams().size());
uint32_t receive_ssrc = channel->recv_streams()[0].first_ssrc();
- double left_vol, right_vol;
- EXPECT_TRUE(channel->GetOutputScaling(receive_ssrc, &left_vol, &right_vol));
- EXPECT_EQ(1, left_vol);
- EXPECT_EQ(1, right_vol);
+ double volume;
+ EXPECT_TRUE(channel->GetOutputVolume(receive_ssrc, &volume));
+ EXPECT_EQ(1, volume);
rtc::scoped_ptr<FakeAudioRenderer> renderer(new FakeAudioRenderer());
session_->SetAudioPlayout(receive_ssrc, false, renderer.get());
- EXPECT_TRUE(channel->GetOutputScaling(receive_ssrc, &left_vol, &right_vol));
- EXPECT_EQ(0, left_vol);
- EXPECT_EQ(0, right_vol);
+ EXPECT_TRUE(channel->GetOutputVolume(receive_ssrc, &volume));
+ EXPECT_EQ(0, volume);
EXPECT_EQ(0, renderer->channel_id());
session_->SetAudioPlayout(receive_ssrc, true, NULL);
- EXPECT_TRUE(channel->GetOutputScaling(receive_ssrc, &left_vol, &right_vol));
- EXPECT_EQ(1, left_vol);
- EXPECT_EQ(1, right_vol);
+ EXPECT_TRUE(channel->GetOutputVolume(receive_ssrc, &volume));
+ EXPECT_EQ(1, volume);
EXPECT_EQ(-1, renderer->channel_id());
}