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

Side by Side Diff: webrtc/media/base/videocapturer.h

Issue 1865283002: Use microsecond timestamp in cricket::VideoFrame. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Let VideoCapturer adjust timestamps. Created 4 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) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 int ratio_h_; 287 int ratio_h_;
288 bool enable_camera_list_; 288 bool enable_camera_list_;
289 bool square_pixel_aspect_ratio_; // Enable scaling to square pixels. 289 bool square_pixel_aspect_ratio_; // Enable scaling to square pixels.
290 int scaled_width_; // Current output size from ComputeScale. 290 int scaled_width_; // Current output size from ComputeScale.
291 int scaled_height_; 291 int scaled_height_;
292 292
293 rtc::VideoBroadcaster broadcaster_; 293 rtc::VideoBroadcaster broadcaster_;
294 bool enable_video_adapter_; 294 bool enable_video_adapter_;
295 VideoAdapter video_adapter_; 295 VideoAdapter video_adapter_;
296 296
297 // Same value as input_size_valid_ below, but different locking.
perkj_webrtc 2016/04/08 08:22:49 ?
nisse-webrtc 2016/04/08 09:15:43 Both timestamp_offset_valid and input_size_valid h
298 bool timestamp_offset_valid_ = false;
299 int64_t timestamp_offset_;
300
297 rtc::CriticalSection frame_stats_crit_; 301 rtc::CriticalSection frame_stats_crit_;
298 // The captured frame size before potential adapation. 302 // The captured frame size before potential adapation.
299 bool input_size_valid_ GUARDED_BY(frame_stats_crit_) = false; 303 bool input_size_valid_ GUARDED_BY(frame_stats_crit_) = false;
300 int input_width_ GUARDED_BY(frame_stats_crit_); 304 int input_width_ GUARDED_BY(frame_stats_crit_);
301 int input_height_ GUARDED_BY(frame_stats_crit_); 305 int input_height_ GUARDED_BY(frame_stats_crit_);
302 306
303 // Whether capturer should apply rotation to the frame before signaling it. 307 // Whether capturer should apply rotation to the frame before signaling it.
304 bool apply_rotation_; 308 bool apply_rotation_;
305 309
306 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 310 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
307 }; 311 };
308 312
309 } // namespace cricket 313 } // namespace cricket
310 314
311 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ 315 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698