Revert of Initialize/configure video encoders asychronously.

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 21 matching lines @@
 
 static const int kMinVideoBitrate = 100;
 static const int kStartVideoBitrate = 300;
 static const int kMaxVideoBitrate = 1000;
 
 // WebRtc channel id and capture id share the same number space.
 // This is how AddRenderer(renderId, ...) is able to tell if it is adding a
 // renderer for a channel or it is adding a renderer for a capturer.
 static const int kViEChannelIdBase = 0;
 static const int kViEChannelIdMax = 1000;
-static const int kEventTimeoutMs = 10000;
 
 // Fake class for mocking out webrtc::VideoDecoder
 class FakeWebRtcVideoDecoder : public webrtc::VideoDecoder {
  public:
-  FakeWebRtcVideoDecoder() : num_frames_received_(0) {}
+  FakeWebRtcVideoDecoder()
+      : num_frames_received_(0) {
+  }
 
   virtual int32_t InitDecode(const webrtc::VideoCodec*, int32_t) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   virtual int32_t Decode(const webrtc::EncodedImage&,
                          bool,
                          const webrtc::RTPFragmentationHeader*,
                          const webrtc::CodecSpecificInfo*,
                          int64_t) {
@@ skipping 55 matching lines @@
 
  private:
   std::set<webrtc::VideoCodecType> supported_codec_types_;
   std::vector<FakeWebRtcVideoDecoder*> decoders_;
   int num_created_decoders_;
 };
 
 // Fake class for mocking out webrtc::VideoEnoder
 class FakeWebRtcVideoEncoder : public webrtc::VideoEncoder {
  public:
-  FakeWebRtcVideoEncoder()
-      : init_encode_event_(false, false), num_frames_encoded_(0) {}
+  FakeWebRtcVideoEncoder() : num_frames_encoded_(0) {}
 
   virtual int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
                              int32_t numberOfCores,
                              size_t maxPayloadSize) {
     rtc::CritScope lock(&crit_);
     codec_settings_ = *codecSettings;
-    init_encode_event_.Set();
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
-  bool WaitForInitEncode() { return init_encode_event_.Wait(kEventTimeoutMs); }
-
   webrtc::VideoCodec GetCodecSettings() {
     rtc::CritScope lock(&crit_);
     return codec_settings_;
   }
 
   virtual int32_t Encode(const webrtc::VideoFrame& inputImage,
                          const webrtc::CodecSpecificInfo* codecSpecificInfo,
                          const std::vector<webrtc::FrameType>* frame_types) {
     rtc::CritScope lock(&crit_);
     ++num_frames_encoded_;
-    init_encode_event_.Set();
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   virtual int32_t RegisterEncodeCompleteCallback(
       webrtc::EncodedImageCallback* callback) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   virtual int32_t Release() { return WEBRTC_VIDEO_CODEC_OK; }
 
   virtual int32_t SetChannelParameters(uint32_t packetLoss, int64_t rtt) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   virtual int32_t SetRates(uint32_t newBitRate, uint32_t frameRate) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   int GetNumEncodedFrames() {
     rtc::CritScope lock(&crit_);
     return num_frames_encoded_;
   }
 
  private:
   rtc::CriticalSection crit_;
-  rtc::Event init_encode_event_;
   int num_frames_encoded_ GUARDED_BY(crit_);
   webrtc::VideoCodec codec_settings_ GUARDED_BY(crit_);
 };
 
 // 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) {}
+      : num_created_encoders_(0), encoders_have_internal_sources_(false) {}
 
   virtual webrtc::VideoEncoder* CreateVideoEncoder(
       webrtc::VideoCodecType type) {
-    rtc::CritScope lock(&crit_);
     if (supported_codec_types_.count(type) == 0) {
       return NULL;
     }
     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;
-  }
-
   virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) {
-    rtc::CritScope lock(&crit_);
     encoders_.erase(
         std::remove(encoders_.begin(), encoders_.end(), encoder),
         encoders_.end());
     delete encoder;
   }
 
   virtual const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs()
       const {
     return codecs_;
   }
 
   virtual 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));
   }
 
   int GetNumCreatedEncoders() {
-    rtc::CritScope lock(&crit_);
     return num_created_encoders_;
   }
 
-  const std::vector<FakeWebRtcVideoEncoder*> encoders() {
-    rtc::CritScope lock(&crit_);
+  const std::vector<FakeWebRtcVideoEncoder*>& encoders() {
     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<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_);
-  int num_created_encoders_ GUARDED_BY(crit_);
+  std::vector<FakeWebRtcVideoEncoder*> encoders_;
+  int num_created_encoders_;
   bool encoders_have_internal_sources_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_