Move VCMTiming into timing sub-folder
Bug: webrtc:14111
Change-Id: I9785b00012ea84f55789845a7e71fe26006d5067
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263581
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37061}
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 876ac45..5923605 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -162,27 +162,6 @@
absl_deps = [ "//third_party/abseil-cpp/absl/container:inlined_vector" ]
}
-rtc_library("timing") {
- sources = [
- "timing.cc",
- "timing.h",
- ]
- deps = [
- "../../api:field_trials_view",
- "../../api/units:time_delta",
- "../../api/video:video_rtp_headers",
- "../../rtc_base:logging",
- "../../rtc_base:macromagic",
- "../../rtc_base:rtc_numerics",
- "../../rtc_base/experiments:field_trial_parser",
- "../../rtc_base/synchronization:mutex",
- "../../rtc_base/time:timestamp_extrapolator",
- "../../system_wrappers",
- "timing:codec_timer",
- ]
- absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
-}
-
rtc_library("video_coding") {
visibility = [ "*" ]
sources = [
@@ -230,7 +209,6 @@
":codec_globals_headers",
":encoded_frame",
":frame_helpers",
- ":timing",
":video_codec_interface",
":video_coding_utility",
":webrtc_vp8_scalability",
@@ -299,6 +277,7 @@
"timing:inter_frame_delay",
"timing:jitter_estimator",
"timing:rtt_filter",
+ "timing:timing_module",
]
absl_deps = [
"//third_party/abseil-cpp/absl/base:core_headers",
@@ -355,7 +334,6 @@
deps = [
":codec_globals_headers",
":encoded_frame",
- ":timing",
":video_codec_interface",
":video_coding",
"..:module_api",
@@ -389,6 +367,7 @@
"../utility",
"timing:inter_frame_delay",
"timing:jitter_estimator",
+ "timing:timing_module",
]
absl_deps = [
"//third_party/abseil-cpp/absl/memory",
@@ -1123,7 +1102,6 @@
"test/stream_generator.cc",
"test/stream_generator.h",
"timestamp_map_unittest.cc",
- "timing_unittest.cc",
"utility/bandwidth_quality_scaler_unittest.cc",
"utility/decoded_frames_history_unittest.cc",
"utility/frame_dropper_unittest.cc",
@@ -1153,7 +1131,6 @@
":nack_requester",
":packet_buffer",
":simulcast_test_fixture_impl",
- ":timing",
":video_codec_interface",
":video_codecs_test_framework",
":video_coding",
@@ -1236,6 +1213,7 @@
"svc:scalability_structure_tests",
"svc:svc_rate_allocator_tests",
"timing:jitter_estimator",
+ "timing:timing_module",
]
absl_deps = [
"//third_party/abseil-cpp/absl/memory",
diff --git a/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc
index 536dc9d..7e6d622 100644
--- a/modules/video_coding/frame_buffer2.cc
+++ b/modules/video_coding/frame_buffer2.cc
@@ -25,8 +25,8 @@
#include "api/video/video_timing.h"
#include "modules/video_coding/frame_helpers.h"
#include "modules/video_coding/include/video_coding_defines.h"
-#include "modules/video_coding/timing.h"
#include "modules/video_coding/timing/jitter_estimator.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/checks.h"
#include "rtc_base/experiments/rtt_mult_experiment.h"
#include "rtc_base/logging.h"
diff --git a/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc
index 92d9b94..4faafa6 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -19,8 +19,8 @@
#include "api/units/time_delta.h"
#include "api/units/timestamp.h"
#include "modules/video_coding/frame_object.h"
-#include "modules/video_coding/timing.h"
#include "modules/video_coding/timing/jitter_estimator.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/numerics/sequence_number_util.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/random.h"
diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h
index efb77bb..636bd1f 100644
--- a/modules/video_coding/generic_decoder.h
+++ b/modules/video_coding/generic_decoder.h
@@ -19,7 +19,7 @@
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/timestamp_map.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/synchronization/mutex.h"
namespace webrtc {
diff --git a/modules/video_coding/generic_decoder_unittest.cc b/modules/video_coding/generic_decoder_unittest.cc
index d9ca8c6..20ea9c3 100644
--- a/modules/video_coding/generic_decoder_unittest.cc
+++ b/modules/video_coding/generic_decoder_unittest.cc
@@ -17,7 +17,7 @@
#include "api/task_queue/default_task_queue_factory.h"
#include "api/video_codecs/video_decoder.h"
#include "common_video/test/utilities.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/event.h"
#include "rtc_base/synchronization/mutex.h"
#include "system_wrappers/include/clock.h"
diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h
index 0bf756c..069f8c5 100644
--- a/modules/video_coding/receiver.h
+++ b/modules/video_coding/receiver.h
@@ -20,7 +20,7 @@
#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 "modules/video_coding/timing/timing.h"
namespace webrtc {
diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc
index a9755b7..2beb97e 100644
--- a/modules/video_coding/receiver_unittest.cc
+++ b/modules/video_coding/receiver_unittest.cc
@@ -20,7 +20,7 @@
#include "modules/video_coding/jitter_buffer_common.h"
#include "modules/video_coding/packet.h"
#include "modules/video_coding/test/stream_generator.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/checks.h"
#include "system_wrappers/include/clock.h"
#include "test/gtest.h"
diff --git a/modules/video_coding/timing/BUILD.gn b/modules/video_coding/timing/BUILD.gn
index 851374f..369a680 100644
--- a/modules/video_coding/timing/BUILD.gn
+++ b/modules/video_coding/timing/BUILD.gn
@@ -62,17 +62,40 @@
]
}
+rtc_library("timing_module") {
+ sources = [
+ "timing.cc",
+ "timing.h",
+ ]
+ deps = [
+ ":codec_timer",
+ "../../../api:field_trials_view",
+ "../../../api/units:time_delta",
+ "../../../api/video:video_rtp_headers",
+ "../../../rtc_base:logging",
+ "../../../rtc_base:macromagic",
+ "../../../rtc_base:rtc_numerics",
+ "../../../rtc_base/experiments:field_trial_parser",
+ "../../../rtc_base/synchronization:mutex",
+ "../../../rtc_base/time:timestamp_extrapolator",
+ "../../../system_wrappers",
+ ]
+ absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
rtc_library("timing_unittests") {
testonly = true
sources = [
"inter_frame_delay_unittest.cc",
"jitter_estimator_unittest.cc",
"rtt_filter_unittest.cc",
+ "timing_unittest.cc",
]
deps = [
":inter_frame_delay",
":jitter_estimator",
":rtt_filter",
+ ":timing_module",
"../../../api:array_view",
"../../../api/units:data_size",
"../../../api/units:frequency",
diff --git a/modules/video_coding/timing.cc b/modules/video_coding/timing/timing.cc
similarity index 99%
rename from modules/video_coding/timing.cc
rename to modules/video_coding/timing/timing.cc
index 7a559ba..06754b2 100644
--- a/modules/video_coding/timing.cc
+++ b/modules/video_coding/timing/timing.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include <algorithm>
diff --git a/modules/video_coding/timing.h b/modules/video_coding/timing/timing.h
similarity index 97%
rename from modules/video_coding/timing.h
rename to modules/video_coding/timing/timing.h
index 69efc7a..94950ba 100644
--- a/modules/video_coding/timing.h
+++ b/modules/video_coding/timing/timing.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef MODULES_VIDEO_CODING_TIMING_H_
-#define MODULES_VIDEO_CODING_TIMING_H_
+#ifndef MODULES_VIDEO_CODING_TIMING_TIMING_H_
+#define MODULES_VIDEO_CODING_TIMING_TIMING_H_
#include <memory>
@@ -155,4 +155,4 @@
};
} // namespace webrtc
-#endif // MODULES_VIDEO_CODING_TIMING_H_
+#endif // MODULES_VIDEO_CODING_TIMING_TIMING_H_
diff --git a/modules/video_coding/timing_unittest.cc b/modules/video_coding/timing/timing_unittest.cc
similarity index 99%
rename from modules/video_coding/timing_unittest.cc
rename to modules/video_coding/timing/timing_unittest.cc
index 20667c9..31ee44a 100644
--- a/modules/video_coding/timing_unittest.cc
+++ b/modules/video_coding/timing/timing_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "api/units/frequency.h"
#include "api/units/time_delta.h"
diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc
index 3e105a6..eec968a 100644
--- a/modules/video_coding/video_coding_impl.cc
+++ b/modules/video_coding/video_coding_impl.cc
@@ -18,7 +18,7 @@
#include "api/transport/field_trial_based_config.h"
#include "api/video/encoded_image.h"
#include "modules/video_coding/include/video_codec_interface.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/memory/always_valid_pointer.h"
#include "system_wrappers/include/clock.h"
diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h
index 3010b2f..c50cb17 100644
--- a/modules/video_coding/video_coding_impl.h
+++ b/modules/video_coding/video_coding_impl.h
@@ -24,7 +24,7 @@
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/jitter_buffer.h"
#include "modules/video_coding/receiver.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/one_time_event.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h"
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index 6db27c4..5d14337 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -28,7 +28,7 @@
#include "modules/video_coding/media_opt_util.h"
#include "modules/video_coding/packet.h"
#include "modules/video_coding/receiver.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "modules/video_coding/video_coding_impl.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
diff --git a/modules/video_coding/video_receiver2.cc b/modules/video_coding/video_receiver2.cc
index 8557d68..2e10020 100644
--- a/modules/video_coding/video_receiver2.cc
+++ b/modules/video_coding/video_receiver2.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/video_coding/video_receiver2.h"
+
#include <stddef.h>
#include <cstdint>
#include <vector>
-#include "modules/video_coding/video_receiver2.h"
-
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_decoder.h"
#include "modules/video_coding/decoder_database.h"
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/generic_decoder.h"
#include "modules/video_coding/include/video_coding_defines.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/checks.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/clock.h"
diff --git a/modules/video_coding/video_receiver2.h b/modules/video_coding/video_receiver2.h
index 4b18b0e..c7db2fe 100644
--- a/modules/video_coding/video_receiver2.h
+++ b/modules/video_coding/video_receiver2.h
@@ -17,7 +17,7 @@
#include "modules/video_coding/decoder_database.h"
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/generic_decoder.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc
index 148ec0d..4fc3794 100644
--- a/modules/video_coding/video_receiver_unittest.cc
+++ b/modules/video_coding/video_receiver_unittest.cc
@@ -11,7 +11,7 @@
#include "api/test/mock_video_decoder.h"
#include "api/video_codecs/video_decoder.h"
#include "modules/video_coding/include/video_coding.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "modules/video_coding/video_coding_impl.h"
#include "system_wrappers/include/clock.h"
#include "test/gtest.h"
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index c2f21ec..e70e1df 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -605,8 +605,8 @@
webrtc_fuzzer_test("frame_buffer2_fuzzer") {
sources = [ "frame_buffer2_fuzzer.cc" ]
deps = [
- "../../modules/video_coding:timing",
"../../modules/video_coding/",
+ "../../modules/video_coding/timing:timing_module",
"../../test:scoped_key_value_config",
"../time_controller:time_controller",
]
diff --git a/test/fuzzers/frame_buffer2_fuzzer.cc b/test/fuzzers/frame_buffer2_fuzzer.cc
index da6c89a..32ac6be 100644
--- a/test/fuzzers/frame_buffer2_fuzzer.cc
+++ b/test/fuzzers/frame_buffer2_fuzzer.cc
@@ -9,7 +9,7 @@
*/
#include "modules/video_coding/frame_buffer2.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "test/scoped_key_value_config.h"
#include "test/time_controller/simulated_time_controller.h"
diff --git a/video/BUILD.gn b/video/BUILD.gn
index ced94a1..9267d1f 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -105,10 +105,10 @@
"../modules/video_coding:frame_helpers",
"../modules/video_coding:nack_requester",
"../modules/video_coding:packet_buffer",
- "../modules/video_coding:timing",
"../modules/video_coding:video_codec_interface",
"../modules/video_coding:video_coding_utility",
"../modules/video_coding/timing:inter_frame_delay",
+ "../modules/video_coding/timing:timing_module",
"../modules/video_processing",
"../rtc_base:atomicops",
"../rtc_base:checks",
@@ -262,7 +262,7 @@
"../api/video:video_stream_decoder",
"../api/video_codecs:video_codecs_api",
"../modules/video_coding",
- "../modules/video_coding:timing",
+ "../modules/video_coding/timing:timing_module",
"../rtc_base:logging",
"../rtc_base:mod_ops",
"../rtc_base:platform_thread",
@@ -349,10 +349,10 @@
"../api/video:video_rtp_headers",
"../modules/video_coding",
"../modules/video_coding:frame_helpers",
- "../modules/video_coding:timing",
"../modules/video_coding:video_codec_interface",
"../modules/video_coding/timing:inter_frame_delay",
"../modules/video_coding/timing:jitter_estimator",
+ "../modules/video_coding/timing:timing_module",
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
@@ -402,7 +402,7 @@
deps = [
"../api/task_queue",
"../api/units:time_delta",
- "../modules/video_coding:timing",
+ "../modules/video_coding/timing:timing_module",
"../rtc_base:logging",
"../rtc_base/task_utils:pending_task_safety_flag",
"../system_wrappers",
@@ -930,7 +930,6 @@
"../modules/video_coding:codec_globals_headers",
"../modules/video_coding:encoded_frame",
"../modules/video_coding:packet_buffer",
- "../modules/video_coding:timing",
"../modules/video_coding:video_codec_interface",
"../modules/video_coding:video_coding_utility",
"../modules/video_coding:webrtc_h264",
@@ -942,6 +941,7 @@
"../modules/video_coding/svc:scalability_mode_util",
"../modules/video_coding/svc:scalability_structures",
"../modules/video_coding/svc:scalable_video_controller",
+ "../modules/video_coding/timing:timing_module",
"../rtc_base",
"../rtc_base:byte_buffer",
"../rtc_base:checks",
diff --git a/video/frame_buffer_proxy.h b/video/frame_buffer_proxy.h
index 1498d3e..16f8fc5 100644
--- a/video/frame_buffer_proxy.h
+++ b/video/frame_buffer_proxy.h
@@ -18,7 +18,7 @@
#include "api/task_queue/task_queue_base.h"
#include "api/video/encoded_frame.h"
#include "modules/video_coding/include/video_coding_defines.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/task_queue.h"
#include "system_wrappers/include/clock.h"
#include "video/decode_synchronizer.h"
diff --git a/video/frame_decode_timing.h b/video/frame_decode_timing.h
index ff67ace..991cfec 100644
--- a/video/frame_decode_timing.h
+++ b/video/frame_decode_timing.h
@@ -16,7 +16,7 @@
#include <functional>
#include "api/task_queue/task_queue_base.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/task_utils/pending_task_safety_flag.h"
#include "system_wrappers/include/clock.h"
diff --git a/video/frame_decode_timing_unittest.cc b/video/frame_decode_timing_unittest.cc
index 0066afe..51d115a 100644
--- a/video/frame_decode_timing_unittest.cc
+++ b/video/frame_decode_timing_unittest.cc
@@ -14,7 +14,7 @@
#include "absl/types/optional.h"
#include "api/units/time_delta.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/containers/flat_map.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc
index 3155253..2cf4ba5 100644
--- a/video/video_receive_stream2.cc
+++ b/video/video_receive_stream2.cc
@@ -46,7 +46,7 @@
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/include/video_error_codes.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "modules/video_coding/utility/vp8_header_parser.h"
#include "rtc_base/checks.h"
#include "rtc_base/experiments/rtt_mult_experiment.h"
diff --git a/video/video_stream_decoder_impl.h b/video/video_stream_decoder_impl.h
index f76506f..fcd7158 100644
--- a/video/video_stream_decoder_impl.h
+++ b/video/video_stream_decoder_impl.h
@@ -21,7 +21,7 @@
#include "api/transport/field_trial_based_config.h"
#include "api/video/video_stream_decoder.h"
#include "modules/video_coding/frame_buffer2.h"
-#include "modules/video_coding/timing.h"
+#include "modules/video_coding/timing/timing.h"
#include "rtc_base/memory/always_valid_pointer.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/synchronization/mutex.h"
