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

Side by Side Diff: webrtc/modules/media_file/media_file_impl.h

Issue 2785673002: Remove more CriticalSectionWrappers. (Closed)
Patch Set: Created 3 years, 8 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
11 #ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ 11 #ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_
12 #define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ 12 #define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_
13 13
14 #include "webrtc/base/criticalsection.h"
14 #include "webrtc/common_types.h" 15 #include "webrtc/common_types.h"
15 #include "webrtc/modules/include/module_common_types.h" 16 #include "webrtc/modules/include/module_common_types.h"
16 #include "webrtc/modules/media_file/media_file.h" 17 #include "webrtc/modules/media_file/media_file.h"
17 #include "webrtc/modules/media_file/media_file_defines.h" 18 #include "webrtc/modules/media_file/media_file_defines.h"
18 #include "webrtc/modules/media_file/media_file_utility.h" 19 #include "webrtc/modules/media_file/media_file_utility.h"
19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 class MediaFileImpl : public MediaFile 22 class MediaFileImpl : public MediaFile
23 { 23 {
24 24
25 public: 25 public:
26 MediaFileImpl(const int32_t id); 26 MediaFileImpl(const int32_t id);
27 ~MediaFileImpl(); 27 ~MediaFileImpl();
28 28
29 void Process() override; 29 void Process() override;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 int32_t StartPlayingStream( 113 int32_t StartPlayingStream(
114 InStream& stream, 114 InStream& stream,
115 bool loop, 115 bool loop,
116 const uint32_t notificationTimeMs, 116 const uint32_t notificationTimeMs,
117 const FileFormats format, 117 const FileFormats format,
118 const CodecInst* codecInst, 118 const CodecInst* codecInst,
119 const uint32_t startPointMs, 119 const uint32_t startPointMs,
120 const uint32_t stopPointMs); 120 const uint32_t stopPointMs);
121 121
122 int32_t _id; 122 int32_t _id;
123 CriticalSectionWrapper* _crit; 123 rtc::CriticalSection _crit;
124 CriticalSectionWrapper* _callbackCrit; 124 rtc::CriticalSection _callbackCrit;
125 125
126 ModuleFileUtility* _ptrFileUtilityObj; 126 ModuleFileUtility* _ptrFileUtilityObj;
127 CodecInst codec_info_; 127 CodecInst codec_info_;
128 128
129 InStream* _ptrInStream; 129 InStream* _ptrInStream;
130 OutStream* _ptrOutStream; 130 OutStream* _ptrOutStream;
131 131
132 FileFormats _fileFormat; 132 FileFormats _fileFormat;
133 uint32_t _recordDurationMs; 133 uint32_t _recordDurationMs;
134 uint32_t _playoutPositionMs; 134 uint32_t _playoutPositionMs;
135 uint32_t _notificationMs; 135 uint32_t _notificationMs;
136 136
137 bool _playingActive; 137 bool _playingActive;
138 bool _recordingActive; 138 bool _recordingActive;
139 bool _isStereo; 139 bool _isStereo;
140 bool _openFile; 140 bool _openFile;
141 141
142 char _fileName[512]; 142 char _fileName[512];
143 143
144 FileCallback* _ptrCallback; 144 FileCallback* _ptrCallback;
145 }; 145 };
146 } // namespace webrtc 146 } // namespace webrtc
147 147
148 #endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ 148 #endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/bitrate_controller/include/bitrate_controller.h ('k') | webrtc/modules/media_file/media_file_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698