OLD | NEW |
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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
420 return deltaProcess; | 420 return deltaProcess; |
421 } | 421 } |
422 | 422 |
423 // ---------------------------------------------------------------------------- | 423 // ---------------------------------------------------------------------------- |
424 // Module::Process | 424 // Module::Process |
425 // | 425 // |
426 // Check for posted error and warning reports. Generate callbacks if | 426 // Check for posted error and warning reports. Generate callbacks if |
427 // new reports exists. | 427 // new reports exists. |
428 // ---------------------------------------------------------------------------- | 428 // ---------------------------------------------------------------------------- |
429 | 429 |
430 void AudioDeviceModuleImpl::Process() | 430 int32_t AudioDeviceModuleImpl::Process() |
431 { | 431 { |
432 | 432 |
433 _lastProcessTime = TickTime::MillisecondTimestamp(); | 433 _lastProcessTime = TickTime::MillisecondTimestamp(); |
434 | 434 |
435 // kPlayoutWarning | 435 // kPlayoutWarning |
436 if (_ptrAudioDevice->PlayoutWarning()) | 436 if (_ptrAudioDevice->PlayoutWarning()) |
437 { | 437 { |
438 CriticalSectionScoped lock(&_critSectEventCb); | 438 CriticalSectionScoped lock(&_critSectEventCb); |
439 if (_ptrCbAudioDeviceObserver) | 439 if (_ptrCbAudioDeviceObserver) |
440 { | 440 { |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 if (_ptrAudioDevice->RecordingError()) | 472 if (_ptrAudioDevice->RecordingError()) |
473 { | 473 { |
474 CriticalSectionScoped lock(&_critSectEventCb); | 474 CriticalSectionScoped lock(&_critSectEventCb); |
475 if (_ptrCbAudioDeviceObserver) | 475 if (_ptrCbAudioDeviceObserver) |
476 { | 476 { |
477 WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "=> OnErrorIsRepor
ted(kRecordingError)"); | 477 WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "=> OnErrorIsRepor
ted(kRecordingError)"); |
478 _ptrCbAudioDeviceObserver->OnErrorIsReported(AudioDeviceObserver::kR
ecordingError); | 478 _ptrCbAudioDeviceObserver->OnErrorIsReported(AudioDeviceObserver::kR
ecordingError); |
479 } | 479 } |
480 _ptrAudioDevice->ClearRecordingError(); | 480 _ptrAudioDevice->ClearRecordingError(); |
481 } | 481 } |
| 482 |
| 483 return 0; |
482 } | 484 } |
483 | 485 |
484 // ============================================================================ | 486 // ============================================================================ |
485 // Public API | 487 // Public API |
486 // ============================================================================ | 488 // ============================================================================ |
487 | 489 |
488 // ---------------------------------------------------------------------------- | 490 // ---------------------------------------------------------------------------- |
489 // ActiveAudioLayer | 491 // ActiveAudioLayer |
490 // ---------------------------------------------------------------------------- | 492 // ---------------------------------------------------------------------------- |
491 | 493 |
(...skipping 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1936 // ---------------------------------------------------------------------------- | 1938 // ---------------------------------------------------------------------------- |
1937 // PlatformAudioLayer | 1939 // PlatformAudioLayer |
1938 // ---------------------------------------------------------------------------- | 1940 // ---------------------------------------------------------------------------- |
1939 | 1941 |
1940 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer() const | 1942 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer() const |
1941 { | 1943 { |
1942 return _platformAudioLayer; | 1944 return _platformAudioLayer; |
1943 } | 1945 } |
1944 | 1946 |
1945 } // namespace webrtc | 1947 } // namespace webrtc |
OLD | NEW |