zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge :audio_processing and :aec_dump_interface.

Browse Source 
Merges the two targets in modules/audio_processing
and removes some redundant code. This enables not writing
a bunch of redundant code in
https://webrtc-review.googlesource.com/c/src/+/70502

':audio_processing' did depend on ':aec_dump_interface'.
'modules/audio_processing/aec_dump' did depend on
'aec_dump_interface' but not ':audio_processing'.

Having the AecDump implementation not depending on
'audio_processing' allows to have faster compilation time and
reduces the dependencies. However, maintaining such a decoupling
makes APM and AecDump client code more complex.

NOTRY=true # want this in and 'ios_api_framework' seems stuck.

Bug: webrtc:7404
Change-Id: I75a5f234591014ac42d52bc1a36526072f5be89c
Reviewed-on: https://webrtc-review.googlesource.com/76603
Commit-Queue: Alex Loiko <aleloi@webrtc.org>
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23244}
This commit is contained in:
Alex Loiko
2018-05-15 13:13:22 +02:00
committed by Commit Bot
parent 28a325b523
commit 1aec594018
8 changed files with 27 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/audio_processing/include/aec_dump.h
View File

@ -18,6 +18,7 @@
#include "api/array_view.h"
#include "api/audio/audio_frame.h"
#include "modules/audio_processing/include/audio_frame_view.h"
#include "modules/audio_processing/include/audio_processing.h"
namespace webrtc {
@ -55,18 +56,6 @@ struct InternalAPMConfig {
std::string experiments_description = "";
};
struct InternalAPMStreamsConfig {
int input_sample_rate = 0;
int output_sample_rate = 0;
int render_input_sample_rate = 0;
int render_output_sample_rate = 0;
size_t input_num_channels = 0;
size_t output_num_channels = 0;
size_t render_input_num_channels = 0;
size_t render_output_num_channels = 0;
};
// An interface for recording configuration and input/output streams
// of the Audio Processing Module. The recordings are called
// 'aec-dumps' and are stored in a protobuf format defined in
@ -87,8 +76,7 @@ class AecDump {
virtual ~AecDump() = default;
// Logs Event::Type INIT message.
virtual void WriteInitMessage(
const InternalAPMStreamsConfig& streams_config) = 0;
virtual void WriteInitMessage(const ProcessingConfig& api_format) = 0;
// Logs Event::Type STREAM message. To log an input/output pair,
// call the AddCapture* and AddAudioProcessingState methods followed