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

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

Issue 1424663003: Lock scheme #8: Introduced the new locking scheme (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@add_threadcheckers_CL
Patch Set: 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_VOICE_DETECTION_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
13 13
14 #include "webrtc/base/criticalsection.h"
14 #include "webrtc/base/thread_checker.h" 15 #include "webrtc/base/thread_checker.h"
15 #include "webrtc/modules/audio_processing/include/audio_processing.h" 16 #include "webrtc/modules/audio_processing/include/audio_processing.h"
16 #include "webrtc/modules/audio_processing/processing_component.h" 17 #include "webrtc/modules/audio_processing/processing_component.h"
17 18
18 namespace webrtc { 19 namespace webrtc {
19 20
20 class AudioBuffer; 21 class AudioBuffer;
21 class CriticalSectionWrapper; 22 class CriticalSectionWrapper;
22 23
23 class VoiceDetectionImpl : public VoiceDetection, 24 class VoiceDetectionImpl : public VoiceDetection,
24 public ProcessingComponent { 25 public ProcessingComponent {
25 public: 26 public:
26 VoiceDetectionImpl(const AudioProcessing* apm, 27 VoiceDetectionImpl(const AudioProcessing* apm,
27 CriticalSectionWrapper* crit, 28 rtc::CriticalSection* crit,
28 rtc::ThreadChecker* capture_thread); 29 rtc::ThreadChecker* capture_thread);
29 virtual ~VoiceDetectionImpl(); 30 virtual ~VoiceDetectionImpl();
30 31
31 int ProcessCaptureAudio(AudioBuffer* audio); 32 int ProcessCaptureAudio(AudioBuffer* audio);
32 33
33 // VoiceDetection implementation. 34 // VoiceDetection implementation.
34 bool is_enabled() const override; 35 bool is_enabled() const override;
35 36
36 // ProcessingComponent implementation. 37 // ProcessingComponent implementation.
37 int Initialize() override; 38 int Initialize() override;
(...skipping 10 matching lines...) Expand all
48 49
49 // ProcessingComponent implementation. 50 // ProcessingComponent implementation.
50 void* CreateHandle() const override; 51 void* CreateHandle() const override;
51 int InitializeHandle(void* handle) const override; 52 int InitializeHandle(void* handle) const override;
52 int ConfigureHandle(void* handle) const override; 53 int ConfigureHandle(void* handle) const override;
53 void DestroyHandle(void* handle) const override; 54 void DestroyHandle(void* handle) const override;
54 int num_handles_required() const override; 55 int num_handles_required() const override;
55 int GetHandleError(void* handle) const override; 56 int GetHandleError(void* handle) const override;
56 57
57 const AudioProcessing* apm_; 58 const AudioProcessing* apm_;
58 CriticalSectionWrapper* crit_; 59 rtc::CriticalSection* const crit_;
59 const rtc::ThreadChecker* const capture_thread_; 60 const rtc::ThreadChecker* const capture_thread_;
60 bool stream_has_voice_; 61 bool stream_has_voice_;
61 bool using_external_vad_; 62 bool using_external_vad_;
62 Likelihood likelihood_; 63 Likelihood likelihood_;
63 int frame_size_ms_; 64 int frame_size_ms_;
64 size_t frame_size_samples_; 65 size_t frame_size_samples_;
65 }; 66 };
66 } // namespace webrtc 67 } // namespace webrtc
67 68
68 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ 69 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698