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

Side by Side Diff: webrtc/video/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/call/call.cc ('k') | webrtc/video/video_send_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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 VideoSendStream(int num_cpu_cores, 50 VideoSendStream(int num_cpu_cores,
51 ProcessThread* module_process_thread, 51 ProcessThread* module_process_thread,
52 rtc::TaskQueue* worker_queue, 52 rtc::TaskQueue* worker_queue,
53 CallStats* call_stats, 53 CallStats* call_stats,
54 RtpTransportControllerSendInterface* transport, 54 RtpTransportControllerSendInterface* transport,
55 BitrateAllocator* bitrate_allocator, 55 BitrateAllocator* bitrate_allocator,
56 SendDelayStats* send_delay_stats, 56 SendDelayStats* send_delay_stats,
57 RtcEventLog* event_log, 57 RtcEventLog* event_log,
58 VideoSendStream::Config config, 58 VideoSendStream::Config config,
59 VideoEncoderConfig encoder_config, 59 VideoEncoderConfig encoder_config,
60 const std::map<uint32_t, RtpState>& suspended_ssrcs); 60 const std::map<uint32_t, RtpState>& suspended_ssrcs,
61 const RtpKeepAliveConfig& keepalive_config);
61 62
62 ~VideoSendStream() override; 63 ~VideoSendStream() override;
63 64
64 void SignalNetworkState(NetworkState state); 65 void SignalNetworkState(NetworkState state);
65 bool DeliverRtcp(const uint8_t* packet, size_t length); 66 bool DeliverRtcp(const uint8_t* packet, size_t length);
66 67
67 // webrtc::VideoSendStream implementation. 68 // webrtc::VideoSendStream implementation.
68 void Start() override; 69 void Start() override;
69 void Stop() override; 70 void Stop() override;
70 71
(...skipping 30 matching lines...) Expand all
101 const VideoSendStream::Config config_; 102 const VideoSendStream::Config config_;
102 const VideoEncoderConfig::ContentType content_type_; 103 const VideoEncoderConfig::ContentType content_type_;
103 std::unique_ptr<VideoSendStreamImpl> send_stream_; 104 std::unique_ptr<VideoSendStreamImpl> send_stream_;
104 std::unique_ptr<ViEEncoder> vie_encoder_; 105 std::unique_ptr<ViEEncoder> vie_encoder_;
105 }; 106 };
106 107
107 } // namespace internal 108 } // namespace internal
108 } // namespace webrtc 109 } // namespace webrtc
109 110
110 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 111 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/call/call.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698