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

Side by Side Diff: webrtc/video_receive_stream.h

Issue 2657253002: Remove temporary AddRtxInfo member function. (Closed)
Patch Set: Rebase. 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // See UlpfecConfig for description. 143 // See UlpfecConfig for description.
144 UlpfecConfig ulpfec; 144 UlpfecConfig ulpfec;
145 145
146 // SSRC for retransmissions. 146 // SSRC for retransmissions.
147 uint32_t rtx_ssrc = 0; 147 uint32_t rtx_ssrc = 0;
148 148
149 // Map from video payload type (apt) -> RTX payload type (pt). 149 // Map from video payload type (apt) -> RTX payload type (pt).
150 // For RTX to be enabled, both an SSRC and this mapping are needed. 150 // For RTX to be enabled, both an SSRC and this mapping are needed.
151 std::map<int, int> rtx_payload_types; 151 std::map<int, int> rtx_payload_types;
152 152
153 // TODO(brandtr): Remove this member function when internal project has
154 // been updated.
155 void AddRtxInfo(int media_pt, int rtx_pt, uint32_t new_rtx_ssrc) {
156 rtx_ssrc = new_rtx_ssrc;
157 rtx_payload_types[media_pt] = rtx_pt;
158 }
159
160 // RTP header extensions used for the received stream. 153 // RTP header extensions used for the received stream.
161 std::vector<RtpExtension> extensions; 154 std::vector<RtpExtension> extensions;
162 } rtp; 155 } rtp;
163 156
164 // Transport for outgoing packets (RTCP). 157 // Transport for outgoing packets (RTCP).
165 Transport* rtcp_send_transport = nullptr; 158 Transport* rtcp_send_transport = nullptr;
166 159
167 // Must not be 'nullptr' when the stream is started. 160 // Must not be 'nullptr' when the stream is started.
168 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr; 161 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr;
169 162
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0); 213 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0);
221 } 214 }
222 215
223 protected: 216 protected:
224 virtual ~VideoReceiveStream() {} 217 virtual ~VideoReceiveStream() {}
225 }; 218 };
226 219
227 } // namespace webrtc 220 } // namespace webrtc
228 221
229 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ 222 #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