Do not encode frames in MultithreadedFakeH264Encoder after Release().

webrtc/test/fake_encoder.h

Index: webrtc/test/fake_encoder.h
diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h
index 39c3e3e67f599d50eb9ed404aa6634e3c75d480c..c07fbb36e1c49088e343d0f048b90359e0f651f1 100644
--- a/webrtc/test/fake_encoder.h
+++ b/webrtc/test/fake_encoder.h
@@ -12,8 +12,10 @@
 #define WEBRTC_TEST_FAKE_ENCODER_H_
 
 #include <vector>
+#include <memory>
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/sequenced_task_checker.h"
 #include "webrtc/base/task_queue.h"
 #include "webrtc/common_types.h"
 #include "webrtc/system_wrappers/include/clock.h"
@@ -25,7 +27,7 @@ namespace test {
 class FakeEncoder : public VideoEncoder {
  public:
   explicit FakeEncoder(Clock* clock);
-  virtual ~FakeEncoder();
+  virtual ~FakeEncoder() = default;
 
   // Sets max bitrate. Not thread-safe, call before registering the encoder.
   void SetMaxBitrate(int max_kbps);
@@ -47,20 +49,21 @@ class FakeEncoder : public VideoEncoder {
   static const char* kImplementationName;
 
  protected:
-  rtc::CriticalSection crit_sect_;
   Clock* const clock_;
   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_);
+  rtc::CriticalSection crit_sect_;
+
   uint8_t encoded_buffer_[100000];
 };
 
 class FakeH264Encoder : public FakeEncoder, public EncodedImageCallback {
  public:
   explicit FakeH264Encoder(Clock* clock);
-  virtual ~FakeH264Encoder() {}
+  virtual ~FakeH264Encoder() = default;
 
   int32_t RegisterEncodeCompleteCallback(
       EncodedImageCallback* callback) override;
@@ -70,15 +73,15 @@ class FakeH264Encoder : public FakeEncoder, public EncodedImageCallback {
                         const RTPFragmentationHeader* fragments) override;
 
  private:
-  rtc::CriticalSection local_crit_sect_;
   EncodedImageCallback* callback_ GUARDED_BY(local_crit_sect_);
   int idr_counter_ GUARDED_BY(local_crit_sect_);
+  rtc::CriticalSection local_crit_sect_;
 };
 
 class DelayedEncoder : public test::FakeEncoder {
  public:
   DelayedEncoder(Clock* clock, int delay_ms);
-  virtual ~DelayedEncoder() {}
+  virtual ~DelayedEncoder() = default;
 
   void SetDelay(int delay_ms);
   int32_t Encode(const VideoFrame& input_image,
@@ -86,17 +89,22 @@ class DelayedEncoder : public test::FakeEncoder {
                  const std::vector<FrameType>* frame_types) override;
 
  private:
-  rtc::CriticalSection local_crit_sect_;
-  int delay_ms_ GUARDED_BY(&local_crit_sect_);
+  int delay_ms_ ACCESS_ON(sequence_checker_);
+  rtc::SequencedTaskChecker sequence_checker_;
 };
 
 // This class implements a multi-threaded fake encoder by posting
 // FakeH264Encoder::Encode(.) tasks to |queue1_| and |queue2_|, in an
-// alternating fashion.
+// alternating fashion. The class itself does not need to be thread safe,
+// as it is called from the task queue in ViEEncoder.
 class MultithreadedFakeH264Encoder : public test::FakeH264Encoder {
  public:
   explicit MultithreadedFakeH264Encoder(Clock* clock);
-  virtual ~MultithreadedFakeH264Encoder() override;
+  virtual ~MultithreadedFakeH264Encoder() = default;
+
+  int32_t InitEncode(const VideoCodec* config,
+                     int32_t number_of_cores,
+                     size_t max_payload_size) override;
 
   int32_t Encode(const VideoFrame& input_image,
                  const CodecSpecificInfo* codec_specific_info,
@@ -106,12 +114,15 @@ class MultithreadedFakeH264Encoder : public test::FakeH264Encoder {
                          const CodecSpecificInfo* codec_specific_info,
                          const std::vector<FrameType>* frame_types);
 
+  int32_t Release() override;
+
  protected:
   class EncodeTask;
 
-  int current_queue_;
-  rtc::TaskQueue queue1_;
-  rtc::TaskQueue queue2_;
+  int current_queue_ ACCESS_ON(sequence_checker_);
+  std::unique_ptr<rtc::TaskQueue> queue1_ ACCESS_ON(sequence_checker_);
+  std::unique_ptr<rtc::TaskQueue> queue2_ ACCESS_ON(sequence_checker_);
+  rtc::SequencedTaskChecker sequence_checker_;
 };
 
 }  // namespace test