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

Side by Side Diff: webrtc/modules/audio_device/dummy/file_audio_device.h

Issue 1722083002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_device/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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) 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 10
11 #ifndef WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H 11 #ifndef WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H
12 #define WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H 12 #define WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H
13 13
14 #include <stdio.h> 14 #include <stdio.h>
15 15
16 #include <memory>
16 #include <string> 17 #include <string>
17 18
18 #include "webrtc/modules/audio_device/audio_device_generic.h" 19 #include "webrtc/modules/audio_device/audio_device_generic.h"
19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 20 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
20 #include "webrtc/system_wrappers/include/file_wrapper.h" 21 #include "webrtc/system_wrappers/include/file_wrapper.h"
21 #include "webrtc/system_wrappers/include/clock.h" 22 #include "webrtc/system_wrappers/include/clock.h"
22 23
23 namespace rtc { 24 namespace rtc {
24 class PlatformThread; 25 class PlatformThread;
25 } // namespace rtc 26 } // namespace rtc
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 int8_t* _playoutBuffer; // In bytes. 176 int8_t* _playoutBuffer; // In bytes.
176 uint32_t _recordingFramesLeft; 177 uint32_t _recordingFramesLeft;
177 uint32_t _playoutFramesLeft; 178 uint32_t _playoutFramesLeft;
178 CriticalSectionWrapper& _critSect; 179 CriticalSectionWrapper& _critSect;
179 180
180 size_t _recordingBufferSizeIn10MS; 181 size_t _recordingBufferSizeIn10MS;
181 size_t _recordingFramesIn10MS; 182 size_t _recordingFramesIn10MS;
182 size_t _playoutFramesIn10MS; 183 size_t _playoutFramesIn10MS;
183 184
184 // TODO(pbos): Make plain members instead of pointers and stop resetting them. 185 // TODO(pbos): Make plain members instead of pointers and stop resetting them.
185 rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadRec; 186 std::unique_ptr<rtc::PlatformThread> _ptrThreadRec;
186 rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadPlay; 187 std::unique_ptr<rtc::PlatformThread> _ptrThreadPlay;
187 188
188 bool _playing; 189 bool _playing;
189 bool _recording; 190 bool _recording;
190 uint64_t _lastCallPlayoutMillis; 191 uint64_t _lastCallPlayoutMillis;
191 uint64_t _lastCallRecordMillis; 192 uint64_t _lastCallRecordMillis;
192 193
193 FileWrapper& _outputFile; 194 FileWrapper& _outputFile;
194 FileWrapper& _inputFile; 195 FileWrapper& _inputFile;
195 std::string _outputFilename; 196 std::string _outputFilename;
196 std::string _inputFilename; 197 std::string _inputFilename;
197 198
198 Clock* _clock; 199 Clock* _clock;
199 }; 200 };
200 201
201 } // namespace webrtc 202 } // namespace webrtc
202 203
203 #endif // WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H 204 #endif // WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/audio_device_impl.h ('k') | webrtc/modules/audio_device/fine_audio_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698