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

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

Issue 2469093003: Remove RED/RTX workaround from sender/receiver and VideoEngine2. (Closed)
Patch Set: Fix warning message. Created 4 years, 1 month 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/modules/rtp_rtcp/source/rtp_sender.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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // Parses and handles for instance RTX and RED headers. 119 // Parses and handles for instance RTX and RED headers.
120 // This function assumes that it's being called from only one thread. 120 // This function assumes that it's being called from only one thread.
121 bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet, 121 bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
122 size_t packet_length, 122 size_t packet_length,
123 const RTPHeader& header); 123 const RTPHeader& header);
124 void NotifyReceiverOfFecPacket(const RTPHeader& header); 124 void NotifyReceiverOfFecPacket(const RTPHeader& header);
125 bool IsPacketInOrder(const RTPHeader& header) const; 125 bool IsPacketInOrder(const RTPHeader& header) const;
126 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const; 126 bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
127 void UpdateHistograms(); 127 void UpdateHistograms();
128 void EnableReceiveRtpHeaderExtension(const std::string& extension, int id); 128 void EnableReceiveRtpHeaderExtension(const std::string& extension, int id);
129 bool IsRedEnabled() const;
129 130
130 Clock* const clock_; 131 Clock* const clock_;
131 // Ownership of this object lies with VideoReceiveStream, which owns |this|. 132 // Ownership of this object lies with VideoReceiveStream, which owns |this|.
132 const VideoReceiveStream::Config& config_; 133 const VideoReceiveStream::Config& config_;
133 vcm::VideoReceiver* const video_receiver_; 134 vcm::VideoReceiver* const video_receiver_;
134 RemoteBitrateEstimator* const remote_bitrate_estimator_; 135 RemoteBitrateEstimator* const remote_bitrate_estimator_;
135 PacketRouter* const packet_router_; 136 PacketRouter* const packet_router_;
136 VieRemb* const remb_; 137 VieRemb* const remb_;
137 ProcessThread* const process_thread_; 138 ProcessThread* const process_thread_;
138 139
(...skipping 10 matching lines...) Expand all
149 uint8_t restored_packet_[IP_PACKET_SIZE] GUARDED_BY(receive_cs_); 150 uint8_t restored_packet_[IP_PACKET_SIZE] GUARDED_BY(receive_cs_);
150 bool restored_packet_in_use_ GUARDED_BY(receive_cs_); 151 bool restored_packet_in_use_ GUARDED_BY(receive_cs_);
151 int64_t last_packet_log_ms_ GUARDED_BY(receive_cs_); 152 int64_t last_packet_log_ms_ GUARDED_BY(receive_cs_);
152 153
153 const std::unique_ptr<RtpRtcp> rtp_rtcp_; 154 const std::unique_ptr<RtpRtcp> rtp_rtcp_;
154 }; 155 };
155 156
156 } // namespace webrtc 157 } // namespace webrtc
157 158
158 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 159 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender.cc ('k') | webrtc/video/rtp_stream_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698