Make CodecType conversion functions non-optional.

webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc

 /*
  *  Copyright (c) 2016 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/media/engine/videoencodersoftwarefallbackwrapper.h"
 
 #include "webrtc/media/engine/internalencoderfactory.h"
 #include "webrtc/modules/video_coding/include/video_error_codes.h"
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/logging.h"
 #include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace webrtc {
 namespace {
 const char kVp8ForceFallbackEncoderFieldTrial[] =
     "WebRTC-VP8-Forced-Fallback-Encoder";
 
 bool EnableForcedFallback(const cricket::VideoCodec& codec) {
   if (!webrtc::field_trial::IsEnabled(kVp8ForceFallbackEncoderFieldTrial))
     return false;
 
-  return (PayloadNameToCodecType(codec.name).value_or(kVideoCodecUnknown) ==
-          kVideoCodecVP8);
+  return (PayloadStringToCodecType(codec.name) == kVideoCodecVP8);
 }
 
 bool IsForcedFallbackPossible(const VideoCodec& codec_settings) {
   return codec_settings.codecType == kVideoCodecVP8 &&
          codec_settings.numberOfSimulcastStreams <= 1 &&
          codec_settings.VP8().numberOfTemporalLayers == 1;
 }
 
 void GetForcedFallbackParamsFromFieldTrialGroup(uint32_t* param_low_kbps,
                                                 uint32_t* param_high_kbps,
@@ skipping 308 matching lines @@
 }
 
 bool VideoEncoderSoftwareFallbackWrapper::ForcedFallbackParams::ShouldStop(
     uint32_t bitrate_kbps,
     const VideoCodec& codec) const {
   return bitrate_kbps >= high_kbps &&
          (codec.width * codec.height >= kMinPixelsStop);
 }
 
 }  // namespace webrtc