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

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

Issue 1569853002: Measure encoding time on encode callbacks. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove unused variable Created 4 years, 11 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
(...skipping 13 matching lines...) Expand all
24 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 24 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
25 #include "webrtc/modules/video_coding/include/video_coding.h" 25 #include "webrtc/modules/video_coding/include/video_coding.h"
26 #include "webrtc/modules/video_processing/include/video_processing.h" 26 #include "webrtc/modules/video_processing/include/video_processing.h"
27 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 27 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
28 #include "webrtc/typedefs.h" 28 #include "webrtc/typedefs.h"
29 #include "webrtc/video_send_stream.h" 29 #include "webrtc/video_send_stream.h"
30 30
31 namespace webrtc { 31 namespace webrtc {
32 32
33 class Config; 33 class Config;
34 class CpuOveruseMetricsObserver;
35 class CpuOveruseObserver;
36 class CriticalSectionWrapper; 34 class CriticalSectionWrapper;
37 class OveruseFrameDetector; 35 class OveruseFrameDetector;
38 class ProcessThread; 36 class ProcessThread;
39 class RegistrableCpuOveruseMetricsObserver;
40 class SendStatisticsProxy; 37 class SendStatisticsProxy;
41 class VideoRenderer; 38 class VideoRenderer;
42 39
43 class VideoCaptureCallback { 40 class VideoCaptureCallback {
44 public: 41 public:
45 virtual ~VideoCaptureCallback() {} 42 virtual ~VideoCaptureCallback() {}
46 43
47 virtual void DeliverFrame(VideoFrame video_frame) = 0; 44 virtual void DeliverFrame(VideoFrame video_frame) = 0;
48 }; 45 };
49 46
50 namespace internal { 47 namespace internal {
51 class VideoCaptureInput : public webrtc::VideoCaptureInput { 48 class VideoCaptureInput : public webrtc::VideoCaptureInput {
52 public: 49 public:
53 VideoCaptureInput(ProcessThread* module_process_thread, 50 VideoCaptureInput(VideoCaptureCallback* frame_callback,
54 VideoCaptureCallback* frame_callback,
55 VideoRenderer* local_renderer, 51 VideoRenderer* local_renderer,
56 SendStatisticsProxy* send_stats_proxy, 52 SendStatisticsProxy* send_stats_proxy,
57 CpuOveruseObserver* overuse_observer, 53 OveruseFrameDetector* overuse_detector);
58 EncodingTimeObserver* encoding_time_observer);
59 ~VideoCaptureInput(); 54 ~VideoCaptureInput();
60 55
61 void IncomingCapturedFrame(const VideoFrame& video_frame) override; 56 void IncomingCapturedFrame(const VideoFrame& video_frame) override;
62 57
63 private: 58 private:
64 // Thread functions for deliver captured frames to receivers. 59 // Thread functions for deliver captured frames to receivers.
65 static bool EncoderThreadFunction(void* obj); 60 static bool EncoderThreadFunction(void* obj);
66 bool EncoderProcess(); 61 bool EncoderProcess();
67 62
68 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_; 63 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_;
69 ProcessThread* const module_process_thread_;
70 64
71 VideoCaptureCallback* const frame_callback_; 65 VideoCaptureCallback* const frame_callback_;
72 VideoRenderer* const local_renderer_; 66 VideoRenderer* const local_renderer_;
73 SendStatisticsProxy* const stats_proxy_; 67 SendStatisticsProxy* const stats_proxy_;
74 68
75 // Frame used in IncomingFrameI420. 69 // Frame used in IncomingFrameI420.
76 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_; 70 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_;
77 VideoFrame incoming_frame_; 71 VideoFrame incoming_frame_;
78 72
79 rtc::PlatformThread encoder_thread_; 73 rtc::PlatformThread encoder_thread_;
80 rtc::Event capture_event_; 74 rtc::Event capture_event_;
81 75
82 volatile int stop_; 76 volatile int stop_;
83 77
84 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get()); 78 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get());
85 // Used to make sure incoming time stamp is increasing for every frame. 79 // Used to make sure incoming time stamp is increasing for every frame.
86 int64_t last_captured_timestamp_; 80 int64_t last_captured_timestamp_;
87 // Delta used for translating between NTP and internal timestamps. 81 // Delta used for translating between NTP and internal timestamps.
88 const int64_t delta_ntp_internal_ms_; 82 const int64_t delta_ntp_internal_ms_;
89 83
90 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 84 OveruseFrameDetector* const overuse_detector_;
91 EncodingTimeObserver* const encoding_time_observer_;
92 }; 85 };
93 86
94 } // namespace internal 87 } // namespace internal
95 } // namespace webrtc 88 } // namespace webrtc
96 89
97 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 90 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698