webrtc/media/engine/webrtcvoiceengine_unittest.cc - Issue 2062193002: Add AudioReceiveStream::SetGain() method and use that in WVoMC::SetOutputVolume().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/media/engine/webrtcvoiceengine_unittest.cc

Issue 2062193002: Add AudioReceiveStream::SetGain() method and use that in WVoMC::SetOutputVolume(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: misc Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/media/engine/webrtcvoiceengine.cc ('K') | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/test/mock_voe_channel_proxy.h » ('j') | webrtc/test/mock_voe_channel_proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/media/engine/webrtcvoiceengine_unittest.cc

diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc

index 8f9b5d4948357bda0fed908d97928316896372ea..5942edc5cbbc89738a051529a15132b8f5f5c006 100644

--- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc

+++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc

@@ -3139,24 +3139,17 @@ TEST_F(WebRtcVoiceEngineTestFake, SetOutputVolume) {

cricket::StreamParams stream;

stream.ssrcs.push_back(kSsrc2);

EXPECT_TRUE(channel_->AddRecvStream(stream));

- int channel_id = voe_.GetLastChannel();

EXPECT_TRUE(channel_->SetOutputVolume(kSsrc2, 3));

- float scale = 0;

- EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));

- EXPECT_DOUBLE_EQ(3, scale);

+ EXPECT_DOUBLE_EQ(3, GetRecvStream(kSsrc2).gain());

kwiberg-webrtc 2016/06/16 09:26:53 Add an EXPECT_ to test the value of .gain() before

the sun 2016/06/16 14:34:06 Done.

}

TEST_F(WebRtcVoiceEngineTestFake, SetOutputVolumeDefaultRecvStream) {

EXPECT_TRUE(SetupChannel());

EXPECT_TRUE(channel_->SetOutputVolume(0, 2));

DeliverPacket(kPcmuFrame, sizeof(kPcmuFrame));

- int channel_id = voe_.GetLastChannel();

- float scale = 0;

- EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));

- EXPECT_DOUBLE_EQ(2, scale);

+ EXPECT_DOUBLE_EQ(2, GetRecvStream(1).gain());

EXPECT_TRUE(channel_->SetOutputVolume(0, 3));

- EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));

- EXPECT_DOUBLE_EQ(3, scale);

+ EXPECT_DOUBLE_EQ(3, GetRecvStream(1).gain());

}

TEST_F(WebRtcVoiceEngineTestFake, SetsSyncGroupFromSyncLabel) {

« webrtc/media/engine/webrtcvoiceengine.cc ('K') | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/test/mock_voe_channel_proxy.h » ('j') | webrtc/test/mock_voe_channel_proxy.h » ('J')