OLD | NEW |
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_RECEIVE_STREAM_H_ | 11 #ifndef WEBRTC_VIDEO_RECEIVE_STREAM_H_ |
12 #define WEBRTC_VIDEO_RECEIVE_STREAM_H_ | 12 #define WEBRTC_VIDEO_RECEIVE_STREAM_H_ |
13 | 13 |
14 #include <limits> | 14 #include <limits> |
15 #include <map> | 15 #include <map> |
16 #include <string> | 16 #include <string> |
17 #include <vector> | 17 #include <vector> |
18 | 18 |
19 #include "webrtc/common_types.h" | 19 #include "webrtc/common_types.h" |
20 #include "webrtc/config.h" | 20 #include "webrtc/config.h" |
21 #include "webrtc/frame_callback.h" | 21 #include "webrtc/frame_callback.h" |
22 #include "webrtc/stream.h" | 22 #include "webrtc/stream.h" |
23 #include "webrtc/transport.h" | 23 #include "webrtc/transport.h" |
24 #include "webrtc/video_renderer.h" | 24 #include "webrtc/media/base/videosinkinterface.h" |
25 | 25 |
26 namespace webrtc { | 26 namespace webrtc { |
27 | 27 |
28 class VideoDecoder; | 28 class VideoDecoder; |
29 | 29 |
30 class VideoReceiveStream : public ReceiveStream { | 30 class VideoReceiveStream : public ReceiveStream { |
31 public: | 31 public: |
32 // TODO(mflodman) Move all these settings to VideoDecoder and move the | 32 // TODO(mflodman) Move all these settings to VideoDecoder and move the |
33 // declaration to common_types.h. | 33 // declaration to common_types.h. |
34 struct Decoder { | 34 struct Decoder { |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 | 138 |
139 // RTP header extensions used for the received stream. | 139 // RTP header extensions used for the received stream. |
140 std::vector<RtpExtension> extensions; | 140 std::vector<RtpExtension> extensions; |
141 } rtp; | 141 } rtp; |
142 | 142 |
143 // Transport for outgoing packets (RTCP). | 143 // Transport for outgoing packets (RTCP). |
144 Transport* rtcp_send_transport = nullptr; | 144 Transport* rtcp_send_transport = nullptr; |
145 | 145 |
146 // VideoRenderer will be called for each decoded frame. 'nullptr' disables | 146 // VideoRenderer will be called for each decoded frame. 'nullptr' disables |
147 // rendering of this stream. | 147 // rendering of this stream. |
148 VideoRenderer* renderer = nullptr; | 148 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr; |
149 | 149 |
150 // Expected delay needed by the renderer, i.e. the frame will be delivered | 150 // Expected delay needed by the renderer, i.e. the frame will be delivered |
151 // this many milliseconds, if possible, earlier than the ideal render time. | 151 // this many milliseconds, if possible, earlier than the ideal render time. |
152 // Only valid if 'renderer' is set. | 152 // Only valid if 'renderer' is set. |
153 int render_delay_ms = 10; | 153 int render_delay_ms = 10; |
154 | 154 |
| 155 // If set, pass frames on to the renderer as soon as they are |
| 156 // available. |
| 157 bool disable_prerenderer_smoothing = false; |
| 158 |
155 // Identifier for an A/V synchronization group. Empty string to disable. | 159 // Identifier for an A/V synchronization group. Empty string to disable. |
156 // TODO(pbos): Synchronize streams in a sync group, not just video streams | 160 // TODO(pbos): Synchronize streams in a sync group, not just video streams |
157 // to one of the audio streams. | 161 // to one of the audio streams. |
158 std::string sync_group; | 162 std::string sync_group; |
159 | 163 |
160 // Called for each incoming video frame, i.e. in encoded state. E.g. used | 164 // Called for each incoming video frame, i.e. in encoded state. E.g. used |
161 // when | 165 // when |
162 // saving the stream to a file. 'nullptr' disables the callback. | 166 // saving the stream to a file. 'nullptr' disables the callback. |
163 EncodedFrameObserver* pre_decode_callback = nullptr; | 167 EncodedFrameObserver* pre_decode_callback = nullptr; |
164 | 168 |
165 // Called for each decoded frame. E.g. used when adding effects to the | 169 // Called for each decoded frame. E.g. used when adding effects to the |
166 // decoded | 170 // decoded |
167 // stream. 'nullptr' disables the callback. | 171 // stream. 'nullptr' disables the callback. |
168 I420FrameCallback* pre_render_callback = nullptr; | 172 I420FrameCallback* pre_render_callback = nullptr; |
169 | 173 |
170 // Target delay in milliseconds. A positive value indicates this stream is | 174 // Target delay in milliseconds. A positive value indicates this stream is |
171 // used for streaming instead of a real-time call. | 175 // used for streaming instead of a real-time call. |
172 int target_delay_ms = 0; | 176 int target_delay_ms = 0; |
173 }; | 177 }; |
174 | 178 |
175 // TODO(pbos): Add info on currently-received codec to Stats. | 179 // TODO(pbos): Add info on currently-received codec to Stats. |
176 virtual Stats GetStats() const = 0; | 180 virtual Stats GetStats() const = 0; |
177 }; | 181 }; |
178 | 182 |
179 } // namespace webrtc | 183 } // namespace webrtc |
180 | 184 |
181 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ | 185 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ |
OLD | NEW |