Bump to WebRTC M120 release
Some API deprecation -- ExperimentalAgc and ExperimentalNs are gone. We're continuing to carry iSAC even though it's gone upstream, but maybe we'll want to drop that soon.
This commit is contained in:
@ -10,6 +10,7 @@
|
||||
|
||||
#include "modules/audio_processing/logging/apm_data_dumper.h"
|
||||
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "rtc_base/strings/string_builder.h"
|
||||
|
||||
// Check to verify that the define is properly set.
|
||||
@ -29,17 +30,16 @@ constexpr char kPathDelimiter = '\\';
|
||||
constexpr char kPathDelimiter = '/';
|
||||
#endif
|
||||
|
||||
std::string FormFileName(const char* output_dir,
|
||||
const char* name,
|
||||
std::string FormFileName(absl::string_view output_dir,
|
||||
absl::string_view name,
|
||||
int instance_index,
|
||||
int reinit_index,
|
||||
const std::string& suffix) {
|
||||
absl::string_view suffix) {
|
||||
char buf[1024];
|
||||
rtc::SimpleStringBuilder ss(buf);
|
||||
const size_t output_dir_size = strlen(output_dir);
|
||||
if (output_dir_size > 0) {
|
||||
if (!output_dir.empty()) {
|
||||
ss << output_dir;
|
||||
if (output_dir[output_dir_size - 1] != kPathDelimiter) {
|
||||
if (output_dir.back() != kPathDelimiter) {
|
||||
ss << kPathDelimiter;
|
||||
}
|
||||
}
|
||||
@ -61,9 +61,10 @@ ApmDataDumper::~ApmDataDumper() = default;
|
||||
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
bool ApmDataDumper::recording_activated_ = false;
|
||||
absl::optional<int> ApmDataDumper::dump_set_to_use_;
|
||||
char ApmDataDumper::output_dir_[] = "";
|
||||
|
||||
FILE* ApmDataDumper::GetRawFile(const char* name) {
|
||||
FILE* ApmDataDumper::GetRawFile(absl::string_view name) {
|
||||
std::string filename = FormFileName(output_dir_, name, instance_index_,
|
||||
recording_set_index_, ".dat");
|
||||
auto& f = raw_files_[filename];
|
||||
@ -74,7 +75,7 @@ FILE* ApmDataDumper::GetRawFile(const char* name) {
|
||||
return f.get();
|
||||
}
|
||||
|
||||
WavWriter* ApmDataDumper::GetWavFile(const char* name,
|
||||
WavWriter* ApmDataDumper::GetWavFile(absl::string_view name,
|
||||
int sample_rate_hz,
|
||||
int num_channels,
|
||||
WavFile::SampleFormat format) {
|
||||
|
Reference in New Issue
Block a user