Rewrite frame generator capturer to use TaskQueue instead of EventTimeWrapper

webrtc/test/frame_generator_capturer.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.
  */
 #ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
 #define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
 
 #include <memory>
 #include <string>
 
 #include "webrtc/api/video/video_frame.h"
 #include "webrtc/base/criticalsection.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/task_queue.h"
 #include "webrtc/test/video_capturer.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class CriticalSectionWrapper;
 class EventTimerWrapper;
 
 namespace test {
 
@@ skipping 38 matching lines @@
   void SetFakeRotation(VideoRotation rotation);
 
   int64_t first_frame_capture_time() const { return first_frame_capture_time_; }
 
   FrameGeneratorCapturer(Clock* clock,
                          std::unique_ptr<FrameGenerator> frame_generator,
                          int target_fps);
   bool Init();
 
  private:
+  class InsertFrameTask : public rtc::QueuedTask {
+   public:
+    InsertFrameTask(FrameGeneratorCapturer* frame_generator_capturer,
+                    bool repeat)
+        : frame_generator_capturer_(frame_generator_capturer),
+          repeat_(repeat) {}
+
+   private:
+    bool Run() override;
+
+    FrameGeneratorCapturer* frame_generator_capturer_;
+    bool repeat_;

[tommi, 2017/03/09 17:46:52]

nit: this could be made const.
However, as Erik points out, you could use a lambda, which might make the code
even simpler.

[ilnik, 2017/03/09 18:25:56]

Done.

+  };

[sprang_webrtc, 2017/03/09 17:40:05]

Don't need to declare this here. Move it to the cc file.
I think you may even get away with not declaring a class at all, but can post a
lambda capturing this instead?

[ilnik, 2017/03/09 18:25:56]

I'll try to do it with lambdas, but the issue is how could I repost the task
inside the lambda?

[tommi, 2017/03/09 18:56:02]

Oh, I didn't realize that on the first pass.  Right, you can't do that from a
lambda - but it's nice to see you're taking advantage of that.  Can you add a
comment where you use the repeat_ variable that points out to the reader what's
going on?

+
   void InsertFrame();
   static bool Run(void* obj);
 
   Clock* const clock_;
   bool sending_;
   rtc::VideoSinkInterface<VideoFrame>* sink_ GUARDED_BY(&lock_);
   SinkWantsObserver* sink_wants_observer_ GUARDED_BY(&lock_);
 
-  std::unique_ptr<EventTimerWrapper> tick_;
+  rtc::TaskQueue task_queue_;
   rtc::CriticalSection lock_;
-  rtc::PlatformThread thread_;
   std::unique_ptr<FrameGenerator> frame_generator_;
 
   int target_fps_;
   VideoRotation fake_rotation_ = kVideoRotation_0;
 
   int64_t first_frame_capture_time_;
 };
-}  // test
-}  // webrtc
+}  // namespace test
+}  // namespace webrtc
 
 #endif  // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_