Move EventWrapper class to target video_coding_legacy.

And remove some unneeded logic for WEBRTC_EVENT_INFINITE.

Bug: webrtc:3380
Change-Id: Ibf632493edc6ced1609bd9ced44c2020fe9878cf
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169846
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30700}

modules/video_coding/BUILD.gn

@@ -211,6 +211,8 @@ rtc_library("video_coding_legacy") {
   sources = [
     "decoding_state.cc",
     "decoding_state.h",
+    "event_wrapper.cc",
+    "event_wrapper.h",
     "frame_buffer.cc",
     "frame_buffer.h",
     "include/video_coding.h",
@@ -247,9 +249,9 @@ rtc_library("video_coding_legacy") {
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:rtc_event",
     "../../rtc_base/synchronization:sequence_checker",
     "../../system_wrappers",
-    "../../system_wrappers:event_wrapper",
     "../rtp_rtcp:rtp_rtcp_format",
     "../rtp_rtcp:rtp_video_header",
     "../utility",
@@ -933,7 +935,6 @@ if (rtc_include_tests) {
       "../../rtc_base:task_queue_for_test",
       "../../rtc_base/experiments:jitter_upper_bound_experiment",
       "../../system_wrappers",
-      "../../system_wrappers:event_wrapper",
       "../../system_wrappers:field_trial",
       "../../system_wrappers:metrics",
       "../../test:fake_video_codecs",

modules/video_coding/event_wrapper.cc

@@ -8,13 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "system_wrappers/include/event_wrapper.h"
+#include "modules/video_coding/event_wrapper.h"
-
-#if defined(_WIN32)
-#include <windows.h>
-#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
 
 #include "rtc_base/event.h"
 
@@ -29,11 +23,8 @@ class EventWrapperImpl : public EventWrapper {
     return true;
   }
 
-  EventTypeWrapper Wait(unsigned long max_time) override {
+  EventTypeWrapper Wait(int max_time_ms) override {
-    int to_wait = max_time == WEBRTC_EVENT_INFINITE
+    return event_.Wait(max_time_ms) ? kEventSignaled : kEventTimeout;
-                      ? rtc::Event::kForever
-                      : static_cast<int>(max_time);
-    return event_.Wait(to_wait) ? kEventSignaled : kEventTimeout;
   }
 
  private:

modules/video_coding/event_wrapper.h

@@ -8,14 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_
+#ifndef MODULES_VIDEO_CODING_EVENT_WRAPPER_H_
-#define SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_
+#define MODULES_VIDEO_CODING_EVENT_WRAPPER_H_
 
 namespace webrtc {
 enum EventTypeWrapper { kEventSignaled = 1, kEventTimeout = 2 };
 
-#define WEBRTC_EVENT_INFINITE 0xffffffff
-
 class EventWrapper {
  public:
   // Factory method. Constructor disabled.
@@ -39,11 +37,10 @@ class EventWrapper {
   // be released. It is possible that multiple (random) threads are released
   // Depending on timing.
   //
-  // |max_time| is the maximum time to wait in milliseconds or
+  // |max_time_ms| is the maximum time to wait in milliseconds.
-  // WEBRTC_EVENT_INFINITE to wait infinitely.
+  virtual EventTypeWrapper Wait(int max_time_ms) = 0;
-  virtual EventTypeWrapper Wait(unsigned long max_time) = 0;
 };
 
 }  // namespace webrtc
 
-#endif  // SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_
+#endif  // MODULES_VIDEO_CODING_EVENT_WRAPPER_H_

modules/video_coding/jitter_buffer.h

@@ -21,6 +21,7 @@
 #include "modules/include/module_common_types_public.h"
 #include "modules/utility/include/process_thread.h"
 #include "modules/video_coding/decoding_state.h"
+#include "modules/video_coding/event_wrapper.h"
 #include "modules/video_coding/include/video_coding.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/inter_frame_delay.h"
@@ -29,7 +30,6 @@
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
-#include "system_wrappers/include/event_wrapper.h"
 
 namespace webrtc {
 

modules/video_coding/receiver.h

@@ -14,13 +14,13 @@
 #include <memory>
 #include <vector>
 
+#include "modules/video_coding/event_wrapper.h"
 #include "modules/video_coding/include/video_coding.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/jitter_buffer.h"
 #include "modules/video_coding/packet.h"
 #include "modules/video_coding/timing.h"
 #include "rtc_base/critical_section.h"
-#include "system_wrappers/include/event_wrapper.h"
 
 namespace webrtc {
 

modules/video_coding/receiver_unittest.cc

@@ -350,8 +350,8 @@ class FrameInjectEvent : public EventWrapper {
 
   bool Set() override { return true; }
 
-  EventTypeWrapper Wait(unsigned long max_time) override {  // NOLINT
+  EventTypeWrapper Wait(int max_time_ms) override {
-    if (clock_->AdvanceTimeMilliseconds(max_time, stop_on_frame_) &&
+    if (clock_->AdvanceTimeMilliseconds(max_time_ms, stop_on_frame_) &&
         stop_on_frame_) {
       return EventTypeWrapper::kEventSignaled;
     } else {

system_wrappers/BUILD.gn

@@ -95,18 +95,6 @@ rtc_library("field_trial") {
   ]
 }
 
-rtc_library("event_wrapper") {
-  visibility = [
-    "../modules/video_coding:video_coding_legacy",
-    "../modules/video_coding:video_coding_unittests",
-  ]
-  sources = [
-    "include/event_wrapper.h",
-    "source/event.cc",
-  ]
-  deps = [ "../rtc_base:rtc_event" ]
-}
-
 rtc_library("metrics") {
   visibility = [ "*" ]
   public = [ "include/metrics.h" ]