CodecOwner::SetEncoders: Return error code when given bad arguments

webrtc/modules/audio_coding/main/acm2/codec_owner.cc

 /*
  *  Copyright (c) 2015 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.
  */
 
 #include "webrtc/modules/audio_coding/main/acm2/codec_owner.h"
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h"
 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_decoder_isacfix.h"
 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_isacfix.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_decoder_isac.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_isac.h"
 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h"
@@ skipping 74 matching lines @@
 #if defined(WEBRTC_CODEC_ISACFX)
   return rtc_make_scoped_ptr(new AudioEncoderIsacFix(speech_inst, bwinfo));
 #elif defined(WEBRTC_CODEC_ISAC)
   return rtc_make_scoped_ptr(new AudioEncoderIsac(speech_inst, bwinfo));
 #else
   FATAL() << "iSAC is not supported.";
   return rtc::scoped_ptr<AudioEncoderMutable>();
 #endif
 }
 
+// Returns a new speech encoder, or null on error.
+// TODO(kwiberg): Don't handle errors here (bug 5033)
 rtc::scoped_ptr<AudioEncoder> CreateSpeechEncoder(
     const CodecInst& speech_inst,
     LockedIsacBandwidthInfo* bwinfo) {
   if (IsIsac(speech_inst)) {
     return CreateIsacEncoder(speech_inst, bwinfo);
   } else if (IsOpus(speech_inst)) {
     return rtc_make_scoped_ptr(new AudioEncoderOpus(speech_inst));
   } else if (IsPcmU(speech_inst)) {
     return rtc_make_scoped_ptr(new AudioEncoderPcmU(speech_inst));
   } else if (IsPcmA(speech_inst)) {
     return rtc_make_scoped_ptr(new AudioEncoderPcmA(speech_inst));
   } else if (IsPcm16B(speech_inst)) {
     return rtc_make_scoped_ptr(new AudioEncoderPcm16B(speech_inst));
   } else if (IsIlbc(speech_inst)) {
     return rtc_make_scoped_ptr(new AudioEncoderIlbc(speech_inst));
   } else if (IsG722(speech_inst)) {
     return rtc_make_scoped_ptr(new AudioEncoderG722(speech_inst));
   } else {
-    FATAL() << "Could not create encoder of type " << speech_inst.plname;
+    LOG_F(LS_ERROR) << "Could not create encoder of type "
+                    << speech_inst.plname;
     return rtc::scoped_ptr<AudioEncoder>();
   }
 }
 
 AudioEncoder* CreateRedEncoder(int red_payload_type,
                                AudioEncoder* encoder,
                                rtc::scoped_ptr<AudioEncoder>* red_encoder) {
   if (red_payload_type == -1) {
     red_encoder->reset();
     return encoder;
@@ skipping 30 matching lines @@
     case VADVeryAggr:
       config.vad_mode = Vad::kVadVeryAggressive;
       break;
     default:
       FATAL();
   }
   cng_encoder->reset(new AudioEncoderCng(config));
 }
 }  // namespace
 
-void CodecOwner::SetEncoders(const CodecInst& speech_inst,
+bool CodecOwner::SetEncoders(const CodecInst& speech_inst,
                              int cng_payload_type,
                              ACMVADMode vad_mode,
                              int red_payload_type) {
   speech_encoder_ = CreateSpeechEncoder(speech_inst, &isac_bandwidth_info_);
+  if (!speech_encoder_)
+    return false;
   external_speech_encoder_ = nullptr;
   ChangeCngAndRed(cng_payload_type, vad_mode, red_payload_type);
+  return true;
 }
 
 void CodecOwner::SetEncoders(AudioEncoder* external_speech_encoder,
                              int cng_payload_type,
                              ACMVADMode vad_mode,
                              int red_payload_type) {
   external_speech_encoder_ = external_speech_encoder;
   speech_encoder_.reset();
   ChangeCngAndRed(cng_payload_type, vad_mode, red_payload_type);
 }
@@ skipping 38 matching lines @@
 }
 
 const AudioEncoder* CodecOwner::SpeechEncoder() const {
   RTC_DCHECK(!speech_encoder_ || !external_speech_encoder_);
   return external_speech_encoder_ ? external_speech_encoder_
                                   : speech_encoder_.get();
 }
 
 }  // namespace acm2
 }  // namespace webrtc