diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index a08bcf3717..09b9df577a 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -1156,10 +1156,6 @@ rtc_source_set("neteq_test_tools") { rtc_source_set("neteq_tools") { visibility += webrtc_default_visibility - configs += [ - "../..:no_exit_time_destructors", - "../..:no_global_constructors", - ] sources = [ "neteq/tools/fake_decode_from_file.cc", "neteq/tools/fake_decode_from_file.h", @@ -1187,6 +1183,7 @@ rtc_source_set("neteq_tools") { "../../rtc_base:rtc_base_approved", "../rtp_rtcp", "../rtp_rtcp:rtp_rtcp_format", + "//third_party/abseil-cpp/absl/strings:strings", "//third_party/abseil-cpp/absl/types:optional", ] diff --git a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc index e5bd7652ef..60e6902435 100644 --- a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc +++ b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc @@ -17,18 +17,19 @@ #include #include +#include "absl/strings/string_view.h" #include "modules/include/module_common_types.h" #include "rtc_base/checks.h" namespace webrtc { namespace test { namespace { -std::string kArrivalDelayX = "arrival_delay_x"; -std::string kArrivalDelayY = "arrival_delay_y"; -std::string kTargetDelayX = "target_delay_x"; -std::string kTargetDelayY = "target_delay_y"; -std::string kPlayoutDelayX = "playout_delay_x"; -std::string kPlayoutDelayY = "playout_delay_y"; +constexpr char kArrivalDelayX[] = "arrival_delay_x"; +constexpr char kArrivalDelayY[] = "arrival_delay_y"; +constexpr char kTargetDelayX[] = "target_delay_x"; +constexpr char kTargetDelayY[] = "target_delay_y"; +constexpr char kPlayoutDelayX[] = "playout_delay_x"; +constexpr char kPlayoutDelayY[] = "playout_delay_y"; // Helper function for NetEqDelayAnalyzer::CreateGraphs. Returns the // interpolated value of a function at the point x. Vector x_vec contains the @@ -64,8 +65,8 @@ double LinearInterpolate(double x, void PrintDelays(const NetEqDelayAnalyzer::Delays& delays, int64_t ref_time_ms, - const std::string& var_name_x, - const std::string& var_name_y, + absl::string_view var_name_x, + absl::string_view var_name_y, std::ofstream& output, const std::string& terminator = "") { output << var_name_x << " = [ ";