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

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

Issue 1416583003: Lock scheme #5: Applied the render queueing to the agc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@introduce_queue_CL
Patch Set: Merge from latest master Created 5 years, 1 month 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_GAIN_CONTROL_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/common_audio/swap_queue.h"
16 #include "webrtc/modules/audio_processing/include/audio_processing.h" 18 #include "webrtc/modules/audio_processing/include/audio_processing.h"
17 #include "webrtc/modules/audio_processing/processing_component.h" 19 #include "webrtc/modules/audio_processing/processing_component.h"
18 20
19 namespace webrtc { 21 namespace webrtc {
20 22
21 class AudioBuffer; 23 class AudioBuffer;
22 class CriticalSectionWrapper; 24 class CriticalSectionWrapper;
23 25
24 class GainControlImpl : public GainControl, 26 class GainControlImpl : public GainControl,
25 public ProcessingComponent { 27 public ProcessingComponent {
26 public: 28 public:
27 GainControlImpl(const AudioProcessing* apm, 29 GainControlImpl(const AudioProcessing* apm,
28 CriticalSectionWrapper* crit); 30 CriticalSectionWrapper* crit);
29 virtual ~GainControlImpl(); 31 virtual ~GainControlImpl();
30 32
31 int ProcessRenderAudio(AudioBuffer* audio); 33 int ProcessRenderAudio(AudioBuffer* audio);
32 int AnalyzeCaptureAudio(AudioBuffer* audio); 34 int AnalyzeCaptureAudio(AudioBuffer* audio);
33 int ProcessCaptureAudio(AudioBuffer* audio); 35 int ProcessCaptureAudio(AudioBuffer* audio);
34 36
35 // ProcessingComponent implementation. 37 // ProcessingComponent implementation.
36 int Initialize() override; 38 int Initialize() override;
37 39
38 // GainControl implementation. 40 // GainControl implementation.
39 bool is_enabled() const override; 41 bool is_enabled() const override;
40 int stream_analog_level() override; 42 int stream_analog_level() override;
41 bool is_limiter_enabled() const override; 43 bool is_limiter_enabled() const override;
42 Mode mode() const override; 44 Mode mode() const override;
43 45
46 // Reads render side data that has been queued on the render call.
47 void ReadQueuedRenderData();
48
44 private: 49 private:
50 static const size_t kAllowedValuesOfSamplesPerFrame1 = 80;
51 static const size_t kAllowedValuesOfSamplesPerFrame2 = 160;
52 // TODO(peah): Decrease this once we properly handle hugely unbalanced
53 // reverse and forward call numbers.
54 static const size_t kMaxNumFramesToBuffer = 100;
55
45 // GainControl implementation. 56 // GainControl implementation.
46 int Enable(bool enable) override; 57 int Enable(bool enable) override;
47 int set_stream_analog_level(int level) override; 58 int set_stream_analog_level(int level) override;
48 int set_mode(Mode mode) override; 59 int set_mode(Mode mode) override;
49 int set_target_level_dbfs(int level) override; 60 int set_target_level_dbfs(int level) override;
50 int target_level_dbfs() const override; 61 int target_level_dbfs() const override;
51 int set_compression_gain_db(int gain) override; 62 int set_compression_gain_db(int gain) override;
52 int compression_gain_db() const override; 63 int compression_gain_db() const override;
53 int enable_limiter(bool enable) override; 64 int enable_limiter(bool enable) override;
54 int set_analog_level_limits(int minimum, int maximum) override; 65 int set_analog_level_limits(int minimum, int maximum) override;
55 int analog_level_minimum() const override; 66 int analog_level_minimum() const override;
56 int analog_level_maximum() const override; 67 int analog_level_maximum() const override;
57 bool stream_is_saturated() const override; 68 bool stream_is_saturated() const override;
58 69
59 // ProcessingComponent implementation. 70 // ProcessingComponent implementation.
60 void* CreateHandle() const override; 71 void* CreateHandle() const override;
61 int InitializeHandle(void* handle) const override; 72 int InitializeHandle(void* handle) const override;
62 int ConfigureHandle(void* handle) const override; 73 int ConfigureHandle(void* handle) const override;
63 void DestroyHandle(void* handle) const override; 74 void DestroyHandle(void* handle) const override;
64 int num_handles_required() const override; 75 int num_handles_required() const override;
65 int GetHandleError(void* handle) const override; 76 int GetHandleError(void* handle) const override;
66 77
78 void AllocateRenderQueue();
79
67 const AudioProcessing* apm_; 80 const AudioProcessing* apm_;
68 CriticalSectionWrapper* crit_; 81 CriticalSectionWrapper* crit_;
69 Mode mode_; 82 Mode mode_;
70 int minimum_capture_level_; 83 int minimum_capture_level_;
71 int maximum_capture_level_; 84 int maximum_capture_level_;
72 bool limiter_enabled_; 85 bool limiter_enabled_;
73 int target_level_dbfs_; 86 int target_level_dbfs_;
74 int compression_gain_db_; 87 int compression_gain_db_;
75 std::vector<int> capture_levels_; 88 std::vector<int> capture_levels_;
76 int analog_capture_level_; 89 int analog_capture_level_;
77 bool was_analog_level_set_; 90 bool was_analog_level_set_;
78 bool stream_is_saturated_; 91 bool stream_is_saturated_;
92
93 size_t render_queue_element_max_size_;
94 std::vector<int16_t> render_queue_buffer_;
95 std::vector<int16_t> capture_queue_buffer_;
96 rtc::scoped_ptr<
97 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>>
98 render_signal_queue_;
79 }; 99 };
80 } // namespace webrtc 100 } // namespace webrtc
81 101
82 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ 102 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698