Make FakeEncoder and FakeH264Encoder thread safe.

webrtc/test/fake_encoder.h

 /*
  *  Copyright (c) 2013 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 29 matching lines @@
       EncodedImageCallback* callback) override;
   int32_t Release() override;
   int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
   int32_t SetRateAllocation(const BitrateAllocation& rate_allocation,
                             uint32_t framerate) override;
   const char* ImplementationName() const override;
 
   static const char* kImplementationName;
 
  protected:
+  rtc::CriticalSection crit_sect_;
   Clock* const clock_;
-  VideoCodec config_;
-  EncodedImageCallback* callback_;
-  BitrateAllocation target_bitrate_;
-  int max_target_bitrate_kbps_;
-  int64_t last_encode_time_ms_;
+  VideoCodec config_ GUARDED_BY(crit_sect_);
+  EncodedImageCallback* callback_ GUARDED_BY(crit_sect_);
+  BitrateAllocation target_bitrate_ GUARDED_BY(crit_sect_);
+  int max_target_bitrate_kbps_ GUARDED_BY(crit_sect_);
+  int64_t last_encode_time_ms_ GUARDED_BY(crit_sect_);
   uint8_t encoded_buffer_[100000];
 };
 
 class FakeH264Encoder : public FakeEncoder, public EncodedImageCallback {
  public:
   explicit FakeH264Encoder(Clock* clock);
   virtual ~FakeH264Encoder() {}
 
   int32_t RegisterEncodeCompleteCallback(
       EncodedImageCallback* callback) override;
 
   Result OnEncodedImage(const EncodedImage& encodedImage,
                         const CodecSpecificInfo* codecSpecificInfo,
                         const RTPFragmentationHeader* fragments) override;
 
  private:
-  EncodedImageCallback* callback_;
-  int idr_counter_;
+  rtc::CriticalSection local_crit_sect_;
+  EncodedImageCallback* callback_ GUARDED_BY(local_crit_sect_);
+  int idr_counter_ GUARDED_BY(local_crit_sect_);
 };
 
 class DelayedEncoder : public test::FakeEncoder {
  public:
   DelayedEncoder(Clock* clock, int delay_ms);
   virtual ~DelayedEncoder() {}
 
   void SetDelay(int delay_ms);
   int32_t Encode(const VideoFrame& input_image,
                  const CodecSpecificInfo* codec_specific_info,
                  const std::vector<FrameType>* frame_types) override;
 
  private:
-  rtc::CriticalSection lock_;
-  int delay_ms_ GUARDED_BY(&lock_);
+  rtc::CriticalSection local_crit_sect_;
+  int delay_ms_ GUARDED_BY(&local_crit_sect_);
 };
 
 // This class implements a multi-threaded fake encoder by posting
 // FakeH264Encoder::Encode(.) tasks to |queue1_| and |queue2_|, in an
 // alternating fashion.
-class MultiThreadedFakeH264Encoder : public test::FakeH264Encoder {
+class MultithreadedFakeH264Encoder : public test::FakeH264Encoder {
  public:
-  MultiThreadedFakeH264Encoder(Clock* clock);
-  virtual ~MultiThreadedFakeH264Encoder() override;
+  explicit MultithreadedFakeH264Encoder(Clock* clock);
+  virtual ~MultithreadedFakeH264Encoder() override;
 
   int32_t Encode(const VideoFrame& input_image,
                  const CodecSpecificInfo* codec_specific_info,
                  const std::vector<FrameType>* frame_types) override;
 
   int32_t EncodeCallback(const VideoFrame& input_image,
                          const CodecSpecificInfo* codec_specific_info,
                          const std::vector<FrameType>* frame_types);
 
  protected:
   class EncodeTask;
 
   int current_queue_;
   rtc::TaskQueue queue1_;
   rtc::TaskQueue queue2_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_FAKE_ENCODER_H_