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

Side by Side Diff: webrtc/call/video_receive_stream.h

Issue 3000273002: Reverse |rtx_payload_types| map, and rename. (Closed)
Patch Set: Rebased. Created 3 years, 3 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/call/rampup_tests.cc ('k') | webrtc/call/video_receive_stream.cc » ('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
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 // See UlpfecConfig for description. 162 // See UlpfecConfig for description.
163 UlpfecConfig ulpfec; 163 UlpfecConfig ulpfec;
164 164
165 // SSRC for retransmissions. 165 // SSRC for retransmissions.
166 uint32_t rtx_ssrc = 0; 166 uint32_t rtx_ssrc = 0;
167 167
168 // Set if the stream is protected using FlexFEC. 168 // Set if the stream is protected using FlexFEC.
169 bool protected_by_flexfec = false; 169 bool protected_by_flexfec = false;
170 170
171 // Map from video payload type (apt) -> RTX payload type (pt). 171 // Map from rtx payload type -> media payload type.
172 // For RTX to be enabled, both an SSRC and this mapping are needed. 172 // For RTX to be enabled, both an SSRC and this mapping are needed.
173 std::map<int, int> rtx_payload_types; 173 std::map<int, int> rtx_associated_payload_types;
174 // TODO(nisse): This is a temporary accessor function to enable 174 // TODO(nisse): This is a temporary accessor function to enable
175 // reversing and renaming of the rtx_payload_types mapping. 175 // reversing and renaming of the rtx_payload_types mapping.
176 void AddRtxBinding(int rtx_payload_type, int media_payload_type) { 176 void AddRtxBinding(int rtx_payload_type, int media_payload_type) {
177 rtx_payload_types[media_payload_type] = rtx_payload_type; 177 rtx_associated_payload_types[rtx_payload_type] = media_payload_type;
178 } 178 }
179
179 // RTP header extensions used for the received stream. 180 // RTP header extensions used for the received stream.
180 std::vector<RtpExtension> extensions; 181 std::vector<RtpExtension> extensions;
181 } rtp; 182 } rtp;
182 183
183 // Transport for outgoing packets (RTCP). 184 // Transport for outgoing packets (RTCP).
184 Transport* rtcp_send_transport = nullptr; 185 Transport* rtcp_send_transport = nullptr;
185 186
186 // Must not be 'nullptr' when the stream is started. 187 // Must not be 'nullptr' when the stream is started.
187 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr; 188 rtc::VideoSinkInterface<VideoFrame>* renderer = nullptr;
188 189
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 virtual void AddSecondarySink(RtpPacketSinkInterface* sink) = 0; 241 virtual void AddSecondarySink(RtpPacketSinkInterface* sink) = 0;
241 virtual void RemoveSecondarySink(const RtpPacketSinkInterface* sink) = 0; 242 virtual void RemoveSecondarySink(const RtpPacketSinkInterface* sink) = 0;
242 243
243 protected: 244 protected:
244 virtual ~VideoReceiveStream() {} 245 virtual ~VideoReceiveStream() {}
245 }; 246 };
246 247
247 } // namespace webrtc 248 } // namespace webrtc
248 249
249 #endif // WEBRTC_CALL_VIDEO_RECEIVE_STREAM_H_ 250 #endif // WEBRTC_CALL_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/call/rampup_tests.cc ('k') | webrtc/call/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698