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

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

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. Created 5 years, 3 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/devices/filevideocapturer.h ('k') | talk/media/devices/yuvframescapturer.h » ('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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 bool Finished() const { 143 bool Finished() const {
144 rtc::CritScope cs(&crit_); 144 rtc::CritScope cs(&crit_);
145 return finished_; 145 return finished_;
146 } 146 }
147 147
148 private: 148 private:
149 FileVideoCapturer* capturer_; 149 FileVideoCapturer* capturer_;
150 mutable rtc::CriticalSection crit_; 150 mutable rtc::CriticalSection crit_;
151 bool finished_; 151 bool finished_;
152 152
153 DISALLOW_COPY_AND_ASSIGN(FileReadThread); 153 RTC_DISALLOW_COPY_AND_ASSIGN(FileReadThread);
154 }; 154 };
155 155
156 ///////////////////////////////////////////////////////////////////// 156 /////////////////////////////////////////////////////////////////////
157 // Implementation of class FileVideoCapturer 157 // Implementation of class FileVideoCapturer
158 ///////////////////////////////////////////////////////////////////// 158 /////////////////////////////////////////////////////////////////////
159 static const int64 kNumNanoSecsPerMilliSec = 1000000; 159 static const int64 kNumNanoSecsPerMilliSec = 1000000;
160 const char* FileVideoCapturer::kVideoFileDevicePrefix = "video-file:"; 160 const char* FileVideoCapturer::kVideoFileDevicePrefix = "video-file:";
161 161
162 FileVideoCapturer::FileVideoCapturer() 162 FileVideoCapturer::FileVideoCapturer()
163 : frame_buffer_size_(0), 163 : frame_buffer_size_(0),
(...skipping 212 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/devices/filevideocapturer.h ('k') | talk/media/devices/yuvframescapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698