| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2013 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 | 
| 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ | 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ | 
| 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ | 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ | 
| 13 | 13 | 
| 14 #include <memory> |  | 
| 15 |  | 
| 16 #include "webrtc/base/criticalsection.h" | 14 #include "webrtc/base/criticalsection.h" | 
|  | 15 #include "webrtc/base/scoped_ptr.h" | 
| 17 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" | 16 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" | 
| 18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 
| 19 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" | 18 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" | 
| 20 #include "webrtc/typedefs.h" | 19 #include "webrtc/typedefs.h" | 
| 21 | 20 | 
| 22 namespace webrtc { | 21 namespace webrtc { | 
| 23 | 22 | 
| 24 class RtpReceiverImpl : public RtpReceiver { | 23 class RtpReceiverImpl : public RtpReceiver { | 
| 25  public: | 24  public: | 
| 26   // Callbacks passed in here may not be NULL (use Null Object callbacks if you | 25   // Callbacks passed in here may not be NULL (use Null Object callbacks if you | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 69 | 68 | 
| 70   void CheckSSRCChanged(const RTPHeader& rtp_header); | 69   void CheckSSRCChanged(const RTPHeader& rtp_header); | 
| 71   void CheckCSRC(const WebRtcRTPHeader& rtp_header); | 70   void CheckCSRC(const WebRtcRTPHeader& rtp_header); | 
| 72   int32_t CheckPayloadChanged(const RTPHeader& rtp_header, | 71   int32_t CheckPayloadChanged(const RTPHeader& rtp_header, | 
| 73                               const int8_t first_payload_byte, | 72                               const int8_t first_payload_byte, | 
| 74                               bool* is_red, | 73                               bool* is_red, | 
| 75                               PayloadUnion* payload); | 74                               PayloadUnion* payload); | 
| 76 | 75 | 
| 77   Clock* clock_; | 76   Clock* clock_; | 
| 78   RTPPayloadRegistry* rtp_payload_registry_; | 77   RTPPayloadRegistry* rtp_payload_registry_; | 
| 79   std::unique_ptr<RTPReceiverStrategy> rtp_media_receiver_; | 78   rtc::scoped_ptr<RTPReceiverStrategy> rtp_media_receiver_; | 
| 80 | 79 | 
| 81   RtpFeedback* cb_rtp_feedback_; | 80   RtpFeedback* cb_rtp_feedback_; | 
| 82 | 81 | 
| 83   rtc::CriticalSection critical_section_rtp_receiver_; | 82   rtc::CriticalSection critical_section_rtp_receiver_; | 
| 84   int64_t last_receive_time_; | 83   int64_t last_receive_time_; | 
| 85   size_t last_received_payload_length_; | 84   size_t last_received_payload_length_; | 
| 86 | 85 | 
| 87   // SSRCs. | 86   // SSRCs. | 
| 88   uint32_t ssrc_; | 87   uint32_t ssrc_; | 
| 89   uint8_t num_csrcs_; | 88   uint8_t num_csrcs_; | 
| 90   uint32_t current_remote_csrc_[kRtpCsrcSize]; | 89   uint32_t current_remote_csrc_[kRtpCsrcSize]; | 
| 91 | 90 | 
| 92   uint32_t last_received_timestamp_; | 91   uint32_t last_received_timestamp_; | 
| 93   int64_t last_received_frame_time_ms_; | 92   int64_t last_received_frame_time_ms_; | 
| 94   uint16_t last_received_sequence_number_; | 93   uint16_t last_received_sequence_number_; | 
| 95 | 94 | 
| 96   NACKMethod nack_method_; | 95   NACKMethod nack_method_; | 
| 97 }; | 96 }; | 
| 98 }  // namespace webrtc | 97 }  // namespace webrtc | 
| 99 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ | 98 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ | 
| OLD | NEW | 
|---|