Replace WebRtcVideoEncoderFactory::VideoCodec with cricket::VideoCodec

webrtc/media/engine/fakewebrtcvideoengine.h

 /*
  *  Copyright (c) 2010 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 175 matching lines @@
 
 // Fake class for mocking out WebRtcVideoEncoderFactory.
 class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory {
  public:
   FakeWebRtcVideoEncoderFactory()
       : created_video_encoder_event_(false, false),
         num_created_encoders_(0),
         encoders_have_internal_sources_(false) {}
 
   webrtc::VideoEncoder* CreateVideoEncoder(
-      webrtc::VideoCodecType type) override {
+      const cricket::VideoCodec& codec) override {
     rtc::CritScope lock(&crit_);
-    if (supported_codec_types_.count(type) == 0) {
-      return NULL;
+    bool found_matching_codec = false;
+    for (const cricket::VideoCodec& supported_codec : codecs_) {
+      if (supported_codec.Matches(codec)) {
+        found_matching_codec = true;
+        break;
+      }
     }
+    if (!found_matching_codec)
+      return nullptr;
     FakeWebRtcVideoEncoder* encoder = new FakeWebRtcVideoEncoder();
     encoders_.push_back(encoder);
     num_created_encoders_++;
     created_video_encoder_event_.Set();
     return encoder;
   }
 
   bool WaitForCreatedVideoEncoders(int num_encoders) {
     while (created_video_encoder_event_.Wait(kEventTimeoutMs)) {
       if (GetNumCreatedEncoders() >= num_encoders)
         return true;
     }
     return false;
   }
 
   void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override {
     rtc::CritScope lock(&crit_);
     encoders_.erase(
         std::remove(encoders_.begin(), encoders_.end(), encoder),
         encoders_.end());
     delete encoder;
   }
 
-  const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs()
-      const override {
+  const std::vector<cricket::VideoCodec>& supported_codecs() const override {
     return codecs_;
   }
 
   bool EncoderTypeHasInternalSource(
       webrtc::VideoCodecType type) const override {
     return encoders_have_internal_sources_;
   }
 
   void set_encoders_have_internal_sources(bool internal_source) {
     encoders_have_internal_sources_ = internal_source;
   }
 
-  void AddSupportedVideoCodecType(webrtc::VideoCodecType type,
-                                  const std::string& name) {
-    supported_codec_types_.insert(type);
-    codecs_.push_back(
-        WebRtcVideoEncoderFactory::VideoCodec(type, name, 1280, 720, 30));
+  void AddSupportedVideoCodecType(const std::string& name) {
+    codecs_.push_back(cricket::VideoCodec(name));
   }
 
   int GetNumCreatedEncoders() {
     rtc::CritScope lock(&crit_);
     return num_created_encoders_;
   }
 
   const std::vector<FakeWebRtcVideoEncoder*> encoders() {
     rtc::CritScope lock(&crit_);
     return encoders_;
   }
 
  private:
   rtc::CriticalSection crit_;
   rtc::Event created_video_encoder_event_;
-  std::set<webrtc::VideoCodecType> supported_codec_types_;
-  std::vector<WebRtcVideoEncoderFactory::VideoCodec> codecs_;
+  std::vector<cricket::VideoCodec> codecs_;
   std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_);
   int num_created_encoders_ GUARDED_BY(crit_);
   bool encoders_have_internal_sources_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_