NetEq: only update current_rtp_payload_type_ when validated

webrtc/modules/audio_coding/neteq/neteq_impl.cc

Index: 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 e65466f6d83a28081d909fc3c49e8c69bc66dc69..a4db67bb7f68b1652c40540580e96876690ebccd 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_impl.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.cc
@@ -598,7 +598,6 @@ int NetEqImpl::InsertPacketInternal(const WebRtcRTPHeader& rtp_header,
 
     // Update codecs.
     timestamp_ = main_header.timestamp;
-    current_rtp_payload_type_ = main_header.payloadType;
 
     // Reset timestamp scaling.
     timestamp_scaler_->Reset();
@@ -747,9 +746,9 @@ int NetEqImpl::InsertPacketInternal(const WebRtcRTPHeader& rtp_header,
   if (current_rtp_payload_type_ != 0xFF) {

[ivoc, 2016/08/24 15:18:01]

I was wondering if it makes sense to turn this whole if-statement into a DCHECK,
something like RTC_DCHECK(current_rtp_payload_type_ == 0xFF ||
decoder_database_->GetDecoderInfo(current_rtp_payload_type_)), WDYT?

[hlundin-webrtc, 2016/08/24 15:35:24]

Good idea. Done.

     const DecoderDatabase::DecoderInfo* dec_info =
         decoder_database_->GetDecoderInfo(current_rtp_payload_type_);
-    if (!dec_info) {
-      assert(false);  // Already checked that the payload type is known.
-    }
+    RTC_DCHECK(dec_info) << "Payload type "
+                         << static_cast<int>(current_rtp_payload_type_)
+                         << " is unknown where it shouldn't be";
   }
 
   if (update_sample_rate_and_channels && !packet_buffer_->Empty()) {