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

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

Issue 2580843002: Change return type of CongestionController::pacer() method.
Patch Set: Revert addition of CongestionController::pacer_thread_. 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
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, 72 RtpPacketSender* paced_sender,
73 PacketRouter* packet_router, 73 PacketRouter* packet_router,
74 VieRemb* remb, 74 VieRemb* remb,
75 const VideoReceiveStream::Config* config, 75 const VideoReceiveStream::Config* config,
76 ReceiveStatisticsProxy* receive_stats_proxy, 76 ReceiveStatisticsProxy* receive_stats_proxy,
77 ProcessThread* process_thread, 77 ProcessThread* process_thread,
78 RateLimiter* retransmission_rate_limiter, 78 RateLimiter* retransmission_rate_limiter,
79 NackSender* nack_sender, 79 NackSender* nack_sender,
80 KeyFrameRequestSender* keyframe_request_sender, 80 KeyFrameRequestSender* keyframe_request_sender,
81 video_coding::OnCompleteFrameCallback* complete_frame_callback, 81 video_coding::OnCompleteFrameCallback* complete_frame_callback,
82 VCMTiming* timing); 82 VCMTiming* timing);
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 // TODO(johan): Remove pt_codec_params_ once 203 // TODO(johan): Remove pt_codec_params_ once
204 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved. 204 // 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. 205 // 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_; 206 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_;
207 int16_t last_payload_type_ = -1; 207 int16_t last_payload_type_ = -1;
208 }; 208 };
209 209
210 } // namespace webrtc 210 } // namespace webrtc
211 211
212 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 212 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/congestion_controller/include/congestion_controller.h ('k') | webrtc/video/rtp_stream_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698