From a194e58e799ccab6c999998e5d0f75725aa3f748 Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Wed, 25 Oct 2017 13:07:09 +0200 Subject: [PATCH] Move sequence_number_utils.h to rtc_base/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8440 Change-Id: I36e70da6ce70b95db7d3fce8b0013bff5c795bfc Reviewed-on: https://webrtc-review.googlesource.com/14860 Reviewed-by: Karl Wiberg Reviewed-by: Åsa Persson Reviewed-by: Philip Eliasson Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#20429} --- modules/remote_bitrate_estimator/BUILD.gn | 1 + modules/remote_bitrate_estimator/test/estimators/bbr.h | 2 +- modules/video_coding/BUILD.gn | 3 +-- modules/video_coding/frame_buffer2.h | 2 +- modules/video_coding/frame_buffer2_unittest.cc | 2 +- modules/video_coding/histogram.cc | 2 +- modules/video_coding/nack_module.h | 2 +- modules/video_coding/packet_buffer.h | 2 +- modules/video_coding/rtp_frame_reference_finder.h | 2 +- rtc_base/BUILD.gn | 3 +++ .../numerics}/sequence_number_util.h | 6 +++--- .../numerics}/sequence_number_util_unittest.cc | 2 +- video/BUILD.gn | 1 + video/picture_id_tests.cc | 2 +- video/rtp_video_stream_receiver.h | 4 ++-- 15 files changed, 20 insertions(+), 16 deletions(-) rename {modules/video_coding => rtc_base/numerics}/sequence_number_util.h (96%) rename {modules/video_coding => rtc_base/numerics}/sequence_number_util_unittest.cc (99%) diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index e394b8173a..adfb2e2b36 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -141,6 +141,7 @@ if (rtc_include_tests) { "../../rtc_base:gtest_prod", "../../rtc_base:rtc_base", "../../rtc_base:rtc_base_approved", + "../../rtc_base:rtc_numerics", "../../system_wrappers", "../../test:test_support", "../../voice_engine", diff --git a/modules/remote_bitrate_estimator/test/estimators/bbr.h b/modules/remote_bitrate_estimator/test/estimators/bbr.h index a79a40b8c5..966f1e2ff4 100644 --- a/modules/remote_bitrate_estimator/test/estimators/bbr.h +++ b/modules/remote_bitrate_estimator/test/estimators/bbr.h @@ -19,7 +19,7 @@ #include "api/optional.h" #include "modules/remote_bitrate_estimator/test/bwe.h" -#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/random.h" namespace webrtc { diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index da3a5935b7..48636e9be2 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -137,7 +137,6 @@ rtc_source_set("video_coding_utility") { sources = [ "codecs/interface/video_codec_interface.h", "codecs/interface/video_error_codes.h", - "sequence_number_util.h", "utility/default_video_bitrate_allocator.cc", "utility/default_video_bitrate_allocator.h", "utility/frame_dropper.cc", @@ -524,7 +523,6 @@ if (rtc_include_tests) { "protection_bitrate_calculator_unittest.cc", "receiver_unittest.cc", "rtp_frame_reference_finder_unittest.cc", - "sequence_number_util_unittest.cc", "session_info_unittest.cc", "test/stream_generator.cc", "test/stream_generator.h", @@ -564,6 +562,7 @@ if (rtc_include_tests) { "../../common_video:common_video", "../../rtc_base:rtc_base", "../../rtc_base:rtc_base_approved", + "../../rtc_base:rtc_numerics", "../../rtc_base:rtc_task_queue", "../../system_wrappers:metrics_default", "../../system_wrappers:system_wrappers", diff --git a/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h index e502666a81..f535442d6f 100644 --- a/modules/video_coding/frame_buffer2.h +++ b/modules/video_coding/frame_buffer2.h @@ -19,10 +19,10 @@ #include "modules/video_coding/frame_object.h" #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/inter_frame_delay.h" -#include "modules/video_coding/sequence_number_util.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/event.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc index 7d792180d4..9cdd81bd3a 100644 --- a/modules/video_coding/frame_buffer2_unittest.cc +++ b/modules/video_coding/frame_buffer2_unittest.cc @@ -17,8 +17,8 @@ #include "modules/video_coding/frame_object.h" #include "modules/video_coding/jitter_estimator.h" -#include "modules/video_coding/sequence_number_util.h" #include "modules/video_coding/timing.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/platform_thread.h" #include "rtc_base/random.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/histogram.cc b/modules/video_coding/histogram.cc index d4c46da623..e87b0c03b4 100644 --- a/modules/video_coding/histogram.cc +++ b/modules/video_coding/histogram.cc @@ -12,7 +12,7 @@ #include -#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/numerics/sequence_number_util.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/nack_module.h b/modules/video_coding/nack_module.h index 8eda719d9d..0b91f0b204 100644 --- a/modules/video_coding/nack_module.h +++ b/modules/video_coding/nack_module.h @@ -19,8 +19,8 @@ #include "modules/video_coding/histogram.h" #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/packet.h" -#include "modules/video_coding/sequence_number_util.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h index 6604c362d0..ca499bfde9 100644 --- a/modules/video_coding/packet_buffer.h +++ b/modules/video_coding/packet_buffer.h @@ -18,8 +18,8 @@ #include "modules/include/module_common_types.h" #include "modules/video_coding/packet.h" #include "modules/video_coding/rtp_frame_reference_finder.h" -#include "modules/video_coding/sequence_number_util.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/video_coding/rtp_frame_reference_finder.h b/modules/video_coding/rtp_frame_reference_finder.h index 2addc59a17..33716f1a80 100644 --- a/modules/video_coding/rtp_frame_reference_finder.h +++ b/modules/video_coding/rtp_frame_reference_finder.h @@ -19,8 +19,8 @@ #include #include "modules/include/module_common_types.h" -#include "modules/video_coding/sequence_number_util.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 8490a60351..775fd14b1c 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -403,9 +403,11 @@ rtc_static_library("rtc_numerics") { "numerics/exp_filter.cc", "numerics/exp_filter.h", "numerics/percentile_filter.h", + "numerics/sequence_number_util.h", ] deps = [ ":rtc_base_approved", + "../api:optional", ] } @@ -996,6 +998,7 @@ if (rtc_include_tests) { sources = [ "numerics/exp_filter_unittest.cc", "numerics/percentile_filter_unittest.cc", + "numerics/sequence_number_util_unittest.cc", ] deps = [ ":rtc_base_approved", diff --git a/modules/video_coding/sequence_number_util.h b/rtc_base/numerics/sequence_number_util.h similarity index 96% rename from modules/video_coding/sequence_number_util.h rename to rtc_base/numerics/sequence_number_util.h index b710b8f12d..9dbd812b2d 100644 --- a/modules/video_coding/sequence_number_util.h +++ b/rtc_base/numerics/sequence_number_util.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ -#define MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ +#ifndef RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_ +#define RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_ #include #include @@ -125,4 +125,4 @@ class SeqNumUnwrapper { } // namespace webrtc -#endif // MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ +#endif // RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_ diff --git a/modules/video_coding/sequence_number_util_unittest.cc b/rtc_base/numerics/sequence_number_util_unittest.cc similarity index 99% rename from modules/video_coding/sequence_number_util_unittest.cc rename to rtc_base/numerics/sequence_number_util_unittest.cc index ad68820271..beb2b52a47 100644 --- a/modules/video_coding/sequence_number_util_unittest.cc +++ b/rtc_base/numerics/sequence_number_util_unittest.cc @@ -10,7 +10,7 @@ #include -#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "test/gtest.h" namespace webrtc { diff --git a/video/BUILD.gn b/video/BUILD.gn index 0833e52a3f..8799a8467e 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -296,6 +296,7 @@ if (rtc_include_tests) { "../modules/video_coding:webrtc_vp9", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils", + "../rtc_base:rtc_numerics", "../system_wrappers", "../system_wrappers:field_trial_default", "../system_wrappers:metrics_api", diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc index 5896d552c6..b23e073de7 100644 --- a/video/picture_id_tests.cc +++ b/video/picture_id_tests.cc @@ -10,7 +10,7 @@ #include "media/engine/internalencoderfactory.h" #include "media/engine/simulcast_encoder_adapter.h" #include "modules/rtp_rtcp/source/rtp_format.h" -#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "test/call_test.h" #include "test/field_trial.h" diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h index 90e8200c53..14553e532b 100644 --- a/video/rtp_video_stream_receiver.h +++ b/video/rtp_video_stream_receiver.h @@ -22,17 +22,17 @@ #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/receive_statistics.h" #include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h" -#include "modules/rtp_rtcp/include/rtp_payload_registry.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" #include "modules/rtp_rtcp/include/rtp_rtcp.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/video_coding/h264_sps_pps_tracker.h" #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/packet_buffer.h" #include "modules/video_coding/rtp_frame_reference_finder.h" -#include "modules/video_coding/sequence_number_util.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/sequenced_task_checker.h" #include "typedefs.h" // NOLINT(build/include)