| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 private: | 98 private: |
| 99 class RenderWriter; | 99 class RenderWriter; |
| 100 | 100 |
| 101 // Empties the render SwapQueue. | 101 // Empties the render SwapQueue. |
| 102 void EmptyRenderQueue(); | 102 void EmptyRenderQueue(); |
| 103 | 103 |
| 104 rtc::RaceChecker capture_race_checker_; | 104 rtc::RaceChecker capture_race_checker_; |
| 105 rtc::RaceChecker render_race_checker_; | 105 rtc::RaceChecker render_race_checker_; |
| 106 | 106 |
| 107 // State that is accessed by the AnalyzeRender call. | 107 // State that is accessed by the AnalyzeRender call. |
| 108 std::unique_ptr<RenderWriter> render_writer_ GUARDED_BY(render_race_checker_); | 108 std::unique_ptr<RenderWriter> render_writer_ |
| 109 RTC_GUARDED_BY(render_race_checker_); |
| 109 | 110 |
| 110 // State that may be accessed by the capture thread. | 111 // State that may be accessed by the capture thread. |
| 111 static int instance_count_; | 112 static int instance_count_; |
| 112 std::unique_ptr<ApmDataDumper> data_dumper_; | 113 std::unique_ptr<ApmDataDumper> data_dumper_; |
| 113 const int sample_rate_hz_; | 114 const int sample_rate_hz_; |
| 114 const int num_bands_; | 115 const int num_bands_; |
| 115 const size_t frame_length_; | 116 const size_t frame_length_; |
| 116 BlockFramer output_framer_ GUARDED_BY(capture_race_checker_); | 117 BlockFramer output_framer_ RTC_GUARDED_BY(capture_race_checker_); |
| 117 FrameBlocker capture_blocker_ GUARDED_BY(capture_race_checker_); | 118 FrameBlocker capture_blocker_ RTC_GUARDED_BY(capture_race_checker_); |
| 118 FrameBlocker render_blocker_ GUARDED_BY(capture_race_checker_); | 119 FrameBlocker render_blocker_ RTC_GUARDED_BY(capture_race_checker_); |
| 119 SwapQueue<std::vector<std::vector<float>>, Aec3RenderQueueItemVerifier> | 120 SwapQueue<std::vector<std::vector<float>>, Aec3RenderQueueItemVerifier> |
| 120 render_transfer_queue_; | 121 render_transfer_queue_; |
| 121 std::unique_ptr<BlockProcessor> block_processor_ | 122 std::unique_ptr<BlockProcessor> block_processor_ |
| 122 GUARDED_BY(capture_race_checker_); | 123 RTC_GUARDED_BY(capture_race_checker_); |
| 123 std::vector<std::vector<float>> render_queue_output_frame_ | 124 std::vector<std::vector<float>> render_queue_output_frame_ |
| 124 GUARDED_BY(capture_race_checker_); | 125 RTC_GUARDED_BY(capture_race_checker_); |
| 125 std::unique_ptr<CascadedBiQuadFilter> capture_highpass_filter_ | 126 std::unique_ptr<CascadedBiQuadFilter> capture_highpass_filter_ |
| 126 GUARDED_BY(capture_race_checker_); | 127 RTC_GUARDED_BY(capture_race_checker_); |
| 127 bool saturated_microphone_signal_ GUARDED_BY(capture_race_checker_) = false; | 128 bool saturated_microphone_signal_ RTC_GUARDED_BY(capture_race_checker_) = |
| 128 std::vector<std::vector<float>> block_ GUARDED_BY(capture_race_checker_); | 129 false; |
| 130 std::vector<std::vector<float>> block_ RTC_GUARDED_BY(capture_race_checker_); |
| 129 std::vector<rtc::ArrayView<float>> sub_frame_view_ | 131 std::vector<rtc::ArrayView<float>> sub_frame_view_ |
| 130 GUARDED_BY(capture_race_checker_); | 132 RTC_GUARDED_BY(capture_race_checker_); |
| 131 | 133 |
| 132 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCanceller3); | 134 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCanceller3); |
| 133 }; | 135 }; |
| 134 } // namespace webrtc | 136 } // namespace webrtc |
| 135 | 137 |
| 136 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ | 138 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ |
| OLD | NEW |