webrtc/modules/audio_coding/neteq/payload_splitter.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/payload_splitter.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.

Jump to:

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

« webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc ('K') | « webrtc/modules/audio_coding/neteq/normal.cc ('k') | webrtc/modules/audio_coding/neteq/test/RTPencode.cc » ('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/payload_splitter.cc

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

index 8530718134160341fff8519042f7b35f87d28fc5..542863970b31b216a563f388600eaad2b2a34f54 100644

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

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

@@ -143,8 +143,9 @@ int PayloadSplitter::SplitFec(PacketList* packet_list,

// Not an FEC packet.

AudioDecoder* decoder = decoder_database->GetDecoder(payload_type);

- // decoder should not return NULL.

- assert(decoder != NULL);

+ // decoder should not return NULL, except for comfort noise payloads which

+ // are handled separately.

+ assert(decoder != NULL || decoder_database->IsComfortNoise(payload_type));

if (!decoder ||

!decoder->PacketHasFec(packet->payload, packet->payload_length)) {

++it;