| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 } | 384 } |
| 385 | 385 |
| 386 int32_t RecordingDelay(uint16_t& delay_ms) const override { | 386 int32_t RecordingDelay(uint16_t& delay_ms) const override { |
| 387 // Best guess we can do is to use half of the estimated total delay. | 387 // Best guess we can do is to use half of the estimated total delay. |
| 388 LOG(INFO) << __FUNCTION__; | 388 LOG(INFO) << __FUNCTION__; |
| 389 delay_ms = audio_manager_->GetDelayEstimateInMilliseconds() / 2; | 389 delay_ms = audio_manager_->GetDelayEstimateInMilliseconds() / 2; |
| 390 RTC_DCHECK_GT(delay_ms, 0); | 390 RTC_DCHECK_GT(delay_ms, 0); |
| 391 return 0; | 391 return 0; |
| 392 } | 392 } |
| 393 | 393 |
| 394 bool PlayoutWarning() const override { | |
| 395 return false; | |
| 396 } | |
| 397 | |
| 398 bool PlayoutError() const override { | |
| 399 return false; | |
| 400 } | |
| 401 | |
| 402 bool RecordingWarning() const override { | |
| 403 return false; | |
| 404 } | |
| 405 | |
| 406 bool RecordingError() const override { | |
| 407 return false; | |
| 408 } | |
| 409 | |
| 410 void ClearPlayoutWarning() override { LOG(INFO) << __FUNCTION__; } | |
| 411 | |
| 412 void ClearPlayoutError() override { LOG(INFO) << __FUNCTION__; } | |
| 413 | |
| 414 void ClearRecordingWarning() override { LOG(INFO) << __FUNCTION__; } | |
| 415 | |
| 416 void ClearRecordingError() override { LOG(INFO) << __FUNCTION__; } | |
| 417 | |
| 418 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override { | 394 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override { |
| 419 LOG(INFO) << __FUNCTION__; | 395 LOG(INFO) << __FUNCTION__; |
| 420 output_.AttachAudioBuffer(audioBuffer); | 396 output_.AttachAudioBuffer(audioBuffer); |
| 421 input_.AttachAudioBuffer(audioBuffer); | 397 input_.AttachAudioBuffer(audioBuffer); |
| 422 } | 398 } |
| 423 | 399 |
| 424 // TODO(henrika): remove | 400 // TODO(henrika): remove |
| 425 int32_t SetPlayoutSampleRate(const uint32_t samplesPerSec) override { | 401 int32_t SetPlayoutSampleRate(const uint32_t samplesPerSec) override { |
| 426 FATAL() << "Should never be called"; | 402 FATAL() << "Should never be called"; |
| 427 return -1; | 403 return -1; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 OutputType output_; | 485 OutputType output_; |
| 510 | 486 |
| 511 InputType input_; | 487 InputType input_; |
| 512 | 488 |
| 513 bool initialized_; | 489 bool initialized_; |
| 514 }; | 490 }; |
| 515 | 491 |
| 516 } // namespace webrtc | 492 } // namespace webrtc |
| 517 | 493 |
| 518 #endif // MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ | 494 #endif // MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ |
| OLD | NEW |