zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move VCMTiming into timing sub-folder

Browse Source 
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}
This commit is contained in:
Rasmus Brandt
2022-05-25 12:03:35 +02:00
committed by WebRTC LUCI CQ
parent af785d9759
commit c4d253c1ed
25 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/video_coding/BUILD.gn
View File

@ -162,27 +162,6 @@ rtc_library("frame_helpers") {
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 @@ rtc_library("video_coding") {
":codec_globals_headers",
":encoded_frame",
":frame_helpers",
":timing",
":video_codec_interface",
":video_coding_utility",
":webrtc_vp8_scalability",
@ -299,6 +277,7 @@ rtc_library("video_coding") {
"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 @@ rtc_library("video_coding_legacy") {
deps = [
":codec_globals_headers",
":encoded_frame",
":timing",
":video_codec_interface",
":video_coding",
"..:module_api",
@ -389,6 +367,7 @@ rtc_library("video_coding_legacy") {
"../utility",
"timing:inter_frame_delay",
"timing:jitter_estimator",
"timing:timing_module",
]
absl_deps = [
"//third_party/abseil-cpp/absl/memory",
@ -1123,7 +1102,6 @@ if (rtc_include_tests) {
"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 @@ if (rtc_include_tests) {
":nack_requester",
":packet_buffer",
":simulcast_test_fixture_impl",
":timing",
":video_codec_interface",
":video_codecs_test_framework",
":video_coding",
@ -1236,6 +1213,7 @@ if (rtc_include_tests) {
"svc:scalability_structure_tests",
"svc:svc_rate_allocator_tests",
"timing:jitter_estimator",
"timing:timing_module",
]
absl_deps = [
"//third_party/abseil-cpp/absl/memory",

2
modules/video_coding/frame_buffer2.cc
View File

@ -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"

2
modules/video_coding/frame_buffer2_unittest.cc
View File

@ -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"

2
modules/video_coding/generic_decoder.h
View File

@ -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 {

2
modules/video_coding/generic_decoder_unittest.cc
View File

@ -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"

2
modules/video_coding/receiver.h
View File

@ -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 {

2
modules/video_coding/receiver_unittest.cc
View File

@ -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"

23
modules/video_coding/timing/BUILD.gn
View File

@ -62,17 +62,40 @@ rtc_library("rtt_filter") {
]
}
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",

2
modules/video_coding/timing.cc → modules/video_coding/timing/timing.cc
View File

@ -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>

6
modules/video_coding/timing.h → modules/video_coding/timing/timing.h
View File

@ -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 @@ class VCMTiming {
};
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_TIMING_H_
#endif // MODULES_VIDEO_CODING_TIMING_TIMING_H_

2
modules/video_coding/timing_unittest.cc → modules/video_coding/timing/timing_unittest.cc
View File

@ -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"

2
modules/video_coding/video_coding_impl.cc
View File

@ -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"

2
modules/video_coding/video_coding_impl.h
View File

@ -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"

2
modules/video_coding/video_receiver.cc
View File

@ -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"

6
modules/video_coding/video_receiver2.cc
View File

@ -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"

2
modules/video_coding/video_receiver2.h
View File

@ -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 {

2
modules/video_coding/video_receiver_unittest.cc
View File

@ -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"

2
test/fuzzers/BUILD.gn
View File

@ -605,8 +605,8 @@ webrtc_fuzzer_test("rtp_frame_reference_finder_fuzzer") {
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",
]

2
test/fuzzers/frame_buffer2_fuzzer.cc
View File

@ -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"

10
video/BUILD.gn
View File

@ -105,10 +105,10 @@ rtc_library("video") {
"../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 @@ rtc_library("video_stream_decoder_impl") {
"../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 @@ rtc_library("frame_buffer_proxy") {
"../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 @@ rtc_library("frame_decode_timing") {
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 @@ if (rtc_include_tests) {
"../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 @@ if (rtc_include_tests) {
"../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",

2
video/frame_buffer_proxy.h
View File

@ -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"

2
video/frame_decode_timing.h
View File

@ -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"

2
video/frame_decode_timing_unittest.cc
View File

@ -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"

2
video/video_receive_stream2.cc
View File

@ -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"

2
video/video_stream_decoder_impl.h
View File

@ -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"