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

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

Issue 2669463006: Move RemoteBitrateEstimator::RemoveStream calls from receive streams to Call. (Closed)
Patch Set: Rebase. Created 3 years, 10 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/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 23 matching lines...) Expand all
34 #include "webrtc/video_receive_stream.h" 34 #include "webrtc/video_receive_stream.h"
35 35
36 namespace webrtc { 36 namespace webrtc {
37 37
38 class NackModule; 38 class NackModule;
39 class PacedSender; 39 class PacedSender;
40 class PacketRouter; 40 class PacketRouter;
41 class ProcessThread; 41 class ProcessThread;
42 class ReceiveStatistics; 42 class ReceiveStatistics;
43 class ReceiveStatisticsProxy; 43 class ReceiveStatisticsProxy;
44 class RemoteBitrateEstimator;
45 class RemoteNtpTimeEstimator; 44 class RemoteNtpTimeEstimator;
46 class RtcpRttStats; 45 class RtcpRttStats;
47 class RtpHeaderParser; 46 class RtpHeaderParser;
48 class RTPPayloadRegistry; 47 class RTPPayloadRegistry;
49 class RtpReceiver; 48 class RtpReceiver;
50 class Transport; 49 class Transport;
51 class UlpfecReceiver; 50 class UlpfecReceiver;
52 class VCMTiming; 51 class VCMTiming;
53 class VieRemb; 52 class VieRemb;
54 53
55 namespace vcm { 54 namespace vcm {
56 class VideoReceiver; 55 class VideoReceiver;
57 } // namespace vcm 56 } // namespace vcm
58 57
59 class RtpStreamReceiver : public RtpData, 58 class RtpStreamReceiver : public RtpData,
60 public RtpFeedback, 59 public RtpFeedback,
61 public VCMFrameTypeCallback, 60 public VCMFrameTypeCallback,
62 public VCMPacketRequestCallback, 61 public VCMPacketRequestCallback,
63 public video_coding::OnReceivedFrameCallback, 62 public video_coding::OnReceivedFrameCallback,
64 public video_coding::OnCompleteFrameCallback, 63 public video_coding::OnCompleteFrameCallback,
65 public CallStatsObserver { 64 public CallStatsObserver {
66 public: 65 public:
67 RtpStreamReceiver( 66 RtpStreamReceiver(
68 RemoteBitrateEstimator* remote_bitrate_estimator,
69 Transport* transport, 67 Transport* transport,
70 RtcpRttStats* rtt_stats, 68 RtcpRttStats* rtt_stats,
71 PacketRouter* packet_router, 69 PacketRouter* packet_router,
72 VieRemb* remb, 70 VieRemb* remb,
73 const VideoReceiveStream::Config* config, 71 const VideoReceiveStream::Config* config,
74 ReceiveStatisticsProxy* receive_stats_proxy, 72 ReceiveStatisticsProxy* receive_stats_proxy,
75 ProcessThread* process_thread, 73 ProcessThread* process_thread,
76 NackSender* nack_sender, 74 NackSender* nack_sender,
77 KeyFrameRequestSender* keyframe_request_sender, 75 KeyFrameRequestSender* keyframe_request_sender,
78 video_coding::OnCompleteFrameCallback* complete_frame_callback, 76 video_coding::OnCompleteFrameCallback* complete_frame_callback,
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 bool IsPacketInOrder(const RTPHeader& header) const; 152 bool IsPacketInOrder(const RTPHeader& header) const;
155 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const; 153 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
156 void UpdateHistograms(); 154 void UpdateHistograms();
157 void EnableReceiveRtpHeaderExtension(const std::string& extension, int id); 155 void EnableReceiveRtpHeaderExtension(const std::string& extension, int id);
158 bool IsRedEnabled() const; 156 bool IsRedEnabled() const;
159 void InsertSpsPpsIntoTracker(uint8_t payload_type); 157 void InsertSpsPpsIntoTracker(uint8_t payload_type);
160 158
161 Clock* const clock_; 159 Clock* const clock_;
162 // Ownership of this object lies with VideoReceiveStream, which owns |this|. 160 // Ownership of this object lies with VideoReceiveStream, which owns |this|.
163 const VideoReceiveStream::Config& config_; 161 const VideoReceiveStream::Config& config_;
164 RemoteBitrateEstimator* const remote_bitrate_estimator_;
165 PacketRouter* const packet_router_; 162 PacketRouter* const packet_router_;
166 VieRemb* const remb_; 163 VieRemb* const remb_;
167 ProcessThread* const process_thread_; 164 ProcessThread* const process_thread_;
168 165
169 RemoteNtpTimeEstimator ntp_estimator_; 166 RemoteNtpTimeEstimator ntp_estimator_;
170 RTPPayloadRegistry rtp_payload_registry_; 167 RTPPayloadRegistry rtp_payload_registry_;
171 168
172 const std::unique_ptr<RtpHeaderParser> rtp_header_parser_; 169 const std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
173 const std::unique_ptr<RtpReceiver> rtp_receiver_; 170 const std::unique_ptr<RtpReceiver> rtp_receiver_;
174 const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_; 171 const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
(...skipping 21 matching lines...) Expand all
196 // TODO(johan): Remove pt_codec_params_ once 193 // TODO(johan): Remove pt_codec_params_ once
197 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved. 194 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved.
198 // Maps a payload type to a map of out-of-band supplied codec parameters. 195 // Maps a payload type to a map of out-of-band supplied codec parameters.
199 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_; 196 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_;
200 int16_t last_payload_type_ = -1; 197 int16_t last_payload_type_ = -1;
201 }; 198 };
202 199
203 } // namespace webrtc 200 } // namespace webrtc
204 201
205 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 202 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
OLDNEW
« no previous file with comments | « webrtc/call/call.cc ('k') | webrtc/video/rtp_stream_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698