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

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

Issue 3007303002: Revert of Use RtxReceiveStream. (Closed)
Patch Set: 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/rtx_receive_stream.cc ('k') | webrtc/media/engine/webrtcvideoengine.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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // See draft-alvestrand-rmcat-remb for information. 160 // See draft-alvestrand-rmcat-remb for information.
161 bool remb = false; 161 bool remb = false;
162 162
163 // See draft-holmer-rmcat-transport-wide-cc-extensions for details. 163 // See draft-holmer-rmcat-transport-wide-cc-extensions for details.
164 bool transport_cc = false; 164 bool transport_cc = false;
165 165
166 // See NackConfig for description. 166 // See NackConfig for description.
167 NackConfig nack; 167 NackConfig nack;
168 168
169 // See UlpfecConfig for description. 169 // See UlpfecConfig for description.
170 // TODO(nisse): UlpfecConfig includes the field red_rtx_payload_type,
171 // which duplicates info in the rtx_associated_payload_types mapping. So
172 // delete the use of UlpfecConfig here, and replace by the values which
173 // make sense in this context, likely those are ulpfec_payload_type_ and
174 // red_payload_type_.
175 UlpfecConfig ulpfec; 170 UlpfecConfig ulpfec;
176 171
177 // SSRC for retransmissions. 172 // SSRC for retransmissions.
178 uint32_t rtx_ssrc = 0; 173 uint32_t rtx_ssrc = 0;
179 174
180 // Set if the stream is protected using FlexFEC. 175 // Set if the stream is protected using FlexFEC.
181 bool protected_by_flexfec = false; 176 bool protected_by_flexfec = false;
182 177
183 // Map from rtx payload type -> media payload type. 178 // Map from rtx payload type -> media payload type.
184 // For RTX to be enabled, both an SSRC and this mapping are needed. 179 // For RTX to be enabled, both an SSRC and this mapping are needed.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 virtual void AddSecondarySink(RtpPacketSinkInterface* sink) = 0; 246 virtual void AddSecondarySink(RtpPacketSinkInterface* sink) = 0;
252 virtual void RemoveSecondarySink(const RtpPacketSinkInterface* sink) = 0; 247 virtual void RemoveSecondarySink(const RtpPacketSinkInterface* sink) = 0;
253 248
254 protected: 249 protected:
255 virtual ~VideoReceiveStream() {} 250 virtual ~VideoReceiveStream() {}
256 }; 251 };
257 252
258 } // namespace webrtc 253 } // namespace webrtc
259 254
260 #endif // WEBRTC_CALL_VIDEO_RECEIVE_STREAM_H_ 255 #endif // WEBRTC_CALL_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/call/rtx_receive_stream.cc ('k') | webrtc/media/engine/webrtcvideoengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698