AudioCodingModule: Specify decoders using SdpAudioFormat

webrtc/modules/audio_coding/neteq/neteq_impl.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 261 matching lines @@
         error_code_ = kInvalidPointer;
         break;
       default:
         error_code_ = kOtherError;
     }
     return kFail;
   }
   return kOK;
 }
 
+bool NetEqImpl::RegisterPayloadType(int rtp_payload_type,
+                                    const SdpAudioFormat& audio_format) {
+  LOG(LS_VERBOSE) << "NetEqImpl::RegisterPayloadType: payload type "
+                  << rtp_payload_type << ", codec " << audio_format;
+  rtc::CritScope lock(&crit_sect_);
+  switch (decoder_database_->RegisterPayload(rtp_payload_type, audio_format)) {
+    case DecoderDatabase::kOK:

[ossu, 2016/09/28 14:12:28]

Ugh! I really dislike this construct (though it's not like you introduced it).
Why do we have separate sets of error codes where one set (the one from
DecoderDatabase in this case) is a subset of the other (the one from NetEq)? Why
doesn't DecoderDatabase just return one of the NetEq error codes? To top it all
off: why do these methods return int rather than an appropriate enum?

[kwiberg-webrtc, 2016/09/29 12:38:35]

Acknowledged.

[ossu, 2016/10/03 09:16:00]

Good! :)

+      return true;
+    case DecoderDatabase::kInvalidRtpPayloadType:
+      error_code_ = kInvalidRtpPayloadType;
+      return false;
+    case DecoderDatabase::kCodecNotSupported:
+      error_code_ = kCodecNotSupported;
+      return false;
+    case DecoderDatabase::kDecoderExists:
+      error_code_ = kDecoderExists;
+      return false;
+    case DecoderDatabase::kInvalidSampleRate:
+      error_code_ = kInvalidSampleRate;
+      return false;
+    case DecoderDatabase::kInvalidPointer:
+      error_code_ = kInvalidPointer;
+      return false;
+    default:
+      error_code_ = kOtherError;
+      return false;
+  }
+}
+
 int NetEqImpl::RemovePayloadType(uint8_t rtp_payload_type) {
   rtc::CritScope lock(&crit_sect_);
   int ret = decoder_database_->Remove(rtp_payload_type);
   if (ret == DecoderDatabase::kOK) {
     packet_buffer_->DiscardPacketsWithPayloadType(rtp_payload_type);
     return kOK;
   } else if (ret == DecoderDatabase::kDecoderNotFound) {
     error_code_ = kDecoderNotFound;
   } else {
     error_code_ = kOtherError;
@@ skipping 1817 matching lines @@
   }
 }
 
 void NetEqImpl::CreateDecisionLogic() {
   decision_logic_.reset(DecisionLogic::Create(
       fs_hz_, output_size_samples_, playout_mode_, decoder_database_.get(),
       *packet_buffer_.get(), delay_manager_.get(), buffer_level_filter_.get(),
       tick_timer_.get()));
 }
 }  // namespace webrtc