From e40468ba3dda1cb3382b11fca068565d3490deff Mon Sep 17 00:00:00 2001 From: Karl Wiberg Date: Wed, 22 Nov 2017 10:42:26 +0100 Subject: [PATCH] Move some numeric utility code from rtc_base/ to rtc_base/numerics/ Specifically, I'm moving safe_compare.h safe_conversions.h safe_minmax.h They shouldn't be part of the API, and moving them to an appropriate subdirectory of rtc_base/ is a good way to keep track of that. BUG=webrtc:8445 Change-Id: I458531aeb30bcf4291c4bec3bf22a2fffbf054ff Reviewed-on: https://webrtc-review.googlesource.com/20860 Commit-Queue: Karl Wiberg Reviewed-by: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#20829} --- api/audio_codecs/L16/audio_decoder_L16.cc | 2 +- api/audio_codecs/L16/audio_encoder_L16.cc | 2 +- api/audio_codecs/g711/audio_decoder_g711.cc | 2 +- api/audio_codecs/g711/audio_encoder_g711.cc | 4 ++-- api/audio_codecs/g722/audio_decoder_g722.cc | 2 +- api/audio_codecs/g722/audio_encoder_g722.cc | 4 ++-- api/audio_codecs/ilbc/audio_encoder_ilbc.cc | 4 ++-- api/video/video_timing.h | 2 +- audio/test/audio_stats_test.cc | 2 +- audio/utility/audio_frame_operations.cc | 2 +- call/rtp_demuxer_unittest.cc | 2 +- common_audio/audio_converter.cc | 2 +- .../signal_processing/dot_product_with_scale.cc | 2 +- common_audio/wav_file.cc | 2 +- common_video/h264/sps_vui_rewriter.cc | 2 +- .../encoder/rtc_event_log_encoder_unittest.cc | 2 +- logging/rtc_event_log/rtc_event_log.cc | 4 ++-- media/engine/webrtcvideocapturer.cc | 2 +- media/engine/webrtcvoiceengine_unittest.cc | 2 +- media/sctp/sctptransport.cc | 4 ++-- modules/audio_coding/acm2/acm_receiver.cc | 2 +- modules/audio_coding/acm2/acm_receiver_unittest.cc | 2 +- modules/audio_coding/acm2/audio_coding_module.cc | 2 +- .../acm2/audio_coding_module_unittest.cc | 2 +- .../bitrate_controller_unittest.cc | 2 +- .../audio_coding/codecs/audio_format_conversion.cc | 2 +- .../codecs/builtin_audio_encoder_factory_unittest.cc | 2 +- .../codecs/cng/audio_encoder_cng_unittest.cc | 2 +- modules/audio_coding/codecs/cng/webrtc_cng.cc | 2 +- .../audio_coding/codecs/g722/audio_encoder_g722.cc | 2 +- .../audio_coding/codecs/ilbc/audio_encoder_ilbc.cc | 2 +- modules/audio_coding/codecs/isac/unittest.cc | 2 +- .../codecs/legacy_encoded_audio_frame_unittest.cc | 5 +++-- .../audio_coding/codecs/opus/audio_encoder_opus.cc | 4 ++-- modules/audio_coding/codecs/opus/opus_unittest.cc | 2 +- .../codecs/pcm16b/audio_encoder_pcm16b.cc | 2 +- .../codecs/red/audio_encoder_copy_red_unittest.cc | 2 +- .../neteq/audio_multi_vector_unittest.cc | 2 +- modules/audio_coding/neteq/audio_vector_unittest.cc | 2 +- modules/audio_coding/neteq/delay_manager.cc | 2 +- modules/audio_coding/neteq/delay_peak_detector.cc | 2 +- modules/audio_coding/neteq/expand.cc | 2 +- modules/audio_coding/neteq/expand_unittest.cc | 2 +- modules/audio_coding/neteq/merge.cc | 4 ++-- modules/audio_coding/neteq/neteq_impl.cc | 2 +- modules/audio_coding/neteq/neteq_impl_unittest.cc | 2 +- modules/audio_coding/neteq/neteq_unittest.cc | 2 +- modules/audio_coding/neteq/normal.h | 2 +- modules/audio_coding/neteq/red_payload_splitter.cc | 2 +- .../neteq/red_payload_splitter_unittest.cc | 2 +- modules/audio_coding/neteq/statistics_calculator.cc | 2 +- modules/audio_coding/neteq/sync_buffer_unittest.cc | 2 +- .../neteq/test/neteq_ilbc_quality_test.cc | 2 +- .../neteq/test/neteq_pcmu_quality_test.cc | 2 +- modules/audio_coding/neteq/time_stretch.cc | 2 +- .../audio_coding/neteq/tools/encode_neteq_input.cc | 2 +- .../neteq/tools/fake_decode_from_file.cc | 2 +- .../neteq/tools/input_audio_file_unittest.cc | 2 +- modules/audio_device/audio_device_unittest.cc | 2 +- modules/audio_mixer/sine_wave_generator.cc | 2 +- .../audio_processing/aec/system_delay_unittest.cc | 2 +- .../aec3/adaptive_fir_filter_unittest.cc | 2 +- .../audio_processing/aec3/echo_remover_metrics.cc | 2 +- modules/audio_processing/aec3/erle_estimator.cc | 2 +- .../aec3/main_filter_update_gain_unittest.cc | 2 +- .../aec3/shadow_filter_update_gain_unittest.cc | 2 +- modules/audio_processing/aec3/subtractor.cc | 2 +- modules/audio_processing/aec3/suppression_filter.cc | 2 +- modules/audio_processing/aecm/aecm_core.cc | 2 +- modules/audio_processing/aecm/aecm_core_c.cc | 2 +- modules/audio_processing/aecm/aecm_core_mips.cc | 2 +- modules/audio_processing/agc/agc_manager_direct.cc | 2 +- modules/audio_processing/agc2/gain_controller2.cc | 2 +- .../audio_processing_performance_unittest.cc | 2 +- .../audio_processing/audio_processing_unittest.cc | 2 +- .../intelligibility/intelligibility_enhancer.cc | 2 +- .../intelligibility/intelligibility_utils.cc | 2 +- modules/audio_processing/rms_level_unittest.cc | 2 +- modules/congestion_controller/probe_controller.cc | 2 +- .../transport_feedback_adapter_unittest.cc | 2 +- modules/include/module_common_types.h | 2 +- .../remote_bitrate_estimator/aimd_rate_control.cc | 2 +- modules/remote_bitrate_estimator/overuse_detector.cc | 2 +- .../remote_estimator_proxy.cc | 2 +- .../test/bwe_test_framework.cc | 2 +- modules/rtp_rtcp/source/rtcp_packet/dlrr.cc | 2 +- .../rtp_rtcp/source/rtcp_packet/target_bitrate.cc | 2 +- modules/rtp_rtcp/source/rtp_packet.cc | 2 +- modules/rtp_rtcp/source/rtp_packet_received.cc | 2 +- modules/rtp_rtcp/source/rtp_sender.cc | 2 +- p2p/base/port.cc | 2 +- p2p/base/pseudotcp.cc | 2 +- pc/peerconnection.cc | 2 +- rtc_base/BUILD.gn | 12 ++++++------ rtc_base/checks.h | 2 +- rtc_base/{ => numerics}/safe_compare.h | 6 +++--- rtc_base/{ => numerics}/safe_compare_unittest.cc | 2 +- rtc_base/{ => numerics}/safe_conversions.h | 8 ++++---- rtc_base/{ => numerics}/safe_conversions_impl.h | 6 +++--- rtc_base/{ => numerics}/safe_minmax.h | 8 ++++---- rtc_base/{ => numerics}/safe_minmax_unittest.cc | 2 +- rtc_base/numerics/sequence_number_util.h | 2 +- rtc_base/openssladapter.cc | 2 +- rtc_base/opensslstreamadapter.cc | 2 +- rtc_base/random.cc | 2 +- rtc_base/rtccertificate_unittest.cc | 2 +- rtc_base/socketaddress.cc | 2 +- rtc_base/task_queue_libevent.cc | 2 +- rtc_base/task_queue_win.cc | 2 +- rtc_tools/agc/activity_metric.cc | 2 +- .../Classes/PeerConnection/RTCEncodedImage.mm | 2 +- test/fuzzers/neteq_signal_fuzzer.cc | 2 +- test/single_threaded_task_queue.cc | 2 +- voice_engine/channel_proxy.cc | 2 +- 114 files changed, 138 insertions(+), 137 deletions(-) rename rtc_base/{ => numerics}/safe_compare.h (98%) rename rtc_base/{ => numerics}/safe_compare_unittest.cc (99%) rename rtc_base/{ => numerics}/safe_conversions.h (92%) rename rtc_base/{ => numerics}/safe_conversions_impl.h (97%) rename rtc_base/{ => numerics}/safe_minmax.h (98%) rename rtc_base/{ => numerics}/safe_minmax_unittest.cc (99%) diff --git a/api/audio_codecs/L16/audio_decoder_L16.cc b/api/audio_codecs/L16/audio_decoder_L16.cc index d312f426b3..dd14e601f4 100644 --- a/api/audio_codecs/L16/audio_decoder_L16.cc +++ b/api/audio_codecs/L16/audio_decoder_L16.cc @@ -13,8 +13,8 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" #include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc index 4e14d2dbd0..d0d9f6f644 100644 --- a/api/audio_codecs/L16/audio_encoder_L16.cc +++ b/api/audio_codecs/L16/audio_encoder_L16.cc @@ -13,8 +13,8 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" #include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/g711/audio_decoder_g711.cc b/api/audio_codecs/g711/audio_decoder_g711.cc index 2191e63c3c..71d363be73 100644 --- a/api/audio_codecs/g711/audio_decoder_g711.cc +++ b/api/audio_codecs/g711/audio_decoder_g711.cc @@ -15,8 +15,8 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/g711/audio_encoder_g711.cc b/api/audio_codecs/g711/audio_encoder_g711.cc index 0ec8190a6d..7029caeaad 100644 --- a/api/audio_codecs/g711/audio_encoder_g711.cc +++ b/api/audio_codecs/g711/audio_encoder_g711.cc @@ -15,9 +15,9 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/string_to_number.h" namespace webrtc { diff --git a/api/audio_codecs/g722/audio_decoder_g722.cc b/api/audio_codecs/g722/audio_decoder_g722.cc index c50701ff16..961b1267fe 100644 --- a/api/audio_codecs/g722/audio_decoder_g722.cc +++ b/api/audio_codecs/g722/audio_decoder_g722.cc @@ -15,8 +15,8 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/g722/audio_decoder_g722.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/g722/audio_encoder_g722.cc b/api/audio_codecs/g722/audio_encoder_g722.cc index c2a70e62f3..f8aa6162d2 100644 --- a/api/audio_codecs/g722/audio_encoder_g722.cc +++ b/api/audio_codecs/g722/audio_encoder_g722.cc @@ -15,9 +15,9 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/g722/audio_encoder_g722.h" +#include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/string_to_number.h" namespace webrtc { diff --git a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc index ab0065e2b5..a7c68ffcf0 100644 --- a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc +++ b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc @@ -15,9 +15,9 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/string_to_number.h" namespace webrtc { diff --git a/api/video/video_timing.h b/api/video/video_timing.h index 2271f5de7f..ab8cd99136 100644 --- a/api/video/video_timing.h +++ b/api/video/video_timing.h @@ -17,7 +17,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/audio/test/audio_stats_test.cc b/audio/test/audio_stats_test.cc index a52ddee564..a1fecb8298 100644 --- a/audio/test/audio_stats_test.cc +++ b/audio/test/audio_stats_test.cc @@ -9,7 +9,7 @@ */ #include "audio/test/audio_end_to_end_test.h" -#include "rtc_base/safe_compare.h" +#include "rtc_base/numerics/safe_compare.h" #include "system_wrappers/include/sleep.h" #include "test/gtest.h" diff --git a/audio/utility/audio_frame_operations.cc b/audio/utility/audio_frame_operations.cc index 24ccfb3864..a7c77821f6 100644 --- a/audio/utility/audio_frame_operations.cc +++ b/audio/utility/audio_frame_operations.cc @@ -14,7 +14,7 @@ #include "modules/include/module_common_types.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace { diff --git a/call/rtp_demuxer_unittest.cc b/call/rtp_demuxer_unittest.cc index edb27ff53e..ef092ee98f 100644 --- a/call/rtp_demuxer_unittest.cc +++ b/call/rtp_demuxer_unittest.cc @@ -23,8 +23,8 @@ #include "rtc_base/arraysize.h" #include "rtc_base/basictypes.h" #include "rtc_base/checks.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/common_audio/audio_converter.cc b/common_audio/audio_converter.cc index f9f998bbaa..47d2be280e 100644 --- a/common_audio/audio_converter.cc +++ b/common_audio/audio_converter.cc @@ -18,7 +18,7 @@ #include "common_audio/channel_buffer.h" #include "common_audio/resampler/push_sinc_resampler.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" using rtc::checked_cast; diff --git a/common_audio/signal_processing/dot_product_with_scale.cc b/common_audio/signal_processing/dot_product_with_scale.cc index a35879a76f..00799dae02 100644 --- a/common_audio/signal_processing/dot_product_with_scale.cc +++ b/common_audio/signal_processing/dot_product_with_scale.cc @@ -10,7 +10,7 @@ #include "common_audio/signal_processing/dot_product_with_scale.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1, const int16_t* vector2, diff --git a/common_audio/wav_file.cc b/common_audio/wav_file.cc index 48dff3bd3e..37f249e7fa 100644 --- a/common_audio/wav_file.cc +++ b/common_audio/wav_file.cc @@ -18,7 +18,7 @@ #include "common_audio/include/audio_util.h" #include "common_audio/wav_header.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/common_video/h264/sps_vui_rewriter.cc b/common_video/h264/sps_vui_rewriter.cc index 9f4fb9e797..c346865090 100644 --- a/common_video/h264/sps_vui_rewriter.cc +++ b/common_video/h264/sps_vui_rewriter.cc @@ -18,7 +18,7 @@ #include "rtc_base/bitbuffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "common_video/h264/h264_common.h" #include "common_video/h264/sps_parser.h" diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc index c8b8c138b3..2221bf4b9a 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc @@ -41,9 +41,9 @@ #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "rtc_base/arraysize.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" #include "rtc_base/random.h" -#include "rtc_base/safe_conversions.h" #include "test/gtest.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log.cc b/logging/rtc_event_log/rtc_event_log.cc index 53096de435..9bbccafdc0 100644 --- a/logging/rtc_event_log/rtc_event_log.cc +++ b/logging/rtc_event_log/rtc_event_log.cc @@ -26,9 +26,9 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/media/engine/webrtcvideocapturer.cc b/media/engine/webrtcvideocapturer.cc index 4d8db6e66f..cf9eab6e6c 100644 --- a/media/engine/webrtcvideocapturer.cc +++ b/media/engine/webrtcvideocapturer.cc @@ -15,7 +15,7 @@ #include "rtc_base/checks.h" #include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/thread.h" #include "rtc_base/timeutils.h" diff --git a/media/engine/webrtcvoiceengine_unittest.cc b/media/engine/webrtcvoiceengine_unittest.cc index f1782626d0..6573b7ba3b 100644 --- a/media/engine/webrtcvoiceengine_unittest.cc +++ b/media/engine/webrtcvoiceengine_unittest.cc @@ -27,7 +27,7 @@ #include "pc/channel.h" #include "rtc_base/arraysize.h" #include "rtc_base/byteorder.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/media/sctp/sctptransport.cc b/media/sctp/sctptransport.cc index 545d18ac37..45db6372ce 100644 --- a/media/sctp/sctptransport.cc +++ b/media/sctp/sctptransport.cc @@ -26,7 +26,6 @@ enum PreservedErrno { #include #include -#include "usrsctplib/usrsctp.h" #include "media/base/codec.h" #include "media/base/mediaconstants.h" #include "media/base/streamparams.h" @@ -36,9 +35,10 @@ enum PreservedErrno { #include "rtc_base/criticalsection.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/thread_checker.h" #include "rtc_base/trace_event.h" +#include "usrsctplib/usrsctp.h" namespace { diff --git a/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc index 8f8b273033..e9a14be00e 100644 --- a/modules/audio_coding/acm2/acm_receiver.cc +++ b/modules/audio_coding/acm2/acm_receiver.cc @@ -25,7 +25,7 @@ #include "rtc_base/checks.h" #include "rtc_base/format_macros.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_receiver_unittest.cc b/modules/audio_coding/acm2/acm_receiver_unittest.cc index e8f8b4a92d..8d0b2f100e 100644 --- a/modules/audio_coding/acm2/acm_receiver_unittest.cc +++ b/modules/audio_coding/acm2/acm_receiver_unittest.cc @@ -18,7 +18,7 @@ #include "modules/audio_coding/include/audio_coding_module.h" #include "modules/audio_coding/neteq/tools/rtp_generator.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" diff --git a/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc index 340cc92fab..18325f4159 100644 --- a/modules/audio_coding/acm2/audio_coding_module.cc +++ b/modules/audio_coding/acm2/audio_coding_module.cc @@ -19,7 +19,7 @@ #include "modules/audio_coding/acm2/rent_a_codec.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc index 68dd671415..f0f4cdf6fe 100644 --- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc @@ -35,9 +35,9 @@ #include "modules/include/module_common_types.h" #include "rtc_base/criticalsection.h" #include "rtc_base/md5digest.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" #include "rtc_base/refcountedobject.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/event_wrapper.h" diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc index daad293af2..9864511c48 100644 --- a/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc @@ -9,7 +9,7 @@ */ #include "modules/audio_coding/audio_network_adaptor/bitrate_controller.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/modules/audio_coding/codecs/audio_format_conversion.cc b/modules/audio_coding/codecs/audio_format_conversion.cc index 39b0963247..a99a28cf2b 100644 --- a/modules/audio_coding/codecs/audio_format_conversion.cc +++ b/modules/audio_coding/codecs/audio_format_conversion.cc @@ -15,7 +15,7 @@ #include "api/array_view.h" #include "api/optional.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/sanitizer.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc b/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc index 58bfaed6a8..984bfd24f6 100644 --- a/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc +++ b/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc @@ -13,7 +13,7 @@ #include #include "api/audio_codecs/builtin_audio_encoder_factory.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc index 303529e3c7..6e246c9a55 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc @@ -14,7 +14,7 @@ #include "common_audio/vad/mock/mock_vad.h" #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" #include "rtc_base/constructormagic.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "test/mock_audio_encoder.h" diff --git a/modules/audio_coding/codecs/cng/webrtc_cng.cc b/modules/audio_coding/codecs/cng/webrtc_cng.cc index e2a3347a87..8b8e57eb44 100644 --- a/modules/audio_coding/codecs/cng/webrtc_cng.cc +++ b/modules/audio_coding/codecs/cng/webrtc_cng.cc @@ -13,7 +13,7 @@ #include #include "common_audio/signal_processing/include/signal_processing_library.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc index 03d09b3661..ec97ee3321 100644 --- a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc +++ b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc @@ -16,7 +16,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/g722/g722_interface.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc index 65471aefd3..6ddc078f09 100644 --- a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc +++ b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc @@ -15,7 +15,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/ilbc/ilbc.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/unittest.cc b/modules/audio_coding/codecs/isac/unittest.cc index df78ab797c..4e76e0dbbd 100644 --- a/modules/audio_coding/codecs/isac/unittest.cc +++ b/modules/audio_coding/codecs/isac/unittest.cc @@ -17,7 +17,7 @@ #include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" #include "modules/audio_coding/neteq/tools/input_audio_file.h" #include "rtc_base/buffer.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" diff --git a/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc index 06182ee123..e2dd4454e1 100644 --- a/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc +++ b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc @@ -8,9 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_coding/acm2/rent_a_codec.h" #include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" -#include "rtc_base/safe_conversions.h" + +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index 4b655dfdac..caac4ae34c 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -22,10 +22,10 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/exp_filter.h" +#include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/protobuf_utils.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/string_to_number.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_coding/codecs/opus/opus_unittest.cc b/modules/audio_coding/codecs/opus/opus_unittest.cc index be0530b74b..12a15853c9 100644 --- a/modules/audio_coding/codecs/opus/opus_unittest.cc +++ b/modules/audio_coding/codecs/opus/opus_unittest.cc @@ -15,7 +15,7 @@ #include "modules/audio_coding/codecs/opus/opus_interface.h" #include "modules/audio_coding/neteq/tools/audio_loop.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" diff --git a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc index 3887b5056a..831daedc63 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc +++ b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc @@ -15,7 +15,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc index 8c63796525..79d205e256 100644 --- a/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc +++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc @@ -13,7 +13,7 @@ #include "modules/audio_coding/codecs/red/audio_encoder_copy_red.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "test/mock_audio_encoder.h" diff --git a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc index 1489e80308..f05aee026c 100644 --- a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc @@ -9,13 +9,13 @@ */ #include "modules/audio_coding/neteq/audio_multi_vector.h" -#include "rtc_base/safe_conversions.h" #include #include #include +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "typedefs.h" // NOLINT(build/include) diff --git a/modules/audio_coding/neteq/audio_vector_unittest.cc b/modules/audio_coding/neteq/audio_vector_unittest.cc index 1ff8b85f5d..1b54abca5c 100644 --- a/modules/audio_coding/neteq/audio_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_vector_unittest.cc @@ -9,13 +9,13 @@ */ #include "modules/audio_coding/neteq/audio_vector.h" -#include "rtc_base/safe_conversions.h" #include #include #include +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "typedefs.h" // NOLINT(build/include) diff --git a/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc index 8c84cf0a65..dc854c7d57 100644 --- a/modules/audio_coding/neteq/delay_manager.cc +++ b/modules/audio_coding/neteq/delay_manager.cc @@ -20,7 +20,7 @@ #include "modules/audio_coding/neteq/delay_peak_detector.h" #include "modules/include/module_common_types.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/delay_peak_detector.cc b/modules/audio_coding/neteq/delay_peak_detector.cc index a6e7ef45da..eb9f6d530d 100644 --- a/modules/audio_coding/neteq/delay_peak_detector.cc +++ b/modules/audio_coding/neteq/delay_peak_detector.cc @@ -13,7 +13,7 @@ #include // max #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/expand.cc b/modules/audio_coding/neteq/expand.cc index 7223f6c228..3fb09ead49 100644 --- a/modules/audio_coding/neteq/expand.cc +++ b/modules/audio_coding/neteq/expand.cc @@ -23,7 +23,7 @@ #include "modules/audio_coding/neteq/random_vector.h" #include "modules/audio_coding/neteq/statistics_calculator.h" #include "modules/audio_coding/neteq/sync_buffer.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc index aeaa07bd01..b4e6466e90 100644 --- a/modules/audio_coding/neteq/expand_unittest.cc +++ b/modules/audio_coding/neteq/expand_unittest.cc @@ -18,7 +18,7 @@ #include "modules/audio_coding/neteq/statistics_calculator.h" #include "modules/audio_coding/neteq/sync_buffer.h" #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" diff --git a/modules/audio_coding/neteq/merge.cc b/modules/audio_coding/neteq/merge.cc index 71e0564e0d..9bc509b907 100644 --- a/modules/audio_coding/neteq/merge.cc +++ b/modules/audio_coding/neteq/merge.cc @@ -22,8 +22,8 @@ #include "modules/audio_coding/neteq/dsp_helper.h" #include "modules/audio_coding/neteq/expand.h" #include "modules/audio_coding/neteq/sync_buffer.h" -#include "rtc_base/safe_conversions.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc index 14f2fc7aaa..738e974463 100644 --- a/modules/audio_coding/neteq/neteq_impl.cc +++ b/modules/audio_coding/neteq/neteq_impl.cc @@ -44,7 +44,7 @@ #include "modules/include/module_common_types.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/sanitizer.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc index 2a21e51b38..3088b37c36 100644 --- a/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -28,7 +28,7 @@ #include "modules/audio_coding/neteq/sync_buffer.h" #include "modules/audio_coding/neteq/timestamp_scaler.h" #include "modules/include/module_common_types.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gmock.h" #include "test/gtest.h" #include "test/mock_audio_decoder.h" diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index b0f3a39de8..d204864822 100644 --- a/modules/audio_coding/neteq/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -28,8 +28,8 @@ #include "modules/include/module_common_types.h" #include "rtc_base/flags.h" #include "rtc_base/ignore_wundef.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/protobuf_utils.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/sha1digest.h" #include "rtc_base/stringencode.h" #include "test/gtest.h" diff --git a/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq/normal.h index a03e52a5e6..ab02217a37 100644 --- a/modules/audio_coding/neteq/normal.h +++ b/modules/audio_coding/neteq/normal.h @@ -19,7 +19,7 @@ #include "modules/audio_coding/neteq/defines.h" #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/red_payload_splitter.cc b/modules/audio_coding/neteq/red_payload_splitter.cc index dd102125fa..85e399c863 100644 --- a/modules/audio_coding/neteq/red_payload_splitter.cc +++ b/modules/audio_coding/neteq/red_payload_splitter.cc @@ -16,7 +16,7 @@ #include "modules/audio_coding/neteq/decoder_database.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc index 153a18e30e..4f511ad643 100644 --- a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc +++ b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc @@ -20,7 +20,7 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "modules/audio_coding/neteq/packet.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "test/mock_audio_decoder_factory.h" diff --git a/modules/audio_coding/neteq/statistics_calculator.cc b/modules/audio_coding/neteq/statistics_calculator.cc index 75a76aadc9..7228a5778e 100644 --- a/modules/audio_coding/neteq/statistics_calculator.cc +++ b/modules/audio_coding/neteq/statistics_calculator.cc @@ -16,7 +16,7 @@ #include "modules/audio_coding/neteq/delay_manager.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/sync_buffer_unittest.cc b/modules/audio_coding/neteq/sync_buffer_unittest.cc index ad049420e4..29c3bcaffe 100644 --- a/modules/audio_coding/neteq/sync_buffer_unittest.cc +++ b/modules/audio_coding/neteq/sync_buffer_unittest.cc @@ -9,7 +9,7 @@ */ #include "modules/audio_coding/neteq/sync_buffer.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" diff --git a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc index c18133a823..bca401a5d2 100644 --- a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc @@ -14,7 +14,7 @@ #include "modules/audio_coding/neteq/tools/neteq_quality_test.h" #include "rtc_base/checks.h" #include "rtc_base/flags.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/testsupport/fileutils.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc index c91d6f753f..bc3c1682e4 100644 --- a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc @@ -14,7 +14,7 @@ #include "modules/audio_coding/neteq/tools/neteq_quality_test.h" #include "rtc_base/checks.h" #include "rtc_base/flags.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/testsupport/fileutils.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/time_stretch.cc b/modules/audio_coding/neteq/time_stretch.cc index d0ea68af3a..8a1bfa2835 100644 --- a/modules/audio_coding/neteq/time_stretch.cc +++ b/modules/audio_coding/neteq/time_stretch.cc @@ -17,7 +17,7 @@ #include "modules/audio_coding/neteq/background_noise.h" #include "modules/audio_coding/neteq/cross_correlation.h" #include "modules/audio_coding/neteq/dsp_helper.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/encode_neteq_input.cc b/modules/audio_coding/neteq/tools/encode_neteq_input.cc index 212b811736..a8d1bdfe0a 100644 --- a/modules/audio_coding/neteq/tools/encode_neteq_input.cc +++ b/modules/audio_coding/neteq/tools/encode_neteq_input.cc @@ -13,7 +13,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/fake_decode_from_file.cc b/modules/audio_coding/neteq/tools/fake_decode_from_file.cc index 393a46fbcc..f4376088b8 100644 --- a/modules/audio_coding/neteq/tools/fake_decode_from_file.cc +++ b/modules/audio_coding/neteq/tools/fake_decode_from_file.cc @@ -12,7 +12,7 @@ #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc b/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc index 32bccea9ea..bf016a1246 100644 --- a/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc +++ b/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc @@ -11,7 +11,7 @@ // Unit tests for test InputAudioFile class. #include "modules/audio_coding/neteq/tools/input_audio_file.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc index b42a1c7fbc..d7df357259 100644 --- a/modules/audio_device/audio_device_unittest.cc +++ b/modules/audio_device/audio_device_unittest.cc @@ -21,8 +21,8 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/race_checker.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" diff --git a/modules/audio_mixer/sine_wave_generator.cc b/modules/audio_mixer/sine_wave_generator.cc index 85b9ce59fc..505d637284 100644 --- a/modules/audio_mixer/sine_wave_generator.cc +++ b/modules/audio_mixer/sine_wave_generator.cc @@ -12,7 +12,7 @@ #include -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_processing/aec/system_delay_unittest.cc b/modules/audio_processing/aec/system_delay_unittest.cc index 87b76afcd2..fc57af8b87 100644 --- a/modules/audio_processing/aec/system_delay_unittest.cc +++ b/modules/audio_processing/aec/system_delay_unittest.cc @@ -10,7 +10,7 @@ #include "modules/audio_processing/aec/aec_core.h" #include "modules/audio_processing/aec/echo_cancellation.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc index cc9b09bb32..11d7e02b41 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc +++ b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc @@ -26,8 +26,8 @@ #include "modules/audio_processing/logging/apm_data_dumper.h" #include "modules/audio_processing/test/echo_canceller_test_tools.h" #include "rtc_base/arraysize.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/random.h" -#include "rtc_base/safe_minmax.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" diff --git a/modules/audio_processing/aec3/echo_remover_metrics.cc b/modules/audio_processing/aec3/echo_remover_metrics.cc index 8ec4bcfa62..3a71299b1e 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics.cc +++ b/modules/audio_processing/aec3/echo_remover_metrics.cc @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/erle_estimator.cc b/modules/audio_processing/aec3/erle_estimator.cc index 9f7efd4295..385e6dd7e6 100644 --- a/modules/audio_processing/aec3/erle_estimator.cc +++ b/modules/audio_processing/aec3/erle_estimator.cc @@ -13,7 +13,7 @@ #include #include -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc index 561fcdb722..203731a929 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc +++ b/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc @@ -22,8 +22,8 @@ #include "modules/audio_processing/aec3/subtractor_output.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/random.h" -#include "rtc_base/safe_minmax.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc index 0d79a0d87d..b89fc718ac 100644 --- a/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc +++ b/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc @@ -19,8 +19,8 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec_state.h" #include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/random.h" -#include "rtc_base/safe_minmax.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/subtractor.cc b/modules/audio_processing/aec3/subtractor.cc index f1a9b80fca..b374f49cc3 100644 --- a/modules/audio_processing/aec3/subtractor.cc +++ b/modules/audio_processing/aec3/subtractor.cc @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_filter.cc b/modules/audio_processing/aec3/suppression_filter.cc index ab78b33cd5..8c92bf5762 100644 --- a/modules/audio_processing/aec3/suppression_filter.cc +++ b/modules/audio_processing/aec3/suppression_filter.cc @@ -17,7 +17,7 @@ #include #include "modules/audio_processing/utility/ooura_fft.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aecm/aecm_core.cc b/modules/audio_processing/aecm/aecm_core.cc index 61e6fa4db8..d69dc1ce76 100644 --- a/modules/audio_processing/aecm/aecm_core.cc +++ b/modules/audio_processing/aecm/aecm_core.cc @@ -24,7 +24,7 @@ extern "C" { } #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "typedefs.h" // NOLINT(build/include) #ifdef AEC_DEBUG diff --git a/modules/audio_processing/aecm/aecm_core_c.cc b/modules/audio_processing/aecm/aecm_core_c.cc index e05da64333..7fd6a499ad 100644 --- a/modules/audio_processing/aecm/aecm_core_c.cc +++ b/modules/audio_processing/aecm/aecm_core_c.cc @@ -24,7 +24,7 @@ extern "C" { } #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/sanitizer.h" #include "typedefs.h" // NOLINT(build/include) diff --git a/modules/audio_processing/aecm/aecm_core_mips.cc b/modules/audio_processing/aecm/aecm_core_mips.cc index 9516d82e38..58e5ec5e35 100644 --- a/modules/audio_processing/aecm/aecm_core_mips.cc +++ b/modules/audio_processing/aecm/aecm_core_mips.cc @@ -13,7 +13,7 @@ #include "modules/audio_processing/aecm/echo_control_mobile.h" #include "modules/audio_processing/utility/delay_estimator_wrapper.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { 0, 399, 798, 1196, 1594, 1990, 2386, 2780, 3172, diff --git a/modules/audio_processing/agc/agc_manager_direct.cc b/modules/audio_processing/agc/agc_manager_direct.cc index 944cfb7b08..706d4ab037 100644 --- a/modules/audio_processing/agc/agc_manager_direct.cc +++ b/modules/audio_processing/agc/agc_manager_direct.cc @@ -21,7 +21,7 @@ #include "modules/include/module_common_types.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/gain_controller2.cc b/modules/audio_processing/agc2/gain_controller2.cc index 4265500ab5..ca564e8b1d 100644 --- a/modules/audio_processing/agc2/gain_controller2.cc +++ b/modules/audio_processing/agc2/gain_controller2.cc @@ -16,7 +16,7 @@ #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc index 5418e56713..7a3670f7a6 100644 --- a/modules/audio_processing/audio_processing_performance_unittest.cc +++ b/modules/audio_processing/audio_processing_performance_unittest.cc @@ -19,9 +19,9 @@ #include "modules/audio_processing/test/test_utils.h" #include "modules/include/module_common_types.h" #include "rtc_base/atomicops.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" #include "rtc_base/random.h" -#include "rtc_base/safe_conversions.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/event_wrapper.h" #include "test/gtest.h" diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index e3de729d8f..c3402dd500 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -33,9 +33,9 @@ #include "rtc_base/checks.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/ignore_wundef.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/protobuf_utils.h" #include "rtc_base/refcountedobject.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread.h" #include "system_wrappers/include/event_wrapper.h" diff --git a/modules/audio_processing/intelligibility/intelligibility_enhancer.cc b/modules/audio_processing/intelligibility/intelligibility_enhancer.cc index 588310a8b7..0e696d9fff 100644 --- a/modules/audio_processing/intelligibility/intelligibility_enhancer.cc +++ b/modules/audio_processing/intelligibility/intelligibility_enhancer.cc @@ -20,7 +20,7 @@ #include "common_audio/window_generator.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/intelligibility/intelligibility_utils.cc b/modules/audio_processing/intelligibility/intelligibility_utils.cc index 159eada9b7..b6917f4407 100644 --- a/modules/audio_processing/intelligibility/intelligibility_utils.cc +++ b/modules/audio_processing/intelligibility/intelligibility_utils.cc @@ -16,7 +16,7 @@ #include #include -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/rms_level_unittest.cc b/modules/audio_processing/rms_level_unittest.cc index 093c8e70dc..8082d2429e 100644 --- a/modules/audio_processing/rms_level_unittest.cc +++ b/modules/audio_processing/rms_level_unittest.cc @@ -15,7 +15,7 @@ #include "modules/audio_processing/rms_level.h" #include "rtc_base/checks.h" #include "rtc_base/mathutils.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/congestion_controller/probe_controller.cc b/modules/congestion_controller/probe_controller.cc index f50f2cd154..8e6ae7cca1 100644 --- a/modules/congestion_controller/probe_controller.cc +++ b/modules/congestion_controller/probe_controller.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/congestion_controller/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/transport_feedback_adapter_unittest.cc index 49bbbfdb4b..1cff0d981f 100644 --- a/modules/congestion_controller/transport_feedback_adapter_unittest.cc +++ b/modules/congestion_controller/transport_feedback_adapter_unittest.cc @@ -18,7 +18,7 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/clock.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h index c4594f5067..0db5a5e408 100644 --- a/modules/include/module_common_types.h +++ b/modules/include/module_common_types.h @@ -26,7 +26,7 @@ #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "rtc_base/constructormagic.h" #include "rtc_base/deprecation.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/timeutils.h" #include "typedefs.h" // NOLINT(build/include) diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.cc b/modules/remote_bitrate_estimator/aimd_rate_control.cc index 288c3d71fe..22c2cc6ba1 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.cc +++ b/modules/remote_bitrate_estimator/aimd_rate_control.cc @@ -16,7 +16,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" diff --git a/modules/remote_bitrate_estimator/overuse_detector.cc b/modules/remote_bitrate_estimator/overuse_detector.cc index 55c7b58ec9..7110d35642 100644 --- a/modules/remote_bitrate_estimator/overuse_detector.cc +++ b/modules/remote_bitrate_estimator/overuse_detector.cc @@ -21,7 +21,7 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy.cc index 77354e19a0..1e42266f7d 100644 --- a/modules/remote_bitrate_estimator/remote_estimator_proxy.cc +++ b/modules/remote_bitrate_estimator/remote_estimator_proxy.cc @@ -16,7 +16,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc index 6c303eea04..2a6614fc0f 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc @@ -15,7 +15,7 @@ #include #include "rtc_base/constructormagic.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { namespace testing { diff --git a/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc b/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc index 40cc2e5702..6863def2fe 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc @@ -13,7 +13,7 @@ #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc index 5afab54103..601b24fe94 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc @@ -12,7 +12,7 @@ #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc index 468a90bae4..f2a9709ca4 100644 --- a/modules/rtp_rtcp/source/rtp_packet.cc +++ b/modules/rtp_rtcp/source/rtp_packet.cc @@ -18,8 +18,8 @@ #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/random.h" -#include "rtc_base/safe_conversions.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc index 83f10e20cf..1106e22a24 100644 --- a/modules/rtp_rtcp/source/rtp_packet_received.cc +++ b/modules/rtp_rtcp/source/rtp_packet_received.cc @@ -13,7 +13,7 @@ #include #include "modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index 16cf8ff663..539dda6a63 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -27,9 +27,9 @@ #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/ptr_util.h" #include "rtc_base/rate_limiter.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/field_trial.h" diff --git a/p2p/base/port.cc b/p2p/base/port.cc index 1c316d2cb2..4421db2a2e 100644 --- a/p2p/base/port.cc +++ b/p2p/base/port.cc @@ -24,8 +24,8 @@ #include "rtc_base/logging.h" #include "rtc_base/messagedigest.h" #include "rtc_base/network.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_minmax.h" #include "rtc_base/stringencode.h" #include "rtc_base/stringutils.h" diff --git a/p2p/base/pseudotcp.cc b/p2p/base/pseudotcp.cc index 610deced41..5daecbeb7f 100644 --- a/p2p/base/pseudotcp.cc +++ b/p2p/base/pseudotcp.cc @@ -23,7 +23,7 @@ #include "rtc_base/byteorder.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/socket.h" #include "rtc_base/stringutils.h" #include "rtc_base/timeutils.h" diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc index d4ae7b01fd..62e0ef868f 100644 --- a/pc/peerconnection.cc +++ b/pc/peerconnection.cc @@ -40,8 +40,8 @@ #include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/stringencode.h" #include "rtc_base/stringutils.h" #include "rtc_base/trace_event.h" diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 20797cc0ab..e7a6cec917 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -146,6 +146,10 @@ rtc_source_set("rtc_base_approved_generic") { "location.h", "mod_ops.h", "moving_max_counter.h", + "numerics/safe_compare.h", + "numerics/safe_conversions.h", + "numerics/safe_conversions_impl.h", + "numerics/safe_minmax.h", "onetimeevent.h", "pathutils.cc", "pathutils.h", @@ -168,10 +172,6 @@ rtc_source_set("rtc_base_approved_generic") { "refcount.h", "refcountedobject.h", "refcounter.h", - "safe_compare.h", - "safe_conversions.h", - "safe_conversions_impl.h", - "safe_minmax.h", "sanitizer.h", "scoped_ref_ptr.h", "string_to_number.cc", @@ -875,6 +875,8 @@ if (rtc_include_tests) { "md5digest_unittest.cc", "mod_ops_unittest.cc", "moving_max_counter_unittest.cc", + "numerics/safe_compare_unittest.cc", + "numerics/safe_minmax_unittest.cc", "onetimeevent_unittest.cc", "pathutils_unittest.cc", "platform_thread_unittest.cc", @@ -883,8 +885,6 @@ if (rtc_include_tests) { "rate_statistics_unittest.cc", "ratetracker_unittest.cc", "refcountedobject_unittest.cc", - "safe_compare_unittest.cc", - "safe_minmax_unittest.cc", "string_to_number_unittest.cc", "stringencode_unittest.cc", "stringize_macros_unittest.cc", diff --git a/rtc_base/checks.h b/rtc_base/checks.h index 9f5fc2e6b5..e9a19e6051 100644 --- a/rtc_base/checks.h +++ b/rtc_base/checks.h @@ -36,7 +36,7 @@ NO_RETURN void rtc_FatalMessage(const char* file, int line, const char* msg); #include #include -#include "rtc_base/safe_compare.h" +#include "rtc_base/numerics/safe_compare.h" // The macros here print a message to stderr and abort under various // conditions. All will accept additional stream messages. For example: diff --git a/rtc_base/safe_compare.h b/rtc_base/numerics/safe_compare.h similarity index 98% rename from rtc_base/safe_compare.h rename to rtc_base/numerics/safe_compare.h index 017f137a45..85f0a30e83 100644 --- a/rtc_base/safe_compare.h +++ b/rtc_base/numerics/safe_compare.h @@ -28,8 +28,8 @@ // zero; in the remaining cases, it is just a few machine instructions (no // branches). -#ifndef RTC_BASE_SAFE_COMPARE_H_ -#define RTC_BASE_SAFE_COMPARE_H_ +#ifndef RTC_BASE_NUMERICS_SAFE_COMPARE_H_ +#define RTC_BASE_NUMERICS_SAFE_COMPARE_H_ #include #include @@ -173,4 +173,4 @@ RTC_SAFECMP_MAKE_FUN(Ge) } // namespace rtc -#endif // RTC_BASE_SAFE_COMPARE_H_ +#endif // RTC_BASE_NUMERICS_SAFE_COMPARE_H_ diff --git a/rtc_base/safe_compare_unittest.cc b/rtc_base/numerics/safe_compare_unittest.cc similarity index 99% rename from rtc_base/safe_compare_unittest.cc rename to rtc_base/numerics/safe_compare_unittest.cc index 521f5f5efb..e7a251f88a 100644 --- a/rtc_base/safe_compare_unittest.cc +++ b/rtc_base/numerics/safe_compare_unittest.cc @@ -10,7 +10,7 @@ #include -#include "rtc_base/safe_compare.h" +#include "rtc_base/numerics/safe_compare.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/safe_conversions.h b/rtc_base/numerics/safe_conversions.h similarity index 92% rename from rtc_base/safe_conversions.h rename to rtc_base/numerics/safe_conversions.h index 73ac06733d..58efcaa746 100644 --- a/rtc_base/safe_conversions.h +++ b/rtc_base/numerics/safe_conversions.h @@ -10,13 +10,13 @@ // Borrowed from Chromium's src/base/numerics/safe_conversions.h. -#ifndef RTC_BASE_SAFE_CONVERSIONS_H_ -#define RTC_BASE_SAFE_CONVERSIONS_H_ +#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_ +#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_ #include #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions_impl.h" +#include "rtc_base/numerics/safe_conversions_impl.h" namespace rtc { @@ -73,4 +73,4 @@ inline Dst saturated_cast(Src value) { } // namespace rtc -#endif // RTC_BASE_SAFE_CONVERSIONS_H_ +#endif // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_ diff --git a/rtc_base/safe_conversions_impl.h b/rtc_base/numerics/safe_conversions_impl.h similarity index 97% rename from rtc_base/safe_conversions_impl.h rename to rtc_base/numerics/safe_conversions_impl.h index 7f05a11b97..9b4f1c6483 100644 --- a/rtc_base/safe_conversions_impl.h +++ b/rtc_base/numerics/safe_conversions_impl.h @@ -10,8 +10,8 @@ // Borrowed from Chromium's src/base/numerics/safe_conversions_impl.h. -#ifndef RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ -#define RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ +#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ +#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ #include @@ -172,4 +172,4 @@ inline RangeCheckResult RangeCheck(Src value) { } // namespace internal } // namespace rtc -#endif // RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ +#endif // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ diff --git a/rtc_base/safe_minmax.h b/rtc_base/numerics/safe_minmax.h similarity index 98% rename from rtc_base/safe_minmax.h rename to rtc_base/numerics/safe_minmax.h index d20aea822a..8d00afbebd 100644 --- a/rtc_base/safe_minmax.h +++ b/rtc_base/numerics/safe_minmax.h @@ -73,14 +73,14 @@ // result, then everything's fine, and the return type is as requested. But if // the requested type is too small, a static_assert is triggered. -#ifndef RTC_BASE_SAFE_MINMAX_H_ -#define RTC_BASE_SAFE_MINMAX_H_ +#ifndef RTC_BASE_NUMERICS_SAFE_MINMAX_H_ +#define RTC_BASE_NUMERICS_SAFE_MINMAX_H_ #include #include #include "rtc_base/checks.h" -#include "rtc_base/safe_compare.h" +#include "rtc_base/numerics/safe_compare.h" #include "rtc_base/type_traits.h" namespace rtc { @@ -332,4 +332,4 @@ R2 SafeClamp(T x, L min, H max) { } // namespace rtc -#endif // RTC_BASE_SAFE_MINMAX_H_ +#endif // RTC_BASE_NUMERICS_SAFE_MINMAX_H_ diff --git a/rtc_base/safe_minmax_unittest.cc b/rtc_base/numerics/safe_minmax_unittest.cc similarity index 99% rename from rtc_base/safe_minmax_unittest.cc rename to rtc_base/numerics/safe_minmax_unittest.cc index 1e4f4b33a4..72d23b66f4 100644 --- a/rtc_base/safe_minmax_unittest.cc +++ b/rtc_base/numerics/safe_minmax_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/numerics/sequence_number_util.h b/rtc_base/numerics/sequence_number_util.h index 9dbd812b2d..4a39347f00 100644 --- a/rtc_base/numerics/sequence_number_util.h +++ b/rtc_base/numerics/sequence_number_util.h @@ -16,7 +16,7 @@ #include "api/optional.h" #include "rtc_base/mod_ops.h" -#include "rtc_base/safe_compare.h" +#include "rtc_base/numerics/safe_compare.h" namespace webrtc { diff --git a/rtc_base/openssladapter.cc b/rtc_base/openssladapter.cc index a5ef0fe125..a064596881 100644 --- a/rtc_base/openssladapter.cc +++ b/rtc_base/openssladapter.cc @@ -28,8 +28,8 @@ #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/openssl.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/sslroots.h" #include "rtc_base/stringencode.h" #include "rtc_base/stringutils.h" diff --git a/rtc_base/opensslstreamadapter.cc b/rtc_base/opensslstreamadapter.cc index bdc39c20be..0d2d9006ba 100644 --- a/rtc_base/opensslstreamadapter.cc +++ b/rtc_base/opensslstreamadapter.cc @@ -26,11 +26,11 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/openssl.h" #include "rtc_base/openssladapter.h" #include "rtc_base/openssldigest.h" #include "rtc_base/opensslidentity.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/stream.h" #include "rtc_base/stringutils.h" #include "rtc_base/thread.h" diff --git a/rtc_base/random.cc b/rtc_base/random.cc index 1043505458..5deb621727 100644 --- a/rtc_base/random.cc +++ b/rtc_base/random.cc @@ -12,7 +12,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/rtc_base/rtccertificate_unittest.cc b/rtc_base/rtccertificate_unittest.cc index 04a76764ec..7252a040b4 100644 --- a/rtc_base/rtccertificate_unittest.cc +++ b/rtc_base/rtccertificate_unittest.cc @@ -15,8 +15,8 @@ #include "rtc_base/fakesslidentity.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/rtccertificate.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/sslidentity.h" #include "rtc_base/thread.h" #include "rtc_base/timeutils.h" diff --git a/rtc_base/socketaddress.cc b/rtc_base/socketaddress.cc index 8e2ce6caa9..54a41d420e 100644 --- a/rtc_base/socketaddress.cc +++ b/rtc_base/socketaddress.cc @@ -9,7 +9,7 @@ */ #include "rtc_base/socketaddress.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" #if defined(WEBRTC_POSIX) #include diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc index eb242b6639..2f8921102e 100644 --- a/rtc_base/task_queue_libevent.cc +++ b/rtc_base/task_queue_libevent.cc @@ -18,10 +18,10 @@ #include "base/third_party/libevent/event.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" #include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_queue_posix.h" #include "rtc_base/timeutils.h" diff --git a/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc index 082bf9d631..8a626e9299 100644 --- a/rtc_base/task_queue_win.cc +++ b/rtc_base/task_queue_win.cc @@ -21,10 +21,10 @@ #include "rtc_base/checks.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" #include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_tools/agc/activity_metric.cc b/rtc_tools/agc/activity_metric.cc index ce0840a51b..3c65d02b4a 100644 --- a/rtc_tools/agc/activity_metric.cc +++ b/rtc_tools/agc/activity_metric.cc @@ -25,7 +25,7 @@ #include "modules/audio_processing/vad/vad_audio_proc.h" #include "modules/include/module_common_types.h" #include "rtc_base/flags.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "test/gtest.h" static const int kAgcAnalWindowSamples = 100; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm index fc76921ba3..ef2840f157 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm @@ -12,7 +12,7 @@ #import "RTCVideoCodec+Private.h" -#include "rtc_base/safe_conversions.h" +#include "rtc_base/numerics/safe_conversions.h" @implementation RTCEncodedImage diff --git a/test/fuzzers/neteq_signal_fuzzer.cc b/test/fuzzers/neteq_signal_fuzzer.cc index 907e99ee7a..f0b79113ae 100644 --- a/test/fuzzers/neteq_signal_fuzzer.cc +++ b/test/fuzzers/neteq_signal_fuzzer.cc @@ -19,8 +19,8 @@ #include "modules/audio_coding/neteq/tools/encode_neteq_input.h" #include "modules/audio_coding/neteq/tools/neteq_test.h" #include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/random.h" -#include "rtc_base/safe_conversions.h" namespace webrtc { namespace test { diff --git a/test/single_threaded_task_queue.cc b/test/single_threaded_task_queue.cc index 6ca57a2007..8a8cbea614 100644 --- a/test/single_threaded_task_queue.cc +++ b/test/single_threaded_task_queue.cc @@ -13,8 +13,8 @@ #include #include "rtc_base/checks.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ptr_util.h" -#include "rtc_base/safe_conversions.h" #include "rtc_base/timeutils.h" namespace webrtc { diff --git a/voice_engine/channel_proxy.cc b/voice_engine/channel_proxy.cc index aff9883ba8..8d56db0d4f 100644 --- a/voice_engine/channel_proxy.cc +++ b/voice_engine/channel_proxy.cc @@ -16,7 +16,7 @@ #include "call/rtp_transport_controller_send_interface.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/safe_minmax.h" +#include "rtc_base/numerics/safe_minmax.h" #include "voice_engine/channel.h" namespace webrtc {