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

Side by Side Diff: webrtc/video/video_capture_input.h

Issue 1693443002: VideoCaptureInput enforce VideoFrame::render_time to be generated by webrtc clock. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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_VIDEO_VIDEO_CAPTURE_INPUT_H_ 11 #ifndef WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
12 #define WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 12 #define WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/event.h" 17 #include "webrtc/base/event.h"
18 #include "webrtc/base/platform_thread.h" 18 #include "webrtc/base/platform_thread.h"
19 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
20 #include "webrtc/common_types.h" 20 #include "webrtc/common_types.h"
21 #include "webrtc/engine_configurations.h" 21 #include "webrtc/engine_configurations.h"
22 #include "webrtc/modules/video_capture/video_capture.h" 22 #include "webrtc/modules/video_capture/video_capture.h"
23 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 23 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
24 #include "webrtc/modules/video_coding/include/video_coding.h" 24 #include "webrtc/modules/video_coding/include/video_coding.h"
25 #include "webrtc/modules/video_processing/include/video_processing.h" 25 #include "webrtc/modules/video_processing/include/video_processing.h"
26 #include "webrtc/system_wrappers/include/clock.h"
26 #include "webrtc/typedefs.h" 27 #include "webrtc/typedefs.h"
27 #include "webrtc/video_send_stream.h" 28 #include "webrtc/video_send_stream.h"
28 29
29 namespace webrtc { 30 namespace webrtc {
30 31
31 class Config; 32 class Config;
32 class OveruseFrameDetector; 33 class OveruseFrameDetector;
33 class SendStatisticsProxy; 34 class SendStatisticsProxy;
34 class VideoRenderer; 35 class VideoRenderer;
35 36
(...skipping 25 matching lines...) Expand all
61 VideoCaptureCallback* const frame_callback_; 62 VideoCaptureCallback* const frame_callback_;
62 VideoRenderer* const local_renderer_; 63 VideoRenderer* const local_renderer_;
63 SendStatisticsProxy* const stats_proxy_; 64 SendStatisticsProxy* const stats_proxy_;
64 65
65 rtc::PlatformThread encoder_thread_; 66 rtc::PlatformThread encoder_thread_;
66 rtc::Event capture_event_; 67 rtc::Event capture_event_;
67 68
68 volatile int stop_; 69 volatile int stop_;
69 70
70 VideoFrame captured_frame_ GUARDED_BY(crit_); 71 VideoFrame captured_frame_ GUARDED_BY(crit_);
72 Clock* const clock_;
71 // Used to make sure incoming time stamp is increasing for every frame. 73 // Used to make sure incoming time stamp is increasing for every frame.
72 int64_t last_captured_timestamp_; 74 int64_t last_captured_timestamp_;
73 // Delta used for translating between NTP and internal timestamps. 75 // Delta used for translating between NTP and internal timestamps.
74 const int64_t delta_ntp_internal_ms_; 76 const int64_t delta_ntp_internal_ms_;
75 77
76 OveruseFrameDetector* const overuse_detector_; 78 OveruseFrameDetector* const overuse_detector_;
77 }; 79 };
78 80
79 } // namespace internal 81 } // namespace internal
80 } // namespace webrtc 82 } // namespace webrtc
81 83
82 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 84 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698