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

Side by Side Diff: talk/media/devices/filevideocapturer.cc

Issue 1613643004: Remove mutable from rtc::CriticalSection members. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « talk/media/base/fakevideorenderer.h ('k') | talk/media/devices/yuvframescapturer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 142 }
143 143
144 // Check if Run() is finished. 144 // Check if Run() is finished.
145 bool Finished() const { 145 bool Finished() const {
146 rtc::CritScope cs(&crit_); 146 rtc::CritScope cs(&crit_);
147 return finished_; 147 return finished_;
148 } 148 }
149 149
150 private: 150 private:
151 FileVideoCapturer* capturer_; 151 FileVideoCapturer* capturer_;
152 mutable rtc::CriticalSection crit_; 152 rtc::CriticalSection crit_;
153 bool finished_; 153 bool finished_;
154 154
155 RTC_DISALLOW_COPY_AND_ASSIGN(FileReadThread); 155 RTC_DISALLOW_COPY_AND_ASSIGN(FileReadThread);
156 }; 156 };
157 157
158 ///////////////////////////////////////////////////////////////////// 158 /////////////////////////////////////////////////////////////////////
159 // Implementation of class FileVideoCapturer 159 // Implementation of class FileVideoCapturer
160 ///////////////////////////////////////////////////////////////////// 160 /////////////////////////////////////////////////////////////////////
161 static const int64_t kNumNanoSecsPerMilliSec = 1000000; 161 static const int64_t kNumNanoSecsPerMilliSec = 1000000;
162 const char* FileVideoCapturer::kVideoFileDevicePrefix = "video-file:"; 162 const char* FileVideoCapturer::kVideoFileDevicePrefix = "video-file:";
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 if (interval_ms > 0) { 376 if (interval_ms > 0) {
377 *wait_time_ms = interval_ms; 377 *wait_time_ms = interval_ms;
378 } 378 }
379 } 379 }
380 // Keep the original timestamp read from the file. 380 // Keep the original timestamp read from the file.
381 last_frame_timestamp_ns_ = captured_frame_.time_stamp; 381 last_frame_timestamp_ns_ = captured_frame_.time_stamp;
382 return true; 382 return true;
383 } 383 }
384 384
385 } // namespace cricket 385 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/media/base/fakevideorenderer.h ('k') | talk/media/devices/yuvframescapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698