Stopped using the NetEqDecoder enum internally in NetEq.

webrtc/modules/audio_coding/neteq/timestamp_scaler.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 27 matching lines @@
                                      uint8_t rtp_payload_type) {
   const DecoderDatabase::DecoderInfo* info =
       decoder_database_.GetDecoderInfo(rtp_payload_type);
   if (!info) {
     // Payload type is unknown. Do not scale.
     return external_timestamp;
   }
   if (!(info->IsComfortNoise() || info->IsDtmf())) {
     // Do not change the timestamp scaling settings for DTMF or CNG.
     numerator_ = info->SampleRateHz();
-    if (info->codec_type == NetEqDecoder::kDecoderArbitrary) {
-      // We have no format mapping for "arbitrary" external codecs, so we cannot
-      // support timestamp scaling of them.
+    if (info->GetFormat().clockrate_hz == 0) {
+      // If the clockrate is invalid (i.e. with an old-style external codec)
+      // we cannot do any timestamp scaling.

[kwiberg-webrtc, 2016/09/22 12:23:48]

Excellent.

       denominator_ = numerator_;
     } else {
       denominator_ = info->GetFormat().clockrate_hz;
     }
   }
   if (numerator_ != denominator_) {
     // We have a scale factor != 1.
     if (!first_packet_received_) {
       external_ref_ = external_timestamp;
       internal_ref_ = external_timestamp;
@@ skipping 18 matching lines @@
   } else {
     const int64_t internal_diff = int64_t{internal_timestamp} - internal_ref_;
     assert(numerator_ > 0);  // Should not be possible.
     // Do not update references in this method.
     // Switch |denominator_| and |numerator_| to convert the other way.
     return external_ref_ + (internal_diff * denominator_) / numerator_;
   }
 }
 
 }  // namespace webrtc