IWYU modules/audio_mixer
using
find modules/audio_mixer -name "*.h" -o -name "*.cc" | | xargs tools_webrtc/iwyu/apply-include-cleaner
followed by
tools_webrtc/gn_check_autofix.py -C out/Default/
followed by
./out/Default/tools/clang/third_party/llvm/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -p out/Default/ -clang-tidy-binary out/Default/tools/clang/third_party/llvm/build/bin/clang-tidy -clang-apply-replacements-binary out/Default/tools/clang/third_party/llvm/build/bin/clang-apply-replacements -checks='-*,modernize-deprecated-headers' -fix modules/audio_mixer
and git cl format
Manual change to output_rate_calculator.h visibility
Bug: webrtc:42226242
Change-Id: I55c6de5106f1711b462bab186a88aee7795a300c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/394884
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44862}
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index 37c82ff..d2fa8db 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -32,6 +32,7 @@
"default_output_rate_calculator.h", # For creating a mixer with limiter
# disabled.
"frame_combiner.h",
+ "output_rate_calculator.h",
]
configs += [ "../audio_processing:apm_debug_dump" ]
@@ -39,6 +40,7 @@
deps = [
":audio_frame_manipulator",
"../../api:array_view",
+ "../../api:make_ref_counted",
"../../api:rtp_packet_info",
"../../api:scoped_refptr",
"../../api/audio:audio_frame_api",
@@ -116,6 +118,7 @@
":audio_mixer_test_utils",
"../../api:array_view",
"../../api:rtp_packet_info",
+ "../../api:scoped_refptr",
"../../api/audio:audio_frame_api",
"../../api/audio:audio_mixer_api",
"../../api/units:timestamp",
@@ -135,11 +138,15 @@
deps = [
":audio_mixer_impl",
+ "../../api:scoped_refptr",
+ "../../api/audio:audio_frame_api",
"../../api/audio:audio_mixer_api",
"../../common_audio",
+ "../../rtc_base:checks",
"../../rtc_base:stringutils",
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse",
+ "//third_party/abseil-cpp/absl/strings:string_view",
]
}
}
diff --git a/modules/audio_mixer/audio_frame_manipulator.cc b/modules/audio_mixer/audio_frame_manipulator.cc
index 94f03b2..5a6e067 100644
--- a/modules/audio_mixer/audio_frame_manipulator.cc
+++ b/modules/audio_mixer/audio_frame_manipulator.cc
@@ -10,6 +10,11 @@
#include "modules/audio_mixer/audio_frame_manipulator.h"
+#include <cstddef>
+#include <cstdint>
+
+#include "api/audio/audio_frame.h"
+#include "api/audio/channel_layout.h"
#include "audio/utility/audio_frame_operations.h"
#include "audio/utility/channel_mixer.h"
#include "rtc_base/checks.h"
diff --git a/modules/audio_mixer/audio_frame_manipulator_unittest.cc b/modules/audio_mixer/audio_frame_manipulator_unittest.cc
index cfb3f2c..0f340f7 100644
--- a/modules/audio_mixer/audio_frame_manipulator_unittest.cc
+++ b/modules/audio_mixer/audio_frame_manipulator_unittest.cc
@@ -11,7 +11,10 @@
#include "modules/audio_mixer/audio_frame_manipulator.h"
#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include "api/audio/audio_frame.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_mixer/audio_mixer_impl.cc b/modules/audio_mixer/audio_mixer_impl.cc
index 7a877a4..edf6828 100644
--- a/modules/audio_mixer/audio_mixer_impl.cc
+++ b/modules/audio_mixer/audio_mixer_impl.cc
@@ -10,17 +10,21 @@
#include "modules/audio_mixer/audio_mixer_impl.h"
-#include <stdint.h>
-
#include <algorithm>
-#include <iterator>
-#include <type_traits>
+#include <cstddef>
+#include <memory>
#include <utility>
+#include <vector>
-#include "modules/audio_mixer/audio_frame_manipulator.h"
+#include "api/array_view.h"
+#include "api/audio/audio_frame.h"
+#include "api/make_ref_counted.h"
+#include "api/scoped_refptr.h"
#include "modules/audio_mixer/default_output_rate_calculator.h"
+#include "modules/audio_mixer/output_rate_calculator.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
+#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/metrics.h"
diff --git a/modules/audio_mixer/audio_mixer_impl.h b/modules/audio_mixer/audio_mixer_impl.h
index fa90929..104f130 100644
--- a/modules/audio_mixer/audio_mixer_impl.h
+++ b/modules/audio_mixer/audio_mixer_impl.h
@@ -22,7 +22,6 @@
#include "api/scoped_refptr.h"
#include "modules/audio_mixer/frame_combiner.h"
#include "modules/audio_mixer/output_rate_calculator.h"
-#include "rtc_base/race_checker.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h"
diff --git a/modules/audio_mixer/audio_mixer_impl_unittest.cc b/modules/audio_mixer/audio_mixer_impl_unittest.cc
index 19b304f..82d2419 100644
--- a/modules/audio_mixer/audio_mixer_impl_unittest.cc
+++ b/modules/audio_mixer/audio_mixer_impl_unittest.cc
@@ -10,21 +10,23 @@
#include "modules/audio_mixer/audio_mixer_impl.h"
-#include <string.h>
-
+#include <algorithm>
#include <cstdint>
-#include <limits>
+#include <cstring>
#include <memory>
#include <optional>
#include <string>
-#include <utility>
#include <vector>
+#include "api/array_view.h"
+#include "api/audio/audio_frame.h"
#include "api/audio/audio_mixer.h"
#include "api/rtp_packet_info.h"
#include "api/rtp_packet_infos.h"
+#include "api/scoped_refptr.h"
#include "api/units/timestamp.h"
#include "modules/audio_mixer/default_output_rate_calculator.h"
+#include "modules/audio_mixer/output_rate_calculator.h"
#include "rtc_base/checks.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/task_queue_for_test.h"
diff --git a/modules/audio_mixer/audio_mixer_test.cc b/modules/audio_mixer/audio_mixer_test.cc
index b93547e..fb7de85 100644
--- a/modules/audio_mixer/audio_mixer_test.cc
+++ b/modules/audio_mixer/audio_mixer_test.cc
@@ -10,15 +10,23 @@
#include "api/audio/audio_mixer.h"
+#include <algorithm>
#include <cstring>
#include <iostream>
+#include <memory>
+#include <string>
#include <vector>
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
+#include "absl/strings/string_view.h"
+#include "api/audio/audio_frame.h"
+#include "api/scoped_refptr.h"
#include "common_audio/wav_file.h"
#include "modules/audio_mixer/audio_mixer_impl.h"
#include "modules/audio_mixer/default_output_rate_calculator.h"
+#include "modules/audio_mixer/output_rate_calculator.h"
+#include "rtc_base/checks.h"
#include "rtc_base/strings/string_builder.h"
ABSL_FLAG(int,
diff --git a/modules/audio_mixer/default_output_rate_calculator.cc b/modules/audio_mixer/default_output_rate_calculator.cc
index 576e838..6885875 100644
--- a/modules/audio_mixer/default_output_rate_calculator.cc
+++ b/modules/audio_mixer/default_output_rate_calculator.cc
@@ -13,6 +13,7 @@
#include <algorithm>
#include <iterator>
+#include "api/array_view.h"
#include "api/audio/audio_processing.h"
#include "rtc_base/checks.h"
diff --git a/modules/audio_mixer/default_output_rate_calculator.h b/modules/audio_mixer/default_output_rate_calculator.h
index 88e4435..acae77f 100644
--- a/modules/audio_mixer/default_output_rate_calculator.h
+++ b/modules/audio_mixer/default_output_rate_calculator.h
@@ -11,8 +11,6 @@
#ifndef MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_
#define MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_
-#include <vector>
-
#include "api/array_view.h"
#include "modules/audio_mixer/output_rate_calculator.h"
diff --git a/modules/audio_mixer/frame_combiner.h b/modules/audio_mixer/frame_combiner.h
index fd7d40e..74c4547 100644
--- a/modules/audio_mixer/frame_combiner.h
+++ b/modules/audio_mixer/frame_combiner.h
@@ -11,8 +11,9 @@
#ifndef MODULES_AUDIO_MIXER_FRAME_COMBINER_H_
#define MODULES_AUDIO_MIXER_FRAME_COMBINER_H_
+#include <array>
+#include <cstddef>
#include <memory>
-#include <vector>
#include "api/array_view.h"
#include "api/audio/audio_frame.h"
diff --git a/modules/audio_mixer/gain_change_calculator.cc b/modules/audio_mixer/gain_change_calculator.cc
index 729ab4b..ff14baa 100644
--- a/modules/audio_mixer/gain_change_calculator.cc
+++ b/modules/audio_mixer/gain_change_calculator.cc
@@ -10,11 +10,12 @@
#include "modules/audio_mixer/gain_change_calculator.h"
-#include <math.h>
-
+#include <cmath>
+#include <cstdint>
#include <cstdlib>
#include <vector>
+#include "api/array_view.h"
#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/modules/audio_mixer/output_rate_calculator.h b/modules/audio_mixer/output_rate_calculator.h
index 04ab82c..755da32 100644
--- a/modules/audio_mixer/output_rate_calculator.h
+++ b/modules/audio_mixer/output_rate_calculator.h
@@ -11,8 +11,6 @@
#ifndef MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_
#define MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_
-#include <vector>
-
#include "api/array_view.h"
namespace webrtc {
diff --git a/modules/audio_mixer/sine_wave_generator.cc b/modules/audio_mixer/sine_wave_generator.cc
index be3dd0c..6bb2b97 100644
--- a/modules/audio_mixer/sine_wave_generator.cc
+++ b/modules/audio_mixer/sine_wave_generator.cc
@@ -10,11 +10,13 @@
#include "modules/audio_mixer/sine_wave_generator.h"
-#include <math.h>
-#include <stddef.h>
-
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
#include <numbers>
+#include "api/audio/audio_frame.h"
+#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_conversions.h"
namespace webrtc {
