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

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

Issue 1600973002: Initialize VideoEncoder objects asynchronously. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 20 matching lines...) Expand all
31 namespace webrtc { 31 namespace webrtc {
32 32
33 class Config; 33 class Config;
34 class CpuOveruseMetricsObserver; 34 class CpuOveruseMetricsObserver;
35 class CpuOveruseObserver; 35 class CpuOveruseObserver;
36 class CriticalSectionWrapper; 36 class CriticalSectionWrapper;
37 class OveruseFrameDetector; 37 class OveruseFrameDetector;
38 class ProcessThread; 38 class ProcessThread;
39 class RegistrableCpuOveruseMetricsObserver; 39 class RegistrableCpuOveruseMetricsObserver;
40 class SendStatisticsProxy; 40 class SendStatisticsProxy;
41 class VideoCodingModule;
41 class VideoRenderer; 42 class VideoRenderer;
42 43
43 class VideoCaptureCallback { 44 class VideoCaptureCallback {
44 public: 45 public:
45 virtual ~VideoCaptureCallback() {} 46 virtual ~VideoCaptureCallback() {}
46 47
47 virtual void DeliverFrame(VideoFrame video_frame) = 0; 48 virtual void DeliverFrame(VideoFrame video_frame) = 0;
48 }; 49 };
49 50
50 namespace internal { 51 namespace internal {
52
53 class VideoSendStream;
51 class VideoCaptureInput : public webrtc::VideoCaptureInput { 54 class VideoCaptureInput : public webrtc::VideoCaptureInput {
52 public: 55 public:
53 VideoCaptureInput(ProcessThread* module_process_thread, 56 VideoCaptureInput(ProcessThread* module_process_thread,
54 VideoCaptureCallback* frame_callback, 57 VideoCaptureCallback* frame_callback,
55 VideoRenderer* local_renderer, 58 VideoCodingModule* vcm,
59 VideoSendStream* video_send_stream,
60 const webrtc::VideoSendStream::Config& config,
56 SendStatisticsProxy* send_stats_proxy, 61 SendStatisticsProxy* send_stats_proxy,
57 CpuOveruseObserver* overuse_observer, 62 CpuOveruseObserver* overuse_observer);
58 EncodingTimeObserver* encoding_time_observer);
59 ~VideoCaptureInput(); 63 ~VideoCaptureInput();
60 64
61 void IncomingCapturedFrame(const VideoFrame& video_frame) override; 65 void IncomingCapturedFrame(const VideoFrame& video_frame) override;
66 void TriggerSetSendCodec(const VideoCodec& video_codec);
62 67
63 private: 68 private:
64 // Thread functions for deliver captured frames to receivers. 69 // Thread functions for deliver captured frames to receivers.
65 static bool EncoderThreadFunction(void* obj); 70 static bool EncoderThreadFunction(void* obj);
66 bool EncoderProcess(); 71 bool EncoderProcess();
67 72
68 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_; 73 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_;
69 ProcessThread* const module_process_thread_; 74 ProcessThread* const module_process_thread_;
70 75
71 VideoCaptureCallback* const frame_callback_; 76 VideoCaptureCallback* const frame_callback_;
72 VideoRenderer* const local_renderer_; 77 VideoCodingModule* const vcm_;
78 VideoSendStream* const video_send_stream_;
79 const webrtc::VideoSendStream::Config config_;
80 bool encoder_registered_;
73 SendStatisticsProxy* const stats_proxy_; 81 SendStatisticsProxy* const stats_proxy_;
74 82
75 // Frame used in IncomingFrameI420.
76 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_;
77 VideoFrame incoming_frame_;
78
79 rtc::PlatformThread encoder_thread_; 83 rtc::PlatformThread encoder_thread_;
80 rtc::Event capture_event_; 84 rtc::Event capture_event_;
81 85
82 volatile int stop_; 86 volatile int stop_;
83 87
84 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get()); 88 bool replace_codec_settings_ GUARDED_BY(capture_cs_);
89 VideoCodec codec_settings_ GUARDED_BY(capture_cs_);
90 VideoFrame captured_frame_ GUARDED_BY(capture_cs_);
85 // Used to make sure incoming time stamp is increasing for every frame. 91 // Used to make sure incoming time stamp is increasing for every frame.
86 int64_t last_captured_timestamp_; 92 int64_t last_captured_timestamp_;
87 // Delta used for translating between NTP and internal timestamps. 93 // Delta used for translating between NTP and internal timestamps.
88 const int64_t delta_ntp_internal_ms_; 94 const int64_t delta_ntp_internal_ms_;
89 95
90 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 96 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
91 EncodingTimeObserver* const encoding_time_observer_;
92 }; 97 };
93 98
94 } // namespace internal 99 } // namespace internal
95 } // namespace webrtc 100 } // namespace webrtc
96 101
97 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 102 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698