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

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: Changes in response to latest reviewer comments 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
26 // Functor to use when supplying a verifier function for the queue item
27 // verifcation.
28 class AgcRenderQueueItemVerifier {
29 public:
30 explicit AgcRenderQueueItemVerifier(size_t minimum_capacity)
31 : minimum_capacity_(minimum_capacity) {}
32
33 bool operator()(const std::vector<int16_t>& v) const {
34 return v.capacity() >= minimum_capacity_;
35 }
36
37 private:
38 size_t minimum_capacity_;
39 };
40
24 class GainControlImpl : public GainControl, 41 class GainControlImpl : public GainControl,
25 public ProcessingComponent { 42 public ProcessingComponent {
26 public: 43 public:
27 GainControlImpl(const AudioProcessing* apm, 44 GainControlImpl(const AudioProcessing* apm,
28 CriticalSectionWrapper* crit); 45 CriticalSectionWrapper* crit);
29 virtual ~GainControlImpl(); 46 virtual ~GainControlImpl();
30 47
31 int ProcessRenderAudio(AudioBuffer* audio); 48 int ProcessRenderAudio(AudioBuffer* audio);
32 int AnalyzeCaptureAudio(AudioBuffer* audio); 49 int AnalyzeCaptureAudio(AudioBuffer* audio);
33 int ProcessCaptureAudio(AudioBuffer* audio); 50 int ProcessCaptureAudio(AudioBuffer* audio);
34 51
35 // ProcessingComponent implementation. 52 // ProcessingComponent implementation.
36 int Initialize() override; 53 int Initialize() override;
37 54
38 // GainControl implementation. 55 // GainControl implementation.
39 bool is_enabled() const override; 56 bool is_enabled() const override;
40 int stream_analog_level() override; 57 int stream_analog_level() override;
41 bool is_limiter_enabled() const override; 58 bool is_limiter_enabled() const override;
42 Mode mode() const override; 59 Mode mode() const override;
43 60
61 // Reads render side data that has been queued on the render call.
62 void ReadQueuedRenderData();
63
44 private: 64 private:
65 static const size_t kAllowedValuesOfSamplesPerFrame1 = 80;
66 static const size_t kAllowedValuesOfSamplesPerFrame2 = 160;
67 // TODO(peah): Decrease this once we properly handle hugely unbalanced
68 // reverse and forward call numbers.
69 static const size_t kMaxNumFramesToBuffer = 100;
70
45 // GainControl implementation. 71 // GainControl implementation.
46 int Enable(bool enable) override; 72 int Enable(bool enable) override;
47 int set_stream_analog_level(int level) override; 73 int set_stream_analog_level(int level) override;
48 int set_mode(Mode mode) override; 74 int set_mode(Mode mode) override;
49 int set_target_level_dbfs(int level) override; 75 int set_target_level_dbfs(int level) override;
50 int target_level_dbfs() const override; 76 int target_level_dbfs() const override;
51 int set_compression_gain_db(int gain) override; 77 int set_compression_gain_db(int gain) override;
52 int compression_gain_db() const override; 78 int compression_gain_db() const override;
53 int enable_limiter(bool enable) override; 79 int enable_limiter(bool enable) override;
54 int set_analog_level_limits(int minimum, int maximum) override; 80 int set_analog_level_limits(int minimum, int maximum) override;
55 int analog_level_minimum() const override; 81 int analog_level_minimum() const override;
56 int analog_level_maximum() const override; 82 int analog_level_maximum() const override;
57 bool stream_is_saturated() const override; 83 bool stream_is_saturated() const override;
58 84
59 // ProcessingComponent implementation. 85 // ProcessingComponent implementation.
60 void* CreateHandle() const override; 86 void* CreateHandle() const override;
61 int InitializeHandle(void* handle) const override; 87 int InitializeHandle(void* handle) const override;
62 int ConfigureHandle(void* handle) const override; 88 int ConfigureHandle(void* handle) const override;
63 void DestroyHandle(void* handle) const override; 89 void DestroyHandle(void* handle) const override;
64 int num_handles_required() const override; 90 int num_handles_required() const override;
65 int GetHandleError(void* handle) const override; 91 int GetHandleError(void* handle) const override;
66 92
93 void AllocateRenderQueue();
94
67 const AudioProcessing* apm_; 95 const AudioProcessing* apm_;
68 CriticalSectionWrapper* crit_; 96 CriticalSectionWrapper* crit_;
69 Mode mode_; 97 Mode mode_;
70 int minimum_capture_level_; 98 int minimum_capture_level_;
71 int maximum_capture_level_; 99 int maximum_capture_level_;
72 bool limiter_enabled_; 100 bool limiter_enabled_;
73 int target_level_dbfs_; 101 int target_level_dbfs_;
74 int compression_gain_db_; 102 int compression_gain_db_;
75 std::vector<int> capture_levels_; 103 std::vector<int> capture_levels_;
76 int analog_capture_level_; 104 int analog_capture_level_;
77 bool was_analog_level_set_; 105 bool was_analog_level_set_;
78 bool stream_is_saturated_; 106 bool stream_is_saturated_;
107
108 size_t render_queue_element_max_size_;
109 std::vector<int16_t> render_queue_buffer_;
110 std::vector<int16_t> capture_queue_buffer_;
111 rtc::scoped_ptr<SwapQueue<std::vector<int16_t>, AgcRenderQueueItemVerifier> >
112 render_signal_queue_;
79 }; 113 };
80 } // namespace webrtc 114 } // namespace webrtc
81 115
82 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ 116 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698