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

Side by Side Diff: modules/audio_device/mac/audio_device_mac.h

Issue 3020493002: Remove AudioDeviceObserver and make ADM not inherit from the Module interface.
Patch Set: linux build error Created 3 years, 2 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
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 virtual int32_t SetStereoPlayout(bool enable); 146 virtual int32_t SetStereoPlayout(bool enable);
147 virtual int32_t StereoPlayout(bool& enabled) const; 147 virtual int32_t StereoPlayout(bool& enabled) const;
148 virtual int32_t StereoRecordingIsAvailable(bool& available); 148 virtual int32_t StereoRecordingIsAvailable(bool& available);
149 virtual int32_t SetStereoRecording(bool enable); 149 virtual int32_t SetStereoRecording(bool enable);
150 virtual int32_t StereoRecording(bool& enabled) const; 150 virtual int32_t StereoRecording(bool& enabled) const;
151 151
152 // Delay information and control 152 // Delay information and control
153 virtual int32_t PlayoutDelay(uint16_t& delayMS) const; 153 virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
154 virtual int32_t RecordingDelay(uint16_t& delayMS) const; 154 virtual int32_t RecordingDelay(uint16_t& delayMS) const;
155 155
156 virtual bool PlayoutWarning() const;
157 virtual bool PlayoutError() const;
158 virtual bool RecordingWarning() const;
159 virtual bool RecordingError() const;
160 virtual void ClearPlayoutWarning();
161 virtual void ClearPlayoutError();
162 virtual void ClearRecordingWarning();
163 virtual void ClearRecordingError();
164
165 virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer); 156 virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
166 157
167 private: 158 private:
168 virtual int32_t MicrophoneIsAvailable(bool& available); 159 virtual int32_t MicrophoneIsAvailable(bool& available);
169 virtual int32_t SpeakerIsAvailable(bool& available); 160 virtual int32_t SpeakerIsAvailable(bool& available);
170 161
171 static void AtomicSet32(int32_t* theValue, int32_t newValue); 162 static void AtomicSet32(int32_t* theValue, int32_t newValue);
172 static int32_t AtomicGet32(int32_t* theValue); 163 static int32_t AtomicGet32(int32_t* theValue);
173 164
174 static void logCAMsg(const rtc::LoggingSeverity sev, 165 static void logCAMsg(const rtc::LoggingSeverity sev,
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 317
327 uint32_t _captureLatencyUs; 318 uint32_t _captureLatencyUs;
328 uint32_t _renderLatencyUs; 319 uint32_t _renderLatencyUs;
329 320
330 // Atomically set variables 321 // Atomically set variables
331 mutable int32_t _captureDelayUs; 322 mutable int32_t _captureDelayUs;
332 mutable int32_t _renderDelayUs; 323 mutable int32_t _renderDelayUs;
333 324
334 int32_t _renderDelayOffsetSamples; 325 int32_t _renderDelayOffsetSamples;
335 326
336 uint16_t _playWarning;
337 uint16_t _playError;
338 uint16_t _recWarning;
339 uint16_t _recError;
340
341 PaUtilRingBuffer* _paCaptureBuffer; 327 PaUtilRingBuffer* _paCaptureBuffer;
342 PaUtilRingBuffer* _paRenderBuffer; 328 PaUtilRingBuffer* _paRenderBuffer;
343 329
344 semaphore_t _renderSemaphore; 330 semaphore_t _renderSemaphore;
345 semaphore_t _captureSemaphore; 331 semaphore_t _captureSemaphore;
346 332
347 int _captureBufSizeSamples; 333 int _captureBufSizeSamples;
348 int _renderBufSizeSamples; 334 int _renderBufSizeSamples;
349 335
350 // Typing detection 336 // Typing detection
351 // 0x5c is key "9", after that comes function keys. 337 // 0x5c is key "9", after that comes function keys.
352 bool prev_key_state_[0x5d]; 338 bool prev_key_state_[0x5d];
353 339
354 int get_mic_volume_counter_ms_; 340 int get_mic_volume_counter_ms_;
355 }; 341 };
356 342
357 } // namespace webrtc 343 } // namespace webrtc
358 344
359 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_MAC_AUDIO_DEVICE_MAC_H_ 345 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_MAC_AUDIO_DEVICE_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698