| OLD | NEW |
| 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 | 182 |
| 183 rtc::CriticalSection receive_cs_; | 183 rtc::CriticalSection receive_cs_; |
| 184 bool receiving_ GUARDED_BY(receive_cs_); | 184 bool receiving_ GUARDED_BY(receive_cs_); |
| 185 uint8_t restored_packet_[IP_PACKET_SIZE] GUARDED_BY(receive_cs_); | 185 uint8_t restored_packet_[IP_PACKET_SIZE] GUARDED_BY(receive_cs_); |
| 186 bool restored_packet_in_use_ GUARDED_BY(receive_cs_); | 186 bool restored_packet_in_use_ GUARDED_BY(receive_cs_); |
| 187 int64_t last_packet_log_ms_ GUARDED_BY(receive_cs_); | 187 int64_t last_packet_log_ms_ GUARDED_BY(receive_cs_); |
| 188 | 188 |
| 189 const std::unique_ptr<RtpRtcp> rtp_rtcp_; | 189 const std::unique_ptr<RtpRtcp> rtp_rtcp_; |
| 190 | 190 |
| 191 // Members for the new jitter buffer experiment. | 191 // Members for the new jitter buffer experiment. |
| 192 bool jitter_buffer_experiment_; | |
| 193 video_coding::OnCompleteFrameCallback* complete_frame_callback_; | 192 video_coding::OnCompleteFrameCallback* complete_frame_callback_; |
| 194 KeyFrameRequestSender* keyframe_request_sender_; | 193 KeyFrameRequestSender* keyframe_request_sender_; |
| 195 VCMTiming* timing_; | 194 VCMTiming* timing_; |
| 196 std::unique_ptr<NackModule> nack_module_; | 195 std::unique_ptr<NackModule> nack_module_; |
| 197 rtc::scoped_refptr<video_coding::PacketBuffer> packet_buffer_; | 196 rtc::scoped_refptr<video_coding::PacketBuffer> packet_buffer_; |
| 198 std::unique_ptr<video_coding::RtpFrameReferenceFinder> reference_finder_; | 197 std::unique_ptr<video_coding::RtpFrameReferenceFinder> reference_finder_; |
| 199 rtc::CriticalSection last_seq_num_cs_; | 198 rtc::CriticalSection last_seq_num_cs_; |
| 200 std::map<uint16_t, uint16_t, DescendingSeqNumComp<uint16_t>> | 199 std::map<uint16_t, uint16_t, DescendingSeqNumComp<uint16_t>> |
| 201 last_seq_num_for_pic_id_ GUARDED_BY(last_seq_num_cs_); | 200 last_seq_num_for_pic_id_ GUARDED_BY(last_seq_num_cs_); |
| 202 video_coding::H264SpsPpsTracker tracker_; | 201 video_coding::H264SpsPpsTracker tracker_; |
| 203 // TODO(johan): Remove pt_codec_params_ once | 202 // TODO(johan): Remove pt_codec_params_ once |
| 204 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved. | 203 // 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. | 204 // 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_; | 205 std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_; |
| 207 int16_t last_payload_type_ = -1; | 206 int16_t last_payload_type_ = -1; |
| 208 }; | 207 }; |
| 209 | 208 |
| 210 } // namespace webrtc | 209 } // namespace webrtc |
| 211 | 210 |
| 212 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ | 211 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ |
| OLD | NEW |