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

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

Issue 2789843002: Delete VieRemb class, move functionality to PacketRouter. (Closed)
Patch Set: Delete obsolete suppression for PacketRouterTest.SendTransportFeedback. Created 3 years, 8 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/BUILD.gn ('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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 class ReceiveStatisticsProxy; 43 class ReceiveStatisticsProxy;
44 class RemoteNtpTimeEstimator; 44 class RemoteNtpTimeEstimator;
45 class RtcpRttStats; 45 class RtcpRttStats;
46 class RtpHeaderParser; 46 class RtpHeaderParser;
47 class RtpPacketReceived; 47 class RtpPacketReceived;
48 class RTPPayloadRegistry; 48 class RTPPayloadRegistry;
49 class RtpReceiver; 49 class RtpReceiver;
50 class Transport; 50 class Transport;
51 class UlpfecReceiver; 51 class UlpfecReceiver;
52 class VCMTiming; 52 class VCMTiming;
53 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 Transport* transport, 67 Transport* transport,
69 RtcpRttStats* rtt_stats, 68 RtcpRttStats* rtt_stats,
70 PacketRouter* packet_router, 69 PacketRouter* packet_router,
71 VieRemb* remb,
72 const VideoReceiveStream::Config* config, 70 const VideoReceiveStream::Config* config,
73 ReceiveStatisticsProxy* receive_stats_proxy, 71 ReceiveStatisticsProxy* receive_stats_proxy,
74 ProcessThread* process_thread, 72 ProcessThread* process_thread,
75 NackSender* nack_sender, 73 NackSender* nack_sender,
76 KeyFrameRequestSender* keyframe_request_sender, 74 KeyFrameRequestSender* keyframe_request_sender,
77 video_coding::OnCompleteFrameCallback* complete_frame_callback, 75 video_coding::OnCompleteFrameCallback* complete_frame_callback,
78 VCMTiming* timing); 76 VCMTiming* timing);
79 ~RtpStreamReceiver(); 77 ~RtpStreamReceiver();
80 78
81 bool AddReceiveCodec(const VideoCodec& video_codec, 79 bool AddReceiveCodec(const VideoCodec& video_codec,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const; 151 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
154 void UpdateHistograms(); 152 void UpdateHistograms();
155 void EnableReceiveRtpHeaderExtension(const std::string& extension, int id); 153 void EnableReceiveRtpHeaderExtension(const std::string& extension, int id);
156 bool IsRedEnabled() const; 154 bool IsRedEnabled() const;
157 void InsertSpsPpsIntoTracker(uint8_t payload_type); 155 void InsertSpsPpsIntoTracker(uint8_t payload_type);
158 156
159 Clock* const clock_; 157 Clock* const clock_;
160 // Ownership of this object lies with VideoReceiveStream, which owns |this|. 158 // Ownership of this object lies with VideoReceiveStream, which owns |this|.
161 const VideoReceiveStream::Config& config_; 159 const VideoReceiveStream::Config& config_;
162 PacketRouter* const packet_router_; 160 PacketRouter* const packet_router_;
163 VieRemb* const remb_;
164 ProcessThread* const process_thread_; 161 ProcessThread* const process_thread_;
165 162
166 RemoteNtpTimeEstimator ntp_estimator_; 163 RemoteNtpTimeEstimator ntp_estimator_;
167 RTPPayloadRegistry rtp_payload_registry_; 164 RTPPayloadRegistry rtp_payload_registry_;
168 165
169 const std::unique_ptr<RtpHeaderParser> rtp_header_parser_; 166 const std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
170 const std::unique_ptr<RtpReceiver> rtp_receiver_; 167 const std::unique_ptr<RtpReceiver> rtp_receiver_;
171 const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_; 168 const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
172 std::unique_ptr<UlpfecReceiver> ulpfec_receiver_; 169 std::unique_ptr<UlpfecReceiver> ulpfec_receiver_;
173 170
(...skipping 19 matching lines...) Expand all
193 // TODO(johan): Remove pt_codec_params_ once 190 // TODO(johan): Remove pt_codec_params_ once
194 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved. 191 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved.
195 // Maps a payload type to a map of out-of-band supplied codec parameters. 192 // Maps a payload type to a map of out-of-band supplied codec parameters.
196 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_; 193 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_;
197 int16_t last_payload_type_ = -1; 194 int16_t last_payload_type_ = -1;
198 }; 195 };
199 196
200 } // namespace webrtc 197 } // namespace webrtc
201 198
202 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 199 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
OLDNEW
« no previous file with comments | « webrtc/video/BUILD.gn ('k') | webrtc/video/rtp_stream_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698