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

Side by Side Diff: webrtc/video_receive_stream.h

Issue 2655243006: Add temporary AddRtxInfo member function to VideoReceiveStream::Config. (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 uint32_t ssrc = 0; 149 uint32_t ssrc = 0;
150 150
151 // Payload type to use for the RTX stream. 151 // Payload type to use for the RTX stream.
152 int payload_type = 0; 152 int payload_type = 0;
153 }; 153 };
154 154
155 // Map from video RTP payload type -> RTX config. 155 // Map from video RTP payload type -> RTX config.
156 typedef std::map<int, Rtx> RtxMap; 156 typedef std::map<int, Rtx> RtxMap;
157 RtxMap rtx; 157 RtxMap rtx;
158 158
159 // TODO(brandtr): Remove this member function when internal project has
160 // been updated.
161 void AddRtxInfo(int media_pt, int rtx_pt, uint32_t rtx_ssrc) {
162 Rtx r;
163 r.ssrc = rtx_ssrc;
164 r.payload_type = rtx_pt;
165 rtx[media_pt] = r;
166 }
167
159 // RTP header extensions used for the received stream. 168 // RTP header extensions used for the received stream.
160 std::vector<RtpExtension> extensions; 169 std::vector<RtpExtension> extensions;
161 } rtp; 170 } rtp;
162 171
163 // Transport for outgoing packets (RTCP). 172 // Transport for outgoing packets (RTCP).
164 Transport* rtcp_send_transport = nullptr; 173 Transport* rtcp_send_transport = nullptr;
165 174
166 // Must not be 'nullptr' when the stream is started. 175 // Must not be 'nullptr' when the stream is started.
167 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr; 176 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr;
168 177
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0); 228 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0);
220 } 229 }
221 230
222 protected: 231 protected:
223 virtual ~VideoReceiveStream() {} 232 virtual ~VideoReceiveStream() {}
224 }; 233 };
225 234
226 } // namespace webrtc 235 } // namespace webrtc
227 236
228 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ 237 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698