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

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

Issue 1534233002: Incorrect timestamps used by video analyzer with real camera Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 | « no previous file | webrtc/video/video_capture_input.cc » ('j') | webrtc/video/video_capture_input.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 VideoCaptureInput(ProcessThread* module_process_thread, 53 VideoCaptureInput(ProcessThread* module_process_thread,
54 VideoCaptureCallback* frame_callback, 54 VideoCaptureCallback* frame_callback,
55 VideoRenderer* local_renderer, 55 VideoRenderer* local_renderer,
56 SendStatisticsProxy* send_stats_proxy, 56 SendStatisticsProxy* send_stats_proxy,
57 CpuOveruseObserver* overuse_observer, 57 CpuOveruseObserver* overuse_observer,
58 EncodingTimeObserver* encoding_time_observer); 58 EncodingTimeObserver* encoding_time_observer);
59 ~VideoCaptureInput(); 59 ~VideoCaptureInput();
60 60
61 void IncomingCapturedFrame(const VideoFrame& video_frame) override; 61 void IncomingCapturedFrame(const VideoFrame& video_frame) override;
62 62
63 VideoFrame UpdateTimestamps(const VideoFrame& video_frame);
64
63 private: 65 private:
64 // Thread functions for deliver captured frames to receivers. 66 // Thread functions for deliver captured frames to receivers.
65 static bool EncoderThreadFunction(void* obj); 67 static bool EncoderThreadFunction(void* obj);
66 bool EncoderProcess(); 68 bool EncoderProcess();
67 69
68 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_; 70 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_;
69 ProcessThread* const module_process_thread_; 71 ProcessThread* const module_process_thread_;
70 72
71 VideoCaptureCallback* const frame_callback_; 73 VideoCaptureCallback* const frame_callback_;
72 VideoRenderer* const local_renderer_; 74 VideoRenderer* const local_renderer_;
(...skipping 15 matching lines...) Expand all
88 const int64_t delta_ntp_internal_ms_; 90 const int64_t delta_ntp_internal_ms_;
89 91
90 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 92 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
91 EncodingTimeObserver* const encoding_time_observer_; 93 EncodingTimeObserver* const encoding_time_observer_;
92 }; 94 };
93 95
94 } // namespace internal 96 } // namespace internal
95 } // namespace webrtc 97 } // namespace webrtc
96 98
97 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 99 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/video_capture_input.cc » ('j') | webrtc/video/video_capture_input.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698