mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
Move sequence_number_utils.h to rtc_base/
Bug: webrtc:8440 Change-Id: I36e70da6ce70b95db7d3fce8b0013bff5c795bfc Reviewed-on: https://webrtc-review.googlesource.com/14860 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Reviewed-by: Philip Eliasson <philipel@webrtc.org> Commit-Queue: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20429}
This commit is contained in:
parent
ddfd9c5fd2
commit
a194e58e79
15 changed files with 20 additions and 16 deletions
|
@ -141,6 +141,7 @@ if (rtc_include_tests) {
|
||||||
"../../rtc_base:gtest_prod",
|
"../../rtc_base:gtest_prod",
|
||||||
"../../rtc_base:rtc_base",
|
"../../rtc_base:rtc_base",
|
||||||
"../../rtc_base:rtc_base_approved",
|
"../../rtc_base:rtc_base_approved",
|
||||||
|
"../../rtc_base:rtc_numerics",
|
||||||
"../../system_wrappers",
|
"../../system_wrappers",
|
||||||
"../../test:test_support",
|
"../../test:test_support",
|
||||||
"../../voice_engine",
|
"../../voice_engine",
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "api/optional.h"
|
#include "api/optional.h"
|
||||||
#include "modules/remote_bitrate_estimator/test/bwe.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"
|
#include "rtc_base/random.h"
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
|
@ -137,7 +137,6 @@ rtc_source_set("video_coding_utility") {
|
||||||
sources = [
|
sources = [
|
||||||
"codecs/interface/video_codec_interface.h",
|
"codecs/interface/video_codec_interface.h",
|
||||||
"codecs/interface/video_error_codes.h",
|
"codecs/interface/video_error_codes.h",
|
||||||
"sequence_number_util.h",
|
|
||||||
"utility/default_video_bitrate_allocator.cc",
|
"utility/default_video_bitrate_allocator.cc",
|
||||||
"utility/default_video_bitrate_allocator.h",
|
"utility/default_video_bitrate_allocator.h",
|
||||||
"utility/frame_dropper.cc",
|
"utility/frame_dropper.cc",
|
||||||
|
@ -524,7 +523,6 @@ if (rtc_include_tests) {
|
||||||
"protection_bitrate_calculator_unittest.cc",
|
"protection_bitrate_calculator_unittest.cc",
|
||||||
"receiver_unittest.cc",
|
"receiver_unittest.cc",
|
||||||
"rtp_frame_reference_finder_unittest.cc",
|
"rtp_frame_reference_finder_unittest.cc",
|
||||||
"sequence_number_util_unittest.cc",
|
|
||||||
"session_info_unittest.cc",
|
"session_info_unittest.cc",
|
||||||
"test/stream_generator.cc",
|
"test/stream_generator.cc",
|
||||||
"test/stream_generator.h",
|
"test/stream_generator.h",
|
||||||
|
@ -564,6 +562,7 @@ if (rtc_include_tests) {
|
||||||
"../../common_video:common_video",
|
"../../common_video:common_video",
|
||||||
"../../rtc_base:rtc_base",
|
"../../rtc_base:rtc_base",
|
||||||
"../../rtc_base:rtc_base_approved",
|
"../../rtc_base:rtc_base_approved",
|
||||||
|
"../../rtc_base:rtc_numerics",
|
||||||
"../../rtc_base:rtc_task_queue",
|
"../../rtc_base:rtc_task_queue",
|
||||||
"../../system_wrappers:metrics_default",
|
"../../system_wrappers:metrics_default",
|
||||||
"../../system_wrappers:system_wrappers",
|
"../../system_wrappers:system_wrappers",
|
||||||
|
|
|
@ -19,10 +19,10 @@
|
||||||
#include "modules/video_coding/frame_object.h"
|
#include "modules/video_coding/frame_object.h"
|
||||||
#include "modules/video_coding/include/video_coding_defines.h"
|
#include "modules/video_coding/include/video_coding_defines.h"
|
||||||
#include "modules/video_coding/inter_frame_delay.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/constructormagic.h"
|
||||||
#include "rtc_base/criticalsection.h"
|
#include "rtc_base/criticalsection.h"
|
||||||
#include "rtc_base/event.h"
|
#include "rtc_base/event.h"
|
||||||
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
#include "rtc_base/thread_annotations.h"
|
#include "rtc_base/thread_annotations.h"
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
|
|
||||||
#include "modules/video_coding/frame_object.h"
|
#include "modules/video_coding/frame_object.h"
|
||||||
#include "modules/video_coding/jitter_estimator.h"
|
#include "modules/video_coding/jitter_estimator.h"
|
||||||
#include "modules/video_coding/sequence_number_util.h"
|
|
||||||
#include "modules/video_coding/timing.h"
|
#include "modules/video_coding/timing.h"
|
||||||
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
#include "rtc_base/platform_thread.h"
|
#include "rtc_base/platform_thread.h"
|
||||||
#include "rtc_base/random.h"
|
#include "rtc_base/random.h"
|
||||||
#include "system_wrappers/include/clock.h"
|
#include "system_wrappers/include/clock.h"
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include "modules/video_coding/sequence_number_util.h"
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
namespace video_coding {
|
namespace video_coding {
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
#include "modules/video_coding/histogram.h"
|
#include "modules/video_coding/histogram.h"
|
||||||
#include "modules/video_coding/include/video_coding_defines.h"
|
#include "modules/video_coding/include/video_coding_defines.h"
|
||||||
#include "modules/video_coding/packet.h"
|
#include "modules/video_coding/packet.h"
|
||||||
#include "modules/video_coding/sequence_number_util.h"
|
|
||||||
#include "rtc_base/criticalsection.h"
|
#include "rtc_base/criticalsection.h"
|
||||||
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
#include "rtc_base/thread_annotations.h"
|
#include "rtc_base/thread_annotations.h"
|
||||||
#include "system_wrappers/include/clock.h"
|
#include "system_wrappers/include/clock.h"
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
#include "modules/include/module_common_types.h"
|
#include "modules/include/module_common_types.h"
|
||||||
#include "modules/video_coding/packet.h"
|
#include "modules/video_coding/packet.h"
|
||||||
#include "modules/video_coding/rtp_frame_reference_finder.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/criticalsection.h"
|
||||||
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
#include "rtc_base/scoped_ref_ptr.h"
|
#include "rtc_base/scoped_ref_ptr.h"
|
||||||
#include "rtc_base/thread_annotations.h"
|
#include "rtc_base/thread_annotations.h"
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include "modules/include/module_common_types.h"
|
#include "modules/include/module_common_types.h"
|
||||||
#include "modules/video_coding/sequence_number_util.h"
|
|
||||||
#include "rtc_base/criticalsection.h"
|
#include "rtc_base/criticalsection.h"
|
||||||
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
#include "rtc_base/thread_annotations.h"
|
#include "rtc_base/thread_annotations.h"
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
|
@ -403,9 +403,11 @@ rtc_static_library("rtc_numerics") {
|
||||||
"numerics/exp_filter.cc",
|
"numerics/exp_filter.cc",
|
||||||
"numerics/exp_filter.h",
|
"numerics/exp_filter.h",
|
||||||
"numerics/percentile_filter.h",
|
"numerics/percentile_filter.h",
|
||||||
|
"numerics/sequence_number_util.h",
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [
|
||||||
":rtc_base_approved",
|
":rtc_base_approved",
|
||||||
|
"../api:optional",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -996,6 +998,7 @@ if (rtc_include_tests) {
|
||||||
sources = [
|
sources = [
|
||||||
"numerics/exp_filter_unittest.cc",
|
"numerics/exp_filter_unittest.cc",
|
||||||
"numerics/percentile_filter_unittest.cc",
|
"numerics/percentile_filter_unittest.cc",
|
||||||
|
"numerics/sequence_number_util_unittest.cc",
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [
|
||||||
":rtc_base_approved",
|
":rtc_base_approved",
|
||||||
|
|
|
@ -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_SEQUENCE_NUMBER_UTIL_H_
|
#ifndef RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
|
||||||
#define MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_
|
#define RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
|
||||||
|
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
@ -125,4 +125,4 @@ class SeqNumUnwrapper {
|
||||||
|
|
||||||
} // namespace webrtc
|
} // namespace webrtc
|
||||||
|
|
||||||
#endif // MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_
|
#endif // RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
|
|
||||||
#include "modules/video_coding/sequence_number_util.h"
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
#include "test/gtest.h"
|
#include "test/gtest.h"
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
|
@ -296,6 +296,7 @@ if (rtc_include_tests) {
|
||||||
"../modules/video_coding:webrtc_vp9",
|
"../modules/video_coding:webrtc_vp9",
|
||||||
"../rtc_base:rtc_base_approved",
|
"../rtc_base:rtc_base_approved",
|
||||||
"../rtc_base:rtc_base_tests_utils",
|
"../rtc_base:rtc_base_tests_utils",
|
||||||
|
"../rtc_base:rtc_numerics",
|
||||||
"../system_wrappers",
|
"../system_wrappers",
|
||||||
"../system_wrappers:field_trial_default",
|
"../system_wrappers:field_trial_default",
|
||||||
"../system_wrappers:metrics_api",
|
"../system_wrappers:metrics_api",
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "media/engine/internalencoderfactory.h"
|
#include "media/engine/internalencoderfactory.h"
|
||||||
#include "media/engine/simulcast_encoder_adapter.h"
|
#include "media/engine/simulcast_encoder_adapter.h"
|
||||||
#include "modules/rtp_rtcp/source/rtp_format.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/call_test.h"
|
||||||
#include "test/field_trial.h"
|
#include "test/field_trial.h"
|
||||||
|
|
||||||
|
|
|
@ -22,17 +22,17 @@
|
||||||
#include "modules/include/module_common_types.h"
|
#include "modules/include/module_common_types.h"
|
||||||
#include "modules/rtp_rtcp/include/receive_statistics.h"
|
#include "modules/rtp_rtcp/include/receive_statistics.h"
|
||||||
#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.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_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.h"
|
||||||
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
||||||
#include "modules/video_coding/h264_sps_pps_tracker.h"
|
#include "modules/video_coding/h264_sps_pps_tracker.h"
|
||||||
#include "modules/video_coding/include/video_coding_defines.h"
|
#include "modules/video_coding/include/video_coding_defines.h"
|
||||||
#include "modules/video_coding/packet_buffer.h"
|
#include "modules/video_coding/packet_buffer.h"
|
||||||
#include "modules/video_coding/rtp_frame_reference_finder.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/constructormagic.h"
|
||||||
#include "rtc_base/criticalsection.h"
|
#include "rtc_base/criticalsection.h"
|
||||||
|
#include "rtc_base/numerics/sequence_number_util.h"
|
||||||
#include "rtc_base/sequenced_task_checker.h"
|
#include "rtc_base/sequenced_task_checker.h"
|
||||||
#include "typedefs.h" // NOLINT(build/include)
|
#include "typedefs.h" // NOLINT(build/include)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue