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

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

Issue 1818023002: Delete class webrtc::VideoRenderer and its header file. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased. Created 4 years, 9 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
« no previous file with comments | « webrtc/video/replay.cc ('k') | webrtc/video/video_capture_input.cc » ('j') | no next file with comments »
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 14 matching lines...) Expand all
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/system_wrappers/include/clock.h"
27 #include "webrtc/typedefs.h" 27 #include "webrtc/typedefs.h"
28 #include "webrtc/video_send_stream.h" 28 #include "webrtc/video_send_stream.h"
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class Config; 32 class Config;
33 class OveruseFrameDetector; 33 class OveruseFrameDetector;
34 class SendStatisticsProxy; 34 class SendStatisticsProxy;
35 class VideoRenderer;
36 35
37 namespace internal { 36 namespace internal {
38 class VideoCaptureInput : public webrtc::VideoCaptureInput { 37 class VideoCaptureInput : public webrtc::VideoCaptureInput {
39 public: 38 public:
40 VideoCaptureInput(rtc::Event* capture_event, 39 VideoCaptureInput(rtc::Event* capture_event,
41 VideoRenderer* local_renderer, 40 rtc::VideoSinkInterface<VideoFrame>* local_renderer,
42 SendStatisticsProxy* send_stats_proxy, 41 SendStatisticsProxy* send_stats_proxy,
43 OveruseFrameDetector* overuse_detector); 42 OveruseFrameDetector* overuse_detector);
44 ~VideoCaptureInput(); 43 ~VideoCaptureInput();
45 44
46 void IncomingCapturedFrame(const VideoFrame& video_frame) override; 45 void IncomingCapturedFrame(const VideoFrame& video_frame) override;
47 46
48 bool GetVideoFrame(VideoFrame* frame); 47 bool GetVideoFrame(VideoFrame* frame);
49 48
50 private: 49 private:
51 rtc::CriticalSection crit_; 50 rtc::CriticalSection crit_;
52 51
53 VideoRenderer* const local_renderer_; 52 rtc::VideoSinkInterface<VideoFrame>* const local_renderer_;
54 SendStatisticsProxy* const stats_proxy_; 53 SendStatisticsProxy* const stats_proxy_;
55 rtc::Event* const capture_event_; 54 rtc::Event* const capture_event_;
56 55
57 VideoFrame captured_frame_ GUARDED_BY(crit_); 56 VideoFrame captured_frame_ GUARDED_BY(crit_);
58 Clock* const clock_; 57 Clock* const clock_;
59 // Used to make sure incoming time stamp is increasing for every frame. 58 // Used to make sure incoming time stamp is increasing for every frame.
60 int64_t last_captured_timestamp_; 59 int64_t last_captured_timestamp_;
61 // Delta used for translating between NTP and internal timestamps. 60 // Delta used for translating between NTP and internal timestamps.
62 const int64_t delta_ntp_internal_ms_; 61 const int64_t delta_ntp_internal_ms_;
63 62
64 OveruseFrameDetector* const overuse_detector_; 63 OveruseFrameDetector* const overuse_detector_;
65 }; 64 };
66 65
67 } // namespace internal 66 } // namespace internal
68 } // namespace webrtc 67 } // namespace webrtc
69 68
70 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 69 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW
« no previous file with comments | « webrtc/video/replay.cc ('k') | webrtc/video/video_capture_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698