commit cafb497cc14e0f6d1933b8b8814d886081eb8788
author ossu <ossu@webrtc.org> Mon Jan 02 07:00:50 2017 -0800
committer Commit bot <commit-bot@chromium.org> Mon Jan 02 15:00:50 2017 +0000
tree 17acca468274d73a4843bde1bcc8e433c5fcf0a4
parent 7fd1a753005ca93e8bd934a55808a2137b0ad84f

Limit NetEqImpl::ExtractPackets to returning one CNG packet

BUG=chromium:668834

Review-Url: https://codereview.webrtc.org/2609043002
Cr-Commit-Position: refs/heads/master@{#15868}

webrtc/modules/audio_coding/neteq/neteq_impl.cc

diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.cc b/webrtc/modules/audio_coding/neteq/neteq_impl.cc
index 0fcd842..592d284 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_impl.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.cc
@@ -1978,6 +1978,8 @@
       prev_payload_type = packet->payload_type;
     }
 
+    const bool has_cng_packet =
+        decoder_database_->IsComfortNoise(packet->payload_type);
     // Store number of extracted samples.
     size_t packet_duration = 0;
     if (packet->frame) {
@@ -1986,7 +1988,7 @@
       if (packet->priority.codec_level > 0) {
         stats_.SecondaryDecodedSamples(rtc::checked_cast<int>(packet_duration));
       }
-    } else if (!decoder_database_->IsComfortNoise(packet->payload_type)) {
+    } else if (!has_cng_packet) {
       LOG(LS_WARNING) << "Unknown payload type "
                       << static_cast<int>(packet->payload_type);
       RTC_NOTREACHED();
@@ -2005,7 +2007,8 @@
     // Check what packet is available next.
     next_packet = packet_buffer_->PeekNextPacket();
     next_packet_available = false;
-    if (next_packet && prev_payload_type == next_packet->payload_type) {
+    if (next_packet && prev_payload_type == next_packet->payload_type &&
+        !has_cng_packet) {
       int16_t seq_no_diff = next_packet->sequence_number - prev_sequence_number;
       size_t ts_diff = next_packet->timestamp - prev_timestamp;
       if (seq_no_diff == 1 ||