admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move deprecated EventWrapper to modules/video_coding/deprecated/

Browse Source 
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}
This commit is contained in:
Rasmus Brandt 2023-03-10 08:15:08 +01:00 committed by WebRTC LUCI CQ
parent 9e74e57b8f
commit eec4fd1f66
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/video_coding/BUILD.gn
View File

@ -307,8 +307,6 @@ rtc_library("video_codec_interface") {
rtc_library("video_coding_legacy") { rtc_library("video_coding_legacy") {
visibility = [ ":video_coding_unittests" ] visibility = [ ":video_coding_unittests" ]
sources = [ sources = [
"event_wrapper.cc",
"event_wrapper.h",
"include/video_coding.h", "include/video_coding.h",
"jitter_buffer.cc", "jitter_buffer.cc",
"jitter_buffer.h", "jitter_buffer.h",
@ -351,6 +349,7 @@ rtc_library("video_coding_legacy") {
"../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_rtcp_format",
"../rtp_rtcp:rtp_video_header", "../rtp_rtcp:rtp_video_header",
"deprecated:deprecated_decoding_state", "deprecated:deprecated_decoding_state",
"deprecated:deprecated_event_wrapper",
"deprecated:deprecated_frame_buffer", "deprecated:deprecated_frame_buffer",
"deprecated:deprecated_jitter_buffer_common", "deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet", "deprecated:deprecated_packet",

8
modules/video_coding/deprecated/BUILD.gn
View File

@ -29,6 +29,14 @@ rtc_library("deprecated_decoding_state") {
] ]
} }
rtc_library("deprecated_event_wrapper") {
sources = [
"event_wrapper.cc",
"event_wrapper.h",
]
deps = [ "../../../rtc_base:rtc_event" ]
}
rtc_library("deprecated_jitter_buffer_common") { rtc_library("deprecated_jitter_buffer_common") {
sources = [ "jitter_buffer_common.h" ] sources = [ "jitter_buffer_common.h" ]
} }

2
modules/video_coding/event_wrapper.cc → modules/video_coding/deprecated/event_wrapper.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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" #include "rtc_base/event.h"

6
modules/video_coding/event_wrapper.h → modules/video_coding/deprecated/event_wrapper.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_VIDEO_CODING_EVENT_WRAPPER_H_ #ifndef MODULES_VIDEO_CODING_DEPRECATED_EVENT_WRAPPER_H_
#define MODULES_VIDEO_CODING_EVENT_WRAPPER_H_ #define MODULES_VIDEO_CODING_DEPRECATED_EVENT_WRAPPER_H_
namespace webrtc { namespace webrtc {
enum EventTypeWrapper { kEventSignaled = 1, kEventTimeout = 2 }; enum EventTypeWrapper { kEventSignaled = 1, kEventTimeout = 2 };
@ -44,4 +44,4 @@ class EventWrapper {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_VIDEO_CODING_EVENT_WRAPPER_H_ #endif // MODULES_VIDEO_CODING_DEPRECATED_EVENT_WRAPPER_H_

2
modules/video_coding/jitter_buffer.h
View File

@ -21,8 +21,8 @@
#include "modules/include/module_common_types.h" #include "modules/include/module_common_types.h"
#include "modules/include/module_common_types_public.h" #include "modules/include/module_common_types_public.h"
#include "modules/video_coding/deprecated/decoding_state.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/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.h"
#include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/timing/inter_frame_delay_variation_calculator.h" #include "modules/video_coding/timing/inter_frame_delay_variation_calculator.h"

2
modules/video_coding/receiver.h
View File

@ -15,8 +15,8 @@
#include <vector> #include <vector>
#include "api/field_trials_view.h" #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/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.h"
#include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/jitter_buffer.h" #include "modules/video_coding/jitter_buffer.h"