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

Side by Side Diff: webrtc/video/rtp_stream_receiver.h

Issue 2639423007: Drop pacer and retransmission_rate_limiter from RtpStreamReceiver constructor. (Closed)
Patch Set: Rebased. Created 3 years, 11 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 | webrtc/video/rtp_stream_receiver.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 public VCMPacketRequestCallback, 62 public VCMPacketRequestCallback,
63 public video_coding::OnReceivedFrameCallback, 63 public video_coding::OnReceivedFrameCallback,
64 public video_coding::OnCompleteFrameCallback, 64 public video_coding::OnCompleteFrameCallback,
65 public CallStatsObserver { 65 public CallStatsObserver {
66 public: 66 public:
67 RtpStreamReceiver( 67 RtpStreamReceiver(
68 vcm::VideoReceiver* video_receiver, 68 vcm::VideoReceiver* video_receiver,
69 RemoteBitrateEstimator* remote_bitrate_estimator, 69 RemoteBitrateEstimator* remote_bitrate_estimator,
70 Transport* transport, 70 Transport* transport,
71 RtcpRttStats* rtt_stats, 71 RtcpRttStats* rtt_stats,
72 PacedSender* paced_sender,
73 PacketRouter* packet_router, 72 PacketRouter* packet_router,
74 VieRemb* remb, 73 VieRemb* remb,
75 const VideoReceiveStream::Config* config, 74 const VideoReceiveStream::Config* config,
76 ReceiveStatisticsProxy* receive_stats_proxy, 75 ReceiveStatisticsProxy* receive_stats_proxy,
77 ProcessThread* process_thread, 76 ProcessThread* process_thread,
78 RateLimiter* retransmission_rate_limiter,
79 NackSender* nack_sender, 77 NackSender* nack_sender,
80 KeyFrameRequestSender* keyframe_request_sender, 78 KeyFrameRequestSender* keyframe_request_sender,
81 video_coding::OnCompleteFrameCallback* complete_frame_callback, 79 video_coding::OnCompleteFrameCallback* complete_frame_callback,
82 VCMTiming* timing); 80 VCMTiming* timing);
83 ~RtpStreamReceiver(); 81 ~RtpStreamReceiver();
84 82
85 bool AddReceiveCodec(const VideoCodec& video_codec, 83 bool AddReceiveCodec(const VideoCodec& video_codec,
86 const std::map<std::string, std::string>& codec_params); 84 const std::map<std::string, std::string>& codec_params);
87 85
88 bool AddReceiveCodec(const VideoCodec& video_codec); 86 bool AddReceiveCodec(const VideoCodec& video_codec);
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 // TODO(johan): Remove pt_codec_params_ once 201 // TODO(johan): Remove pt_codec_params_ once
204 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved. 202 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved.
205 // Maps a payload type to a map of out-of-band supplied codec parameters. 203 // Maps a payload type to a map of out-of-band supplied codec parameters.
206 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_; 204 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_;
207 int16_t last_payload_type_ = -1; 205 int16_t last_payload_type_ = -1;
208 }; 206 };
209 207
210 } // namespace webrtc 208 } // namespace webrtc
211 209
212 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 210 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/rtp_stream_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698