webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc - Issue 1868143002: Convert CNG into C++ and remove it from AudioDecoder

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/neteq/decoder_database_unittest.cc

Issue 1868143002: Convert CNG into C++ and remove it from AudioDecoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fixed a few show-stopping (albeit small) compiler complaints Created 4 years, 8 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/modules/audio_coding/codecs/cng/cng_unittest.cc ('K') | « webrtc/modules/audio_coding/neteq/decoder_database.cc ('k') | webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h » ('j') | webrtc/modules/audio_coding/neteq/test/RTPencode.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc

diff --git a/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc

index 85aaef11431490a9ded7a0dec1c9c5f21309c278..60cfb0d4b7da2e9e0cf84f801393960260dd144a 100644

--- a/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc

+++ b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc

@@ -233,8 +233,8 @@ TEST(DecoderDatabase, IF_ISAC(ActiveDecoders)) {

// Set active CNG codec.

EXPECT_EQ(DecoderDatabase::kOK, db.SetActiveCngDecoder(13));

- decoder = db.GetActiveCngDecoder();

- ASSERT_FALSE(decoder == NULL); // Should get a decoder here.

+ ComfortNoiseDecoder* cng = db.GetActiveCngDecoder();

+ ASSERT_FALSE(cng == NULL); // Should get a decoder here.

// Remove the active CNG decoder, and verify that the active becomes NULL.

EXPECT_EQ(DecoderDatabase::kOK, db.Remove(13));