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

Side by Side Diff: webrtc/video_send_stream.h

Issue 2978503002: Move RTP keep-alive config from VideoSendStream::Config to Call::Config (Closed)
Patch Set: Typo in comment Created 3 years, 5 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/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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // details. 161 // details.
162 struct Rtx { 162 struct Rtx {
163 std::string ToString() const; 163 std::string ToString() const;
164 // SSRCs to use for the RTX streams. 164 // SSRCs to use for the RTX streams.
165 std::vector<uint32_t> ssrcs; 165 std::vector<uint32_t> ssrcs;
166 166
167 // Payload type to use for the RTX stream. 167 // Payload type to use for the RTX stream.
168 int payload_type = -1; 168 int payload_type = -1;
169 } rtx; 169 } rtx;
170 170
171 RtpKeepAliveConfig keep_alive;
172
173 // RTCP CNAME, see RFC 3550. 171 // RTCP CNAME, see RFC 3550.
174 std::string c_name; 172 std::string c_name;
175 } rtp; 173 } rtp;
176 174
177 // Transport for outgoing packets. 175 // Transport for outgoing packets.
178 Transport* send_transport = nullptr; 176 Transport* send_transport = nullptr;
179 177
180 // Called for each I420 frame before encoding the frame. Can be used for 178 // Called for each I420 frame before encoding the frame. Can be used for
181 // effects, snapshots etc. 'nullptr' disables the callback. 179 // effects, snapshots etc. 'nullptr' disables the callback.
182 rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback = nullptr; 180 rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback = nullptr;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 EnableEncodedFrameRecording(std::vector<rtc::PlatformFile>(), 0); 259 EnableEncodedFrameRecording(std::vector<rtc::PlatformFile>(), 0);
262 } 260 }
263 261
264 protected: 262 protected:
265 virtual ~VideoSendStream() {} 263 virtual ~VideoSendStream() {}
266 }; 264 };
267 265
268 } // namespace webrtc 266 } // namespace webrtc
269 267
270 #endif // WEBRTC_VIDEO_SEND_STREAM_H_ 268 #endif // WEBRTC_VIDEO_SEND_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