Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1542)

Side by Side Diff: webrtc/modules/audio_processing/audio_processing_impl.h

Issue 2778783002: AecDump interface (Closed)
Patch Set: Small changes in response to reviewer comments. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
13 13
14 #include <list> 14 #include <list>
15 #include <memory> 15 #include <memory>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/function_view.h" 19 #include "webrtc/base/function_view.h"
20 #include "webrtc/base/gtest_prod_util.h" 20 #include "webrtc/base/gtest_prod_util.h"
21 #include "webrtc/base/ignore_wundef.h" 21 #include "webrtc/base/ignore_wundef.h"
22 #include "webrtc/base/protobuf_utils.h" 22 #include "webrtc/base/protobuf_utils.h"
23 #include "webrtc/base/swap_queue.h" 23 #include "webrtc/base/swap_queue.h"
24 #include "webrtc/base/thread_annotations.h" 24 #include "webrtc/base/thread_annotations.h"
25 #include "webrtc/modules/audio_processing/audio_buffer.h" 25 #include "webrtc/modules/audio_processing/audio_buffer.h"
26 #include "webrtc/modules/audio_processing/include/aec_dump.h"
26 #include "webrtc/modules/audio_processing/include/audio_processing.h" 27 #include "webrtc/modules/audio_processing/include/audio_processing.h"
27 #include "webrtc/modules/audio_processing/render_queue_item_verifier.h" 28 #include "webrtc/modules/audio_processing/render_queue_item_verifier.h"
28 #include "webrtc/modules/audio_processing/rms_level.h" 29 #include "webrtc/modules/audio_processing/rms_level.h"
29 #include "webrtc/system_wrappers/include/file_wrapper.h" 30 #include "webrtc/system_wrappers/include/file_wrapper.h"
30 31
31 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP 32 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
32 // *.pb.h files are generated at build-time by the protobuf compiler. 33 // *.pb.h files are generated at build-time by the protobuf compiler.
33 RTC_PUSH_IGNORING_WUNDEF() 34 RTC_PUSH_IGNORING_WUNDEF()
34 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD 35 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
35 #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" 36 #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
(...skipping 23 matching lines...) Expand all
59 int Initialize(int capture_input_sample_rate_hz, 60 int Initialize(int capture_input_sample_rate_hz,
60 int capture_output_sample_rate_hz, 61 int capture_output_sample_rate_hz,
61 int render_sample_rate_hz, 62 int render_sample_rate_hz,
62 ChannelLayout capture_input_layout, 63 ChannelLayout capture_input_layout,
63 ChannelLayout capture_output_layout, 64 ChannelLayout capture_output_layout,
64 ChannelLayout render_input_layout) override; 65 ChannelLayout render_input_layout) override;
65 int Initialize(const ProcessingConfig& processing_config) override; 66 int Initialize(const ProcessingConfig& processing_config) override;
66 void ApplyConfig(const AudioProcessing::Config& config) override; 67 void ApplyConfig(const AudioProcessing::Config& config) override;
67 void SetExtraOptions(const webrtc::Config& config) override; 68 void SetExtraOptions(const webrtc::Config& config) override;
68 void UpdateHistogramsOnCallEnd() override; 69 void UpdateHistogramsOnCallEnd() override;
70 void StartDebugRecording(std::unique_ptr<AecDump> aec_dump) override;
69 int StartDebugRecording(const char filename[kMaxFilenameSize], 71 int StartDebugRecording(const char filename[kMaxFilenameSize],
70 int64_t max_log_size_bytes) override; 72 int64_t max_log_size_bytes) override;
71 int StartDebugRecording(FILE* handle, int64_t max_log_size_bytes) override; 73 int StartDebugRecording(FILE* handle, int64_t max_log_size_bytes) override;
72 int StartDebugRecording(FILE* handle) override; 74 int StartDebugRecording(FILE* handle) override;
73 int StartDebugRecordingForPlatformFile(rtc::PlatformFile handle) override; 75 int StartDebugRecordingForPlatformFile(rtc::PlatformFile handle) override;
74 int StopDebugRecording() override; 76 int StopDebugRecording() override;
75 77
76 // Capture-side exclusive methods possibly running APM in a 78 // Capture-side exclusive methods possibly running APM in a
77 // multi-threaded manner. Acquire the capture lock. 79 // multi-threaded manner. Acquire the capture lock.
78 int ProcessStream(AudioFrame* frame) override; 80 int ProcessStream(AudioFrame* frame) override;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 int WriteConfigMessage(bool forced) EXCLUSIVE_LOCKS_REQUIRED(crit_capture_) 294 int WriteConfigMessage(bool forced) EXCLUSIVE_LOCKS_REQUIRED(crit_capture_)
293 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 295 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
294 296
295 // Critical section. 297 // Critical section.
296 rtc::CriticalSection crit_debug_; 298 rtc::CriticalSection crit_debug_;
297 299
298 // Debug dump state. 300 // Debug dump state.
299 ApmDebugDumpState debug_dump_; 301 ApmDebugDumpState debug_dump_;
300 #endif 302 #endif
301 303
304 // AecDump instance used for optionally logging APM config, input
305 // and output to file in the AEC-dump format defined in debug.proto.
306 std::unique_ptr<AecDump> aec_dump_;
307
302 // Critical sections. 308 // Critical sections.
303 rtc::CriticalSection crit_render_ ACQUIRED_BEFORE(crit_capture_); 309 rtc::CriticalSection crit_render_ ACQUIRED_BEFORE(crit_capture_);
304 rtc::CriticalSection crit_capture_; 310 rtc::CriticalSection crit_capture_;
305 311
306 // Struct containing the Config specifying the behavior of APM. 312 // Struct containing the Config specifying the behavior of APM.
307 AudioProcessing::Config config_; 313 AudioProcessing::Config config_;
308 314
309 // Class containing information about what submodules are active. 315 // Class containing information about what submodules are active.
310 ApmSubmoduleStates submodule_states_; 316 ApmSubmoduleStates submodule_states_;
311 317
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 std::unique_ptr< 436 std::unique_ptr<
431 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> 437 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>>
432 agc_render_signal_queue_; 438 agc_render_signal_queue_;
433 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>> 439 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>>
434 red_render_signal_queue_; 440 red_render_signal_queue_;
435 }; 441 };
436 442
437 } // namespace webrtc 443 } // namespace webrtc
438 444
439 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 445 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698