From 3c0aae17f0e3a70fe90ecc6835926b66a3de18fb Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 4 Sep 2014 09:55:40 +0000 Subject: [PATCH] Change gflags and gmock includes to be full paths. This will fix PRESUBMIT warnings developers will get due to r7014 and r7020. Also some minor style cleanup in: webrtc/modules/audio_coding/main/test/RTPFile.cc webrtc/modules/audio_coding/neteq/test/RTPjitter.cc BUG= R=henrik.lundin@webrtc.org, niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/23429004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7058 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 1 + webrtc/base/gunit.h | 2 +- .../audio_coding/codecs/cng/cng_unittest.cc | 2 +- .../isac/fix/source/filterbanks_unittest.cc | 2 +- .../isac/fix/source/filters_unittest.cc | 2 +- .../fix/source/lpc_masking_model_unittest.cc | 2 +- .../isac/fix/source/transform_unittest.cc | 2 +- .../main/acm2/acm_opus_unittest.cc | 2 +- .../main/acm2/acm_receiver_unittest.cc | 2 +- .../main/acm2/call_statistics_unittest.cc | 2 +- .../acm2/initial_delay_manager_unittest.cc | 2 +- .../audio_coding/main/acm2/nack_unittest.cc | 2 +- .../modules/audio_coding/main/test/PCMFile.cc | 4 +- .../modules/audio_coding/main/test/RTPFile.cc | 3 +- .../audio_coding/main/test/TestAllCodecs.cc | 2 +- .../audio_coding/main/test/TestStereo.cc | 2 +- .../main/test/TwoWayCommunication.cc | 2 +- .../main/test/dual_stream_unittest.cc | 2 +- .../main/test/initial_delay_unittest.cc | 2 +- .../main/test/insert_packet_with_timing.cc | 2 +- .../main/test/target_delay_unittest.cc | 2 +- .../neteq/audio_classifier_unittest.cc | 2 +- .../neteq/audio_decoder_unittest.cc | 2 +- .../neteq/audio_multi_vector_unittest.cc | 2 +- .../neteq/audio_vector_unittest.cc | 2 +- .../neteq/background_noise_unittest.cc | 2 +- .../neteq/buffer_level_filter_unittest.cc | 2 +- .../neteq/comfort_noise_unittest.cc | 2 +- .../neteq/decision_logic_unittest.cc | 2 +- .../neteq/decoder_database_unittest.cc | 4 +- .../neteq/delay_manager_unittest.cc | 4 +- .../neteq/delay_peak_detector_unittest.cc | 2 +- .../audio_coding/neteq/dsp_helper_unittest.cc | 2 +- .../neteq/dtmf_buffer_unittest.cc | 2 +- .../neteq/dtmf_tone_generator_unittest.cc | 2 +- .../audio_coding/neteq/expand_unittest.cc | 2 +- .../audio_coding/neteq/merge_unittest.cc | 2 +- .../neteq/mock/mock_audio_decoder.h | 2 +- .../neteq/mock/mock_audio_vector.h | 2 +- .../neteq/mock/mock_buffer_level_filter.h | 2 +- .../neteq/mock/mock_decoder_database.h | 2 +- .../neteq/mock/mock_delay_manager.h | 2 +- .../neteq/mock/mock_delay_peak_detector.h | 2 +- .../neteq/mock/mock_dtmf_buffer.h | 2 +- .../neteq/mock/mock_dtmf_tone_generator.h | 2 +- .../neteq/mock/mock_external_decoder_pcm16b.h | 2 +- .../neteq/mock/mock_packet_buffer.h | 2 +- .../neteq/mock/mock_payload_splitter.h | 2 +- .../neteq/neteq_external_decoder_unittest.cc | 4 +- .../audio_coding/neteq/neteq_impl_unittest.cc | 4 +- .../neteq/neteq_stereo_unittest.cc | 2 +- .../audio_coding/neteq/neteq_unittest.cc | 2 +- .../audio_coding/neteq/normal_unittest.cc | 2 +- .../neteq/packet_buffer_unittest.cc | 4 +- .../neteq/payload_splitter_unittest.cc | 2 +- .../neteq/post_decode_vad_unittest.cc | 2 +- .../neteq/random_vector_unittest.cc | 2 +- .../neteq/sync_buffer_unittest.cc | 2 +- .../modules/audio_coding/neteq/test/RTPcat.cc | 2 +- .../audio_coding/neteq/test/RTPjitter.cc | 250 +++++++++--------- .../audio_coding/neteq/test/RTPtimeshift.cc | 2 +- .../neteq/time_stretch_unittest.cc | 2 +- .../neteq/timestamp_scaler_unittest.cc | 4 +- .../neteq/tools/input_audio_file_unittest.cc | 2 +- .../neteq/tools/packet_unittest.cc | 2 +- .../desktop_and_cursor_composer_unittest.cc | 2 +- .../desktop_region_unittest.cc | 2 +- .../mouse_cursor_monitor_unittest.cc | 2 +- .../window_capturer_unittest.cc | 2 +- .../bwe_simulations.cc | 2 +- .../remote_bitrate_estimator/test/bwe_test.h | 2 +- .../test/bwe_test_framework_unittest.cc | 2 +- .../e2e_quality/audio/audio_e2e_harness.cc | 2 +- 73 files changed, 211 insertions(+), 197 deletions(-) diff --git a/DEPS b/DEPS index 70877b74d2..60387c49af 100644 --- a/DEPS +++ b/DEPS @@ -49,6 +49,7 @@ include_rules = [ # checkdeps.py shouldn't check include paths for files in these dirs: skip_child_includes = [ + 'gflags', 'testing', 'third_party', ] diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h index 6d9c06fef0..7431fcf308 100644 --- a/webrtc/base/gunit.h +++ b/webrtc/base/gunit.h @@ -14,7 +14,7 @@ #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" #if defined(WEBRTC_ANDROID) || defined(GTEST_RELATIVE_PATH) -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #else #include "testing/base/public/gunit.h" #endif diff --git a/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc b/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc index d363cb2ba8..0d1c670290 100644 --- a/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc_cng.h" diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc index d15318a7c9..3276331e79 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h" diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc index e070789e48..4ea4dabc55 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" #include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc index 08527158fb..aaeff2c5c8 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" #include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc index 9a624e9b18..855b5feafd 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" #include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" diff --git a/webrtc/modules/audio_coding/main/acm2/acm_opus_unittest.cc b/webrtc/modules/audio_coding/main/acm2/acm_opus_unittest.cc index 45ddd012d3..e33c9d3829 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_opus_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_opus_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_opus.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc index 81c97e5e1d..b2ff3bcf49 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc @@ -12,7 +12,7 @@ #include // std::min -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" diff --git a/webrtc/modules/audio_coding/main/acm2/call_statistics_unittest.cc b/webrtc/modules/audio_coding/main/acm2/call_statistics_unittest.cc index 61aadd73cf..2bee96465d 100644 --- a/webrtc/modules/audio_coding/main/acm2/call_statistics_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/call_statistics_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/initial_delay_manager_unittest.cc b/webrtc/modules/audio_coding/main/acm2/initial_delay_manager_unittest.cc index 38b7cfc271..4bf9437dee 100644 --- a/webrtc/modules/audio_coding/main/acm2/initial_delay_manager_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/initial_delay_manager_unittest.cc @@ -10,7 +10,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/main/acm2/initial_delay_manager.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/nack_unittest.cc b/webrtc/modules/audio_coding/main/acm2/nack_unittest.cc index 5837c31a89..7863c75b96 100644 --- a/webrtc/modules/audio_coding/main/acm2/nack_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/nack_unittest.cc @@ -14,7 +14,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/typedefs.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" diff --git a/webrtc/modules/audio_coding/main/test/PCMFile.cc b/webrtc/modules/audio_coding/main/test/PCMFile.cc index ce189548fb..4f46098a7b 100644 --- a/webrtc/modules/audio_coding/main/test/PCMFile.cc +++ b/webrtc/modules/audio_coding/main/test/PCMFile.cc @@ -14,8 +14,8 @@ #include #include -#include "gtest/gtest.h" -#include "module_common_types.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/modules/interface/module_common_types.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/RTPFile.cc b/webrtc/modules/audio_coding/main/test/RTPFile.cc index 5c0446525a..789dc1dbc8 100644 --- a/webrtc/modules/audio_coding/main/test/RTPFile.cc +++ b/webrtc/modules/audio_coding/main/test/RTPFile.cc @@ -20,8 +20,9 @@ #include "audio_coding_module.h" #include "engine_configurations.h" -#include "gtest/gtest.h" // TODO (tlegrand): Consider removing usage of gtest. #include "rw_lock_wrapper.h" +// TODO(tlegrand): Consider removing usage of gtest. +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc b/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc index 10654a7a73..9b7667b5fc 100644 --- a/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc +++ b/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc @@ -13,7 +13,7 @@ #include #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" diff --git a/webrtc/modules/audio_coding/main/test/TestStereo.cc b/webrtc/modules/audio_coding/main/test/TestStereo.cc index b9677e3734..9c22548a6a 100644 --- a/webrtc/modules/audio_coding/main/test/TestStereo.cc +++ b/webrtc/modules/audio_coding/main/test/TestStereo.cc @@ -14,7 +14,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc index 81ef0c3ff8..b5592d0706 100644 --- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc +++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc @@ -18,7 +18,7 @@ #include #endif -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/engine_configurations.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/test/PCMFile.h" diff --git a/webrtc/modules/audio_coding/main/test/dual_stream_unittest.cc b/webrtc/modules/audio_coding/main/test/dual_stream_unittest.cc index 71657c9f48..ecd1e79d9c 100644 --- a/webrtc/modules/audio_coding/main/test/dual_stream_unittest.cc +++ b/webrtc/modules/audio_coding/main/test/dual_stream_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/test/PCMFile.h" diff --git a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc index 192539d85f..0b7aad189e 100644 --- a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc +++ b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc @@ -15,7 +15,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" diff --git a/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc b/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc index 398a6b3efc..0173ac1d11 100644 --- a/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc +++ b/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc @@ -11,7 +11,7 @@ #include #include "gflags/gflags.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/test/Channel.h" diff --git a/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc index 5636bdf80f..02b8467b86 100644 --- a/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc +++ b/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" diff --git a/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc index cf623ca088..530044e63c 100644 --- a/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc @@ -16,7 +16,7 @@ #include #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc index 687a733c6e..d33c8f23da 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc @@ -15,7 +15,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_audio/resampler/include/resampler.h" #ifdef WEBRTC_CODEC_CELT #include "webrtc/modules/audio_coding/codecs/celt/include/celt_interface.h" diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc index 7dabe64f8c..2677f6998f 100644 --- a/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc @@ -15,7 +15,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc index 50da1fb46c..7259dd0733 100644 --- a/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc @@ -15,7 +15,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc index 0aee62c97b..bd69d67024 100644 --- a/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/background_noise.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc index 9589099d4a..4151a9b1ab 100644 --- a/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc @@ -14,7 +14,7 @@ #include // Access to pow function. -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc index 6a1bbe0d14..cc636a1763 100644 --- a/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/comfort_noise.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc index f9056a6cba..499f946434 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for DecisionLogic class and derived classes. -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "webrtc/modules/audio_coding/neteq/decision_logic.h" diff --git a/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc index d0c6f5ae89..6f497199c9 100644 --- a/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc @@ -15,8 +15,8 @@ #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc index 6f9733234d..30e7647bc4 100644 --- a/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc @@ -14,8 +14,8 @@ #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc index 080309be01..c40f3991b0 100644 --- a/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc index cbceff6194..a052a588a9 100644 --- a/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/neteq/dsp_helper.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc index 83f981386b..4824b2baca 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc @@ -18,7 +18,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" // Modify the tests so that they pass with the modifications done to DtmfBuffer // for backwards bit-exactness. Once bit-exactness is no longer required, this diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc index 829d126cf4..ccd7fa606f 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc @@ -14,7 +14,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/expand_unittest.cc b/webrtc/modules/audio_coding/neteq/expand_unittest.cc index bd39f408ff..68b4f60f15 100644 --- a/webrtc/modules/audio_coding/neteq/expand_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/expand_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/expand.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/random_vector.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" diff --git a/webrtc/modules/audio_coding/neteq/merge_unittest.cc b/webrtc/modules/audio_coding/neteq/merge_unittest.cc index fb5f789ff1..bdcbbb8a9b 100644 --- a/webrtc/modules/audio_coding/neteq/merge_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/merge_unittest.cc @@ -14,7 +14,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/expand.h" #include "webrtc/modules/audio_coding/neteq/random_vector.h" diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h index edf3b54e9e..f3cecc2458 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h b/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h index a5a787c7aa..a35a26a21d 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/audio_vector.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h index d9210668dd..ebc6acda99 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h index 583fa54ba0..d127c5d810 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/decoder_database.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h index c21a1c28c7..1d2dc8ea3d 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/delay_manager.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h index 26e09329e6..fa5cd7ed06 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h index 0351d6b1e5..c76ffaf962 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h index 3bed4d152b..881e9005bb 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index 9522b537e3..ef5e03e560 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h index 2882248c19..74eea6f091 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h b/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h index f1665423af..09fa4e1235 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/payload_splitter.h" -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index a40107651d..9497a85e52 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -13,8 +13,8 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc index 402d79db87..d5676d7b5e 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/audio_coding/neteq/neteq_impl.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/accelerate.h" #include "webrtc/modules/audio_coding/neteq/expand.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc index 3c695c81d0..c9a10dff61 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index d60077df79..256c557d60 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -24,7 +24,7 @@ #include #include "gflags/gflags.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" diff --git a/webrtc/modules/audio_coding/neteq/normal_unittest.cc b/webrtc/modules/audio_coding/neteq/normal_unittest.cc index 309dad327f..e96359a9cc 100644 --- a/webrtc/modules/audio_coding/neteq/normal_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/normal_unittest.cc @@ -14,7 +14,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc index 5e6b89fdc4..d8af556c99 100644 --- a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "webrtc/modules/audio_coding/neteq/packet.h" diff --git a/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc b/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc index 9d0aaa1d99..cf29581ab7 100644 --- a/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc @@ -16,7 +16,7 @@ #include // pair -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc index ed48db858d..65efa7a23e 100644 --- a/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc index cbdcdf7c82..ad8e32ded4 100644 --- a/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/random_vector.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc index 1a3d0fe781..332ec2f4e8 100644 --- a/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/test/RTPcat.cc b/webrtc/modules/audio_coding/neteq/test/RTPcat.cc index f06b574f04..19a34ec2e9 100644 --- a/webrtc/modules/audio_coding/neteq/test/RTPcat.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPcat.cc @@ -13,7 +13,7 @@ #include #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #define FIRSTLINELEN 40 diff --git a/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc b/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc index eeb4c90140..75983d259e 100644 --- a/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc @@ -25,7 +25,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/typedefs.h" /*********************/ @@ -33,11 +33,13 @@ /*********************/ #define FIRSTLINELEN 40 -#define CHECK_NOT_NULL(a) if((a)==NULL){fprintf(stderr,"\n %s \n line: %d \nerror at %s\n",__FILE__,__LINE__,#a );return(-1);} +#define CHECK_NOT_NULL(a) if((a)==NULL){ \ + fprintf(stderr,"\n %s \n line: %d \nerror at %s\n",__FILE__,__LINE__,#a ); \ + return(-1);} struct arr_time { - float time; - uint32_t ix; + float time; + uint32_t ix; }; int filelen(FILE *fid) @@ -61,157 +63,167 @@ int compare_arr_time(const void *x, const void *y); int main(int argc, char* argv[]) { - unsigned int dat_len, rtp_len, Npack, k; - arr_time *time_vec; - char firstline[FIRSTLINELEN]; - unsigned char* rtp_vec = NULL; + unsigned int dat_len, rtp_len, Npack, k; + arr_time *time_vec; + char firstline[FIRSTLINELEN]; + unsigned char* rtp_vec = NULL; unsigned char** packet_ptr = NULL; unsigned char* temp_packet = NULL; - const unsigned int kRtpDumpHeaderSize = 4 + 4 + 4 + 2 + 2; - uint16_t len; - uint32_t *offset; + const unsigned int kRtpDumpHeaderSize = 4 + 4 + 4 + 2 + 2; + uint16_t len; + uint32_t *offset; /* check number of parameters */ - if (argc != 4) { - /* print help text and exit */ - printf("Apply jitter on RTP stream.\n"); - printf("The program reads an RTP stream and packet timing from two files.\n"); - printf("The RTP stream is modified to have the same jitter as described in the timing files.\n"); - printf("The format of the RTP stream file should be the same as for rtpplay,\n"); - printf("and can be obtained e.g., from Ethereal by using\n"); - printf("Statistics -> RTP -> Show All Streams -> [select a stream] -> Save As\n\n"); - printf("Usage:\n\n"); - printf("%s RTP_infile dat_file RTP_outfile\n", argv[0]); - printf("where:\n"); + if (argc != 4) { + /* print help text and exit */ + printf("Apply jitter on RTP stream.\n"); + printf("Reads an RTP stream and packet timing from two files.\n"); + printf("The RTP stream is modified to have the same jitter as described in " + "the timing files.\n"); + printf("The format of the RTP stream file should be the same as for \n"); + printf("rtpplay, and can be obtained e.g., from Ethereal by using\n"); + printf("Statistics -> RTP -> Show All Streams -> [select a stream] -> " + "Save As\n\n"); + printf("Usage:\n\n"); + printf("%s RTP_infile dat_file RTP_outfile\n", argv[0]); + printf("where:\n"); - printf("RTP_infile : RTP stream input file\n\n"); + printf("RTP_infile : RTP stream input file\n\n"); - printf("dat_file : file with packet arrival times in ms\n\n"); + printf("dat_file : file with packet arrival times in ms\n\n"); - printf("RTP_outfile : RTP stream output file\n\n"); + printf("RTP_outfile : RTP stream output file\n\n"); - return(0); - } + return(0); + } - FILE* in_file=fopen(argv[1],"rb"); - CHECK_NOT_NULL(in_file); - printf("Input file: %s\n",argv[1]); - FILE* dat_file=fopen(argv[2],"rb"); - CHECK_NOT_NULL(dat_file); - printf("Dat-file: %s\n",argv[2]); - FILE* out_file=fopen(argv[3],"wb"); - CHECK_NOT_NULL(out_file); - printf("Output file: %s\n\n",argv[3]); - - time_vec = (arr_time *) malloc(sizeof(arr_time)*(filelen(dat_file)/sizeof(float)) + 1000); // add 1000 bytes to avoid (rare) strange error - if (time_vec==NULL) { - fprintf(stderr, "Error: could not allocate memory for reading dat file\n"); - goto closing; - } + FILE* in_file=fopen(argv[1],"rb"); + CHECK_NOT_NULL(in_file); + printf("Input file: %s\n",argv[1]); + FILE* dat_file=fopen(argv[2],"rb"); + CHECK_NOT_NULL(dat_file); + printf("Dat-file: %s\n",argv[2]); + FILE* out_file=fopen(argv[3],"wb"); + CHECK_NOT_NULL(out_file); + printf("Output file: %s\n\n",argv[3]); + + // add 1000 bytes to avoid (rare) strange error. + time_vec = (arr_time *) malloc(sizeof(arr_time) + *(filelen(dat_file)/sizeof(float)) + 1000); + if (time_vec==NULL) { + fprintf(stderr, "Error: could not allocate memory for reading dat file\n"); + goto closing; + } + + dat_len=0; + while(fread(&(time_vec[dat_len].time),sizeof(float),1,dat_file)>0) { + time_vec[dat_len].ix=dat_len; + dat_len++; + } - dat_len=0; - while(fread(&(time_vec[dat_len].time),sizeof(float),1,dat_file)>0) { - time_vec[dat_len].ix=dat_len; - dat_len++; - } - if (dat_len == 0) { fprintf(stderr, "Error: dat_file is empty, no arrival time is given.\n"); goto closing; } - qsort(time_vec,dat_len,sizeof(arr_time),compare_arr_time); + qsort(time_vec,dat_len,sizeof(arr_time),compare_arr_time); - rtp_vec = (unsigned char *) malloc(sizeof(unsigned char)*filelen(in_file)); - if (rtp_vec==NULL) { - fprintf(stderr,"Error: could not allocate memory for reading rtp file\n"); - goto closing; - } + rtp_vec = (unsigned char *) malloc(sizeof(unsigned char)*filelen(in_file)); + if (rtp_vec==NULL) { + fprintf(stderr,"Error: could not allocate memory for reading rtp file\n"); + goto closing; + } - // read file header and write directly to output file - EXPECT_TRUE(fgets(firstline, FIRSTLINELEN, in_file) != NULL); - EXPECT_GT(fputs(firstline, out_file), 0); - EXPECT_EQ(kRtpDumpHeaderSize, fread(firstline, 1, kRtpDumpHeaderSize, - in_file)); - EXPECT_EQ(kRtpDumpHeaderSize, fwrite(firstline, 1, kRtpDumpHeaderSize, - out_file)); + // read file header and write directly to output file + EXPECT_TRUE(fgets(firstline, FIRSTLINELEN, in_file) != NULL); + EXPECT_GT(fputs(firstline, out_file), 0); + EXPECT_EQ(kRtpDumpHeaderSize, fread(firstline, 1, kRtpDumpHeaderSize, + in_file)); + EXPECT_EQ(kRtpDumpHeaderSize, fwrite(firstline, 1, kRtpDumpHeaderSize, + out_file)); - // read all RTP packets into vector - rtp_len=0; - Npack=0; - len=(uint16_t) fread(&rtp_vec[rtp_len], sizeof(unsigned char), 2, in_file); // read length of first packet - while(len==2) { - len = ntohs(*((uint16_t *)(rtp_vec + rtp_len))); - rtp_len += 2; - if(fread(&rtp_vec[rtp_len], sizeof(unsigned char), len-2, in_file)!=(unsigned) (len-2)) { - fprintf(stderr,"Error: currupt packet length\n"); - goto closing; - } - rtp_len += len-2; - Npack++; - len=(uint16_t) fread(&rtp_vec[rtp_len], sizeof(unsigned char), 2, in_file); // read length of next packet - } + // read all RTP packets into vector + rtp_len=0; + Npack=0; - if (Npack == 0) { - fprintf(stderr, "Error: No RTP packet found.\n"); - goto closing; - } + // read length of first packet. + len=(uint16_t) fread(&rtp_vec[rtp_len], sizeof(unsigned char), 2, in_file); + while(len==2) { + len = ntohs(*((uint16_t *)(rtp_vec + rtp_len))); + rtp_len += 2; + if(fread(&rtp_vec[rtp_len], sizeof(unsigned char), + len-2, in_file)!=(unsigned) (len-2)) { + fprintf(stderr,"Error: currupt packet length\n"); + goto closing; + } + rtp_len += len-2; + Npack++; - packet_ptr = (unsigned char **) malloc(Npack*sizeof(unsigned char*)); + // read length of next packet. + len=(uint16_t) fread(&rtp_vec[rtp_len], sizeof(unsigned char), 2, in_file); + } - packet_ptr[0]=rtp_vec; - k=1; - while(k= 0 ) { - *offset = htonl((uint32_t) time_vec[k].time); - } - else { - *offset = htonl((uint32_t) 0); - fprintf(stderr, "Warning: negative receive time in dat file transformed to 0.\n"); - } + packet_ptr = (unsigned char **) malloc(Npack*sizeof(unsigned char*)); - // write packet to file - if (fwrite(temp_packet, sizeof(unsigned char), - ntohs(*((uint16_t*) temp_packet)), - out_file) != - ntohs(*((uint16_t*) temp_packet))) { - return -1; - } - } - } + packet_ptr[0]=rtp_vec; + k=1; + while(k= 0 ) { + *offset = htonl((uint32_t) time_vec[k].time); + } + else { + *offset = htonl((uint32_t) 0); + fprintf(stderr, "Warning: negative receive time in dat file transformed" + " to 0.\n"); + } + + // write packet to file + if (fwrite(temp_packet, sizeof(unsigned char), + ntohs(*((uint16_t*) temp_packet)), + out_file) != + ntohs(*((uint16_t*) temp_packet))) { + return -1; + } + } + } closing: - free(time_vec); - free(rtp_vec); + free(time_vec); + free(rtp_vec); if (packet_ptr != NULL) { - free(packet_ptr); + free(packet_ptr); } fclose(in_file); - fclose(dat_file); - fclose(out_file); + fclose(dat_file); + fclose(out_file); - return(0); + return(0); } int compare_arr_time(const void *xp, const void *yp) { - if(((arr_time *)xp)->time == ((arr_time *)yp)->time) - return(0); - else if(((arr_time *)xp)->time > ((arr_time *)yp)->time) - return(1); + if(((arr_time *)xp)->time == ((arr_time *)yp)->time) + return(0); + else if(((arr_time *)xp)->time > ((arr_time *)yp)->time) + return(1); - return(-1); + return(-1); } diff --git a/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc b/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc index 15ffdf6a51..f27819d03c 100644 --- a/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc @@ -13,7 +13,7 @@ #include #include "NETEQTEST_RTPpacket.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" /*********************/ /* Misc. definitions */ diff --git a/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc index 64789b4d43..3d1e06936a 100644 --- a/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/accelerate.h" #include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc index 1cbbf7f346..4b6d940aeb 100644 --- a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "webrtc/modules/audio_coding/neteq/packet.h" diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc b/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc index 67448fefc8..13d847b76e 100644 --- a/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc index df844ee84f..10bcc5cf7f 100644 --- a/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc index b482a29605..d2579a1709 100644 --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/desktop_and_cursor_composer.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" diff --git a/webrtc/modules/desktop_capture/desktop_region_unittest.cc b/webrtc/modules/desktop_capture/desktop_region_unittest.cc index 747e8c0a5a..3062f0b93c 100644 --- a/webrtc/modules/desktop_capture/desktop_region_unittest.cc +++ b/webrtc/modules/desktop_capture/desktop_region_unittest.cc @@ -12,7 +12,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc index c6af2b700e..5a541d0478 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" diff --git a/webrtc/modules/desktop_capture/window_capturer_unittest.cc b/webrtc/modules/desktop_capture/window_capturer_unittest.cc index ad60a4bd17..9ac7d18b19 100644 --- a/webrtc/modules/desktop_capture/window_capturer_unittest.cc +++ b/webrtc/modules/desktop_capture/window_capturer_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/window_capturer.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_region.h" diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc index 47390f78f6..142de871cd 100644 --- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc +++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h index 495906537b..d02e064552 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h @@ -11,7 +11,7 @@ #include #include #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc index 6e735785b8..51c1dc210f 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -12,7 +12,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/tools/e2e_quality/audio/audio_e2e_harness.cc b/webrtc/tools/e2e_quality/audio/audio_e2e_harness.cc index 4d443773fd..39e9974aa7 100644 --- a/webrtc/tools/e2e_quality/audio/audio_e2e_harness.cc +++ b/webrtc/tools/e2e_quality/audio/audio_e2e_harness.cc @@ -13,7 +13,7 @@ // flags. #include "gflags/gflags.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/channel_transport/include/channel_transport.h"