Move deprecated EventWrapper to modules/video_coding/deprecated/
This move further clarifies that the file and its class are deprecated. It also cleans up the modules/video_coding root folder a bit.
No functional changes are intended.
Bug: webrtc:14876
Change-Id: Ieb6effd55f0ecba17cefc2f07f5eda1e85dbd016
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/296441
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39535}
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 2853e65..7f5b5f3 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -307,8 +307,6 @@
rtc_library("video_coding_legacy") {
visibility = [ ":video_coding_unittests" ]
sources = [
- "event_wrapper.cc",
- "event_wrapper.h",
"include/video_coding.h",
"jitter_buffer.cc",
"jitter_buffer.h",
@@ -351,6 +349,7 @@
"../rtp_rtcp:rtp_rtcp_format",
"../rtp_rtcp:rtp_video_header",
"deprecated:deprecated_decoding_state",
+ "deprecated:deprecated_event_wrapper",
"deprecated:deprecated_frame_buffer",
"deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet",
diff --git a/modules/video_coding/deprecated/BUILD.gn b/modules/video_coding/deprecated/BUILD.gn
index c9f226d..5859902 100644
--- a/modules/video_coding/deprecated/BUILD.gn
+++ b/modules/video_coding/deprecated/BUILD.gn
@@ -29,6 +29,14 @@
]
}
+rtc_library("deprecated_event_wrapper") {
+ sources = [
+ "event_wrapper.cc",
+ "event_wrapper.h",
+ ]
+ deps = [ "../../../rtc_base:rtc_event" ]
+}
+
rtc_library("deprecated_jitter_buffer_common") {
sources = [ "jitter_buffer_common.h" ]
}
diff --git a/modules/video_coding/event_wrapper.cc b/modules/video_coding/deprecated/event_wrapper.cc
similarity index 94%
rename from modules/video_coding/event_wrapper.cc
rename to modules/video_coding/deprecated/event_wrapper.cc
index 748c92f..16321b6 100644
--- a/modules/video_coding/event_wrapper.cc
+++ b/modules/video_coding/deprecated/event_wrapper.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/video_coding/event_wrapper.h"
+#include "modules/video_coding/deprecated/event_wrapper.h"
#include "rtc_base/event.h"
diff --git a/modules/video_coding/event_wrapper.h b/modules/video_coding/deprecated/event_wrapper.h
similarity index 90%
rename from modules/video_coding/event_wrapper.h
rename to modules/video_coding/deprecated/event_wrapper.h
index c5e5661..eddcc31 100644
--- a/modules/video_coding/event_wrapper.h
+++ b/modules/video_coding/deprecated/event_wrapper.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef MODULES_VIDEO_CODING_EVENT_WRAPPER_H_
-#define MODULES_VIDEO_CODING_EVENT_WRAPPER_H_
+#ifndef MODULES_VIDEO_CODING_DEPRECATED_EVENT_WRAPPER_H_
+#define MODULES_VIDEO_CODING_DEPRECATED_EVENT_WRAPPER_H_
namespace webrtc {
enum EventTypeWrapper { kEventSignaled = 1, kEventTimeout = 2 };
@@ -44,4 +44,4 @@
} // namespace webrtc
-#endif // MODULES_VIDEO_CODING_EVENT_WRAPPER_H_
+#endif // MODULES_VIDEO_CODING_DEPRECATED_EVENT_WRAPPER_H_
diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h
index d6ecd76..6563c56 100644
--- a/modules/video_coding/jitter_buffer.h
+++ b/modules/video_coding/jitter_buffer.h
@@ -21,8 +21,8 @@
#include "modules/include/module_common_types.h"
#include "modules/include/module_common_types_public.h"
#include "modules/video_coding/deprecated/decoding_state.h"
+#include "modules/video_coding/deprecated/event_wrapper.h"
#include "modules/video_coding/deprecated/jitter_buffer_common.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/timing/inter_frame_delay_variation_calculator.h"
diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h
index 98d6637..afc4b9c 100644
--- a/modules/video_coding/receiver.h
+++ b/modules/video_coding/receiver.h
@@ -15,8 +15,8 @@
#include <vector>
#include "api/field_trials_view.h"
+#include "modules/video_coding/deprecated/event_wrapper.h"
#include "modules/video_coding/deprecated/packet.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/jitter_buffer.h"
