webrtc/modules/audio_coding/main/test/TestVADDTX.cc - Issue 1406123011: Let AudioCodingModule::SendCodec return Maybe<CodecInst>

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/modules/audio_coding/main/test/TestVADDTX.cc

Issue 1406123011: Let AudioCodingModule::SendCodec return Maybe<CodecInst> (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: review fix Created 5 years, 1 month 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

« no previous file with comments | « webrtc/modules/audio_coding/main/test/TestStereo.cc ('k') | webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/main/test/TestVADDTX.cc

diff --git a/webrtc/modules/audio_coding/main/test/TestVADDTX.cc b/webrtc/modules/audio_coding/main/test/TestVADDTX.cc

index bd0335a5f39399662638e6706000296b08611dbf..bba7b91c40e93a47257d8ff8de5ff98615b14ef3 100644

--- a/webrtc/modules/audio_coding/main/test/TestVADDTX.cc

+++ b/webrtc/modules/audio_coding/main/test/TestVADDTX.cc

@@ -209,9 +209,9 @@ void TestWebRtcVadDtx::SetVAD(bool enable_dtx, bool enable_vad,

EXPECT_EQ(0, acm_send_->SetVAD(enable_dtx, enable_vad, vad_mode));

EXPECT_EQ(0, acm_send_->VAD(&dtx_enabled_, &vad_enabled_, &mode));

- CodecInst codec_param;

- acm_send_->SendCodec(&codec_param);

- if (STR_CASE_CMP(codec_param.plname, "opus") == 0) {

+ auto codec_param = acm_send_->SendCodec();

+ ASSERT_TRUE(codec_param);

+ if (STR_CASE_CMP(codec_param->plname, "opus") == 0) {

// If send codec is Opus, WebRTC VAD/DTX cannot be used.

enable_dtx = enable_vad = false;

}