OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 #include <iostream> | |
11 #include "webrtc/modules/audio_device/dummy/file_audio_device.h" | 10 #include "webrtc/modules/audio_device/dummy/file_audio_device.h" |
12 #include "webrtc/system_wrappers/include/sleep.h" | 11 #include "webrtc/system_wrappers/include/sleep.h" |
13 #include "webrtc/system_wrappers/include/thread_wrapper.h" | 12 #include "webrtc/system_wrappers/include/thread_wrapper.h" |
14 | 13 |
15 namespace webrtc { | 14 namespace webrtc { |
16 | 15 |
17 int kRecordingFixedSampleRate = 48000; | 16 int kRecordingFixedSampleRate = 48000; |
henrika_webrtc
2015/11/23 09:33:06
Could you also add const's here:
const int ...
kjellander_webrtc
2015/11/23 11:44:58
Sure thing. I did in PS#2.
| |
18 int kRecordingNumChannels = 2; | 17 int kRecordingNumChannels = 2; |
19 int kPlayoutFixedSampleRate = 48000; | 18 int kPlayoutFixedSampleRate = 48000; |
20 int kPlayoutNumChannels = 2; | 19 int kPlayoutNumChannels = 2; |
21 int kPlayoutBufferSize = kPlayoutFixedSampleRate / 100 | 20 int kPlayoutBufferSize = kPlayoutFixedSampleRate / 100 |
22 * kPlayoutNumChannels * 2; | 21 * kPlayoutNumChannels * 2; |
23 int kRecordingBufferSize = kRecordingFixedSampleRate / 100 | 22 int kRecordingBufferSize = kRecordingFixedSampleRate / 100 |
24 * kRecordingNumChannels * 2; | 23 * kRecordingNumChannels * 2; |
25 | 24 |
26 FileAudioDevice::FileAudioDevice(const int32_t id, | 25 FileAudioDevice::FileAudioDevice(const int32_t id, |
27 const char* inputFilename, | 26 const char* inputFilename, |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
542 _critSect.Enter(); | 541 _critSect.Enter(); |
543 } | 542 } |
544 } | 543 } |
545 | 544 |
546 _critSect.Leave(); | 545 _critSect.Leave(); |
547 SleepMs(10 - (_clock->CurrentNtpInMilliseconds() - currentTime)); | 546 SleepMs(10 - (_clock->CurrentNtpInMilliseconds() - currentTime)); |
548 return true; | 547 return true; |
549 } | 548 } |
550 | 549 |
551 } // namespace webrtc | 550 } // namespace webrtc |
OLD | NEW |