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

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

Issue 1324263004: Remove cricket::VideoFrame::Set/GetElapsedTime() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased. Re-added CapturedFrame.elapsed_time. Remove once Chromium is updated. Created 5 years, 2 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/videoframefactory.cc ('k') | talk/media/devices/filevideocapturer.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 private: 142 private:
143 class FileReadThread; // Forward declaration, defined in .cc. 143 class FileReadThread; // Forward declaration, defined in .cc.
144 144
145 static const char* kVideoFileDevicePrefix; 145 static const char* kVideoFileDevicePrefix;
146 rtc::FileStream video_file_; 146 rtc::FileStream video_file_;
147 CapturedFrame captured_frame_; 147 CapturedFrame captured_frame_;
148 // The number of bytes allocated buffer for captured_frame_.data. 148 // The number of bytes allocated buffer for captured_frame_.data.
149 uint32 frame_buffer_size_; 149 uint32 frame_buffer_size_;
150 FileReadThread* file_read_thread_; 150 FileReadThread* file_read_thread_;
151 int repeat_; // How many times to repeat the file. 151 int repeat_; // How many times to repeat the file.
152 int64 start_time_ns_; // Time when the file video capturer starts.
153 int64 last_frame_timestamp_ns_; // Timestamp of last read frame. 152 int64 last_frame_timestamp_ns_; // Timestamp of last read frame.
154 bool ignore_framerate_; 153 bool ignore_framerate_;
155 154
156 RTC_DISALLOW_COPY_AND_ASSIGN(FileVideoCapturer); 155 RTC_DISALLOW_COPY_AND_ASSIGN(FileVideoCapturer);
157 }; 156 };
158 157
159 } // namespace cricket 158 } // namespace cricket
160 159
161 #endif // TALK_MEDIA_DEVICES_FILEVIDEOCAPTURER_H_ 160 #endif // TALK_MEDIA_DEVICES_FILEVIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « talk/media/base/videoframefactory.cc ('k') | talk/media/devices/filevideocapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698