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

Side by Side Diff: webrtc/video_send_stream.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_renderer.h ('k') | webrtc/webrtc.gyp » ('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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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_SEND_STREAM_H_ 11 #ifndef WEBRTC_VIDEO_SEND_STREAM_H_
12 #define WEBRTC_VIDEO_SEND_STREAM_H_ 12 #define WEBRTC_VIDEO_SEND_STREAM_H_
13 13
14 #include <map> 14 #include <map>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/common_types.h" 17 #include "webrtc/common_types.h"
18 #include "webrtc/config.h" 18 #include "webrtc/config.h"
19 #include "webrtc/frame_callback.h" 19 #include "webrtc/frame_callback.h"
20 #include "webrtc/stream.h" 20 #include "webrtc/stream.h"
21 #include "webrtc/transport.h" 21 #include "webrtc/transport.h"
22 #include "webrtc/video_renderer.h" 22 #include "webrtc/media/base/videosinkinterface.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 class LoadObserver; 26 class LoadObserver;
27 class VideoEncoder; 27 class VideoEncoder;
28 28
29 // Class to deliver captured frame to the video send stream. 29 // Class to deliver captured frame to the video send stream.
30 class VideoCaptureInput { 30 class VideoCaptureInput {
31 public: 31 public:
32 // These methods do not lock internally and must be called sequentially. 32 // These methods do not lock internally and must be called sequentially.
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 I420FrameCallback* pre_encode_callback = nullptr; 142 I420FrameCallback* pre_encode_callback = nullptr;
143 143
144 // Called for each encoded frame, e.g. used for file storage. 'nullptr' 144 // Called for each encoded frame, e.g. used for file storage. 'nullptr'
145 // disables the callback. Also measures timing and passes the time 145 // disables the callback. Also measures timing and passes the time
146 // spent on encoding. This timing will not fire if encoding takes longer 146 // spent on encoding. This timing will not fire if encoding takes longer
147 // than the measuring window, since the sample data will have been dropped. 147 // than the measuring window, since the sample data will have been dropped.
148 EncodedFrameObserver* post_encode_callback = nullptr; 148 EncodedFrameObserver* post_encode_callback = nullptr;
149 149
150 // Renderer for local preview. The local renderer will be called even if 150 // Renderer for local preview. The local renderer will be called even if
151 // sending hasn't started. 'nullptr' disables local rendering. 151 // sending hasn't started. 'nullptr' disables local rendering.
152 VideoRenderer* local_renderer = nullptr; 152 rtc::VideoSinkInterface<VideoFrame>* local_renderer = nullptr;
153 153
154 // Expected delay needed by the renderer, i.e. the frame will be delivered 154 // Expected delay needed by the renderer, i.e. the frame will be delivered
155 // this many milliseconds, if possible, earlier than expected render time. 155 // this many milliseconds, if possible, earlier than expected render time.
156 // Only valid if |local_renderer| is set. 156 // Only valid if |local_renderer| is set.
157 int render_delay_ms = 0; 157 int render_delay_ms = 0;
158 158
159 // Target delay in milliseconds. A positive value indicates this stream is 159 // Target delay in milliseconds. A positive value indicates this stream is
160 // used for streaming instead of a real-time call. 160 // used for streaming instead of a real-time call.
161 int target_delay_ms = 0; 161 int target_delay_ms = 0;
162 162
(...skipping 11 matching lines...) Expand all
174 // in the config. Encoder settings are passed on to the encoder instance along 174 // in the config. Encoder settings are passed on to the encoder instance along
175 // with the VideoStream settings. 175 // with the VideoStream settings.
176 virtual void ReconfigureVideoEncoder(const VideoEncoderConfig& config) = 0; 176 virtual void ReconfigureVideoEncoder(const VideoEncoderConfig& config) = 0;
177 177
178 virtual Stats GetStats() = 0; 178 virtual Stats GetStats() = 0;
179 }; 179 };
180 180
181 } // namespace webrtc 181 } // namespace webrtc
182 182
183 #endif // WEBRTC_VIDEO_SEND_STREAM_H_ 183 #endif // WEBRTC_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video_renderer.h ('k') | webrtc/webrtc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698