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

Side by Side Diff: webrtc/video_receive_stream.h

Issue 2469093003: Remove RED/RTX workaround from sender/receiver and VideoEngine2. (Closed)
Patch Set: Fix warning message. Created 4 years, 1 month 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/video_send_stream_tests.cc ('k') | no next file » | 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
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 uint32_t ssrc = 0; 145 uint32_t ssrc = 0;
146 146
147 // Payload type to use for the RTX stream. 147 // Payload type to use for the RTX stream.
148 int payload_type = 0; 148 int payload_type = 0;
149 }; 149 };
150 150
151 // Map from video RTP payload type -> RTX config. 151 // Map from video RTP payload type -> RTX config.
152 typedef std::map<int, Rtx> RtxMap; 152 typedef std::map<int, Rtx> RtxMap;
153 RtxMap rtx; 153 RtxMap rtx;
154 154
155 // If set to true, the RTX payload type mapping supplied in |rtx| will be
156 // used when restoring RTX packets. Without it, RTX packets will always be
157 // restored to the last non-RTX packet payload type received.
158 bool use_rtx_payload_mapping_on_restore = false;
159
160 // RTP header extensions used for the received stream. 155 // RTP header extensions used for the received stream.
161 std::vector<RtpExtension> extensions; 156 std::vector<RtpExtension> extensions;
162 } rtp; 157 } rtp;
163 158
164 // Transport for outgoing packets (RTCP). 159 // Transport for outgoing packets (RTCP).
165 Transport* rtcp_send_transport = nullptr; 160 Transport* rtcp_send_transport = nullptr;
166 161
167 // Must not be 'nullptr' when the stream is started. 162 // Must not be 'nullptr' when the stream is started.
168 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr; 163 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr;
169 164
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0); 215 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0);
221 } 216 }
222 217
223 protected: 218 protected:
224 virtual ~VideoReceiveStream() {} 219 virtual ~VideoReceiveStream() {}
225 }; 220 };
226 221
227 } // namespace webrtc 222 } // namespace webrtc
228 223
229 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ 224 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream_tests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698