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:
@ -13,18 +13,20 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <string>
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#endif
|
||||
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "absl/types/optional.h"
|
||||
#include "api/array_view.h"
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
#include "common_audio/wav_file.h"
|
||||
#include "rtc_base/checks.h"
|
||||
#include "rtc_base/string_utils.h"
|
||||
#endif
|
||||
|
||||
// Check to verify that the define is properly set.
|
||||
@ -64,11 +66,32 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
// Returns whether dumping functionality is enabled/available.
|
||||
static bool IsAvailable() {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Default dump set.
|
||||
static constexpr size_t kDefaultDumpSet = 0;
|
||||
|
||||
// Specifies what dump set to use. All dump commands with a different dump set
|
||||
// than the one specified will be discarded. If not specificed, all dump sets
|
||||
// will be used.
|
||||
static void SetDumpSetToUse(int dump_set_to_use) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
dump_set_to_use_ = dump_set_to_use;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Set an optional output directory.
|
||||
static void SetOutputDirectory(const std::string& output_dir) {
|
||||
static void SetOutputDirectory(absl::string_view output_dir) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
RTC_CHECK_LT(output_dir.size(), kOutputDirMaxLength);
|
||||
strncpy(output_dir_, output_dir.c_str(), output_dir.size());
|
||||
rtc::strcpyn(output_dir_, kOutputDirMaxLength, output_dir);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -82,8 +105,13 @@ class ApmDataDumper {
|
||||
|
||||
// Methods for performing dumping of data of various types into
|
||||
// various formats.
|
||||
void DumpRaw(const char* name, double v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
double v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(&v, sizeof(v), 1, file);
|
||||
@ -91,8 +119,14 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, size_t v_length, const double* v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
size_t v_length,
|
||||
const double* v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(v, sizeof(v[0]), v_length, file);
|
||||
@ -100,16 +134,26 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, rtc::ArrayView<const double> v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
rtc::ArrayView<const double> v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
DumpRaw(name, v.size(), v.data());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, float v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
float v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(&v, sizeof(v), 1, file);
|
||||
@ -117,8 +161,14 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, size_t v_length, const float* v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
size_t v_length,
|
||||
const float* v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(v, sizeof(v[0]), v_length, file);
|
||||
@ -126,24 +176,38 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, rtc::ArrayView<const float> v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
rtc::ArrayView<const float> v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
DumpRaw(name, v.size(), v.data());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, bool v) {
|
||||
void DumpRaw(absl::string_view name, bool v, int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
DumpRaw(name, static_cast<int16_t>(v));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, size_t v_length, const bool* v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
size_t v_length,
|
||||
const bool* v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
for (size_t k = 0; k < v_length; ++k) {
|
||||
@ -154,16 +218,26 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, rtc::ArrayView<const bool> v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
rtc::ArrayView<const bool> v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
DumpRaw(name, v.size(), v.data());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, int16_t v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
int16_t v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(&v, sizeof(v), 1, file);
|
||||
@ -171,8 +245,14 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, size_t v_length, const int16_t* v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
size_t v_length,
|
||||
const int16_t* v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(v, sizeof(v[0]), v_length, file);
|
||||
@ -180,16 +260,26 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, rtc::ArrayView<const int16_t> v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
rtc::ArrayView<const int16_t> v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
DumpRaw(name, v.size(), v.data());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, int32_t v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
int32_t v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(&v, sizeof(v), 1, file);
|
||||
@ -197,8 +287,14 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, size_t v_length, const int32_t* v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
size_t v_length,
|
||||
const int32_t* v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(v, sizeof(v[0]), v_length, file);
|
||||
@ -206,8 +302,13 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, size_t v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
size_t v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(&v, sizeof(v), 1, file);
|
||||
@ -215,8 +316,14 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, size_t v_length, const size_t* v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
size_t v_length,
|
||||
const size_t* v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
FILE* file = GetRawFile(name);
|
||||
fwrite(v, sizeof(v[0]), v_length, file);
|
||||
@ -224,26 +331,40 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, rtc::ArrayView<const int32_t> v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
rtc::ArrayView<const int32_t> v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
DumpRaw(name, v.size(), v.data());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpRaw(const char* name, rtc::ArrayView<const size_t> v) {
|
||||
void DumpRaw(absl::string_view name,
|
||||
rtc::ArrayView<const size_t> v,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
DumpRaw(name, v.size(), v.data());
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpWav(const char* name,
|
||||
void DumpWav(absl::string_view name,
|
||||
size_t v_length,
|
||||
const float* v,
|
||||
int sample_rate_hz,
|
||||
int num_channels) {
|
||||
int num_channels,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
WavWriter* file = GetWavFile(name, sample_rate_hz, num_channels,
|
||||
WavFile::SampleFormat::kFloat);
|
||||
@ -252,11 +373,15 @@ class ApmDataDumper {
|
||||
#endif
|
||||
}
|
||||
|
||||
void DumpWav(const char* name,
|
||||
void DumpWav(absl::string_view name,
|
||||
rtc::ArrayView<const float> v,
|
||||
int sample_rate_hz,
|
||||
int num_channels) {
|
||||
int num_channels,
|
||||
int dump_set = kDefaultDumpSet) {
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
||||
return;
|
||||
|
||||
if (recording_activated_) {
|
||||
DumpWav(name, v.size(), v.data(), sample_rate_hz, num_channels);
|
||||
}
|
||||
@ -266,6 +391,7 @@ class ApmDataDumper {
|
||||
private:
|
||||
#if WEBRTC_APM_DEBUG_DUMP == 1
|
||||
static bool recording_activated_;
|
||||
static absl::optional<int> dump_set_to_use_;
|
||||
static constexpr size_t kOutputDirMaxLength = 1024;
|
||||
static char output_dir_[kOutputDirMaxLength];
|
||||
const int instance_index_;
|
||||
@ -274,8 +400,8 @@ class ApmDataDumper {
|
||||
raw_files_;
|
||||
std::unordered_map<std::string, std::unique_ptr<WavWriter>> wav_files_;
|
||||
|
||||
FILE* GetRawFile(const char* name);
|
||||
WavWriter* GetWavFile(const char* name,
|
||||
FILE* GetRawFile(absl::string_view name);
|
||||
WavWriter* GetWavFile(absl::string_view name,
|
||||
int sample_rate_hz,
|
||||
int num_channels,
|
||||
WavFile::SampleFormat format);
|
||||
|
Reference in New Issue
Block a user