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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h

Issue 1335353005: Remove channel ids from various interfaces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 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
OLDNEW
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 "webrtc/base/scoped_ptr.h" 14 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h" 15 #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h"
16 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" 16 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
17 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" 17 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
18 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 18 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
19 #include "webrtc/typedefs.h" 19 #include "webrtc/typedefs.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 class RtpReceiverImpl : public RtpReceiver { 23 class RtpReceiverImpl : public RtpReceiver {
24 public: 24 public:
25 // 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
26 // want callbacks to do nothing). This class takes ownership of the media 26 // want callbacks to do nothing). This class takes ownership of the media
27 // receiver but nothing else. 27 // receiver but nothing else.
28 RtpReceiverImpl(int32_t id, 28 RtpReceiverImpl(Clock* clock,
29 Clock* clock,
30 RtpAudioFeedback* incoming_audio_messages_callback, 29 RtpAudioFeedback* incoming_audio_messages_callback,
31 RtpFeedback* incoming_messages_callback, 30 RtpFeedback* incoming_messages_callback,
32 RTPPayloadRegistry* rtp_payload_registry, 31 RTPPayloadRegistry* rtp_payload_registry,
33 RTPReceiverStrategy* rtp_media_receiver); 32 RTPReceiverStrategy* rtp_media_receiver);
34 33
35 virtual ~RtpReceiverImpl(); 34 virtual ~RtpReceiverImpl();
36 35
37 int32_t RegisterReceivePayload(const char payload_name[RTP_PAYLOAD_NAME_SIZE], 36 int32_t RegisterReceivePayload(const char payload_name[RTP_PAYLOAD_NAME_SIZE],
38 const int8_t payload_type, 37 const int8_t payload_type,
39 const uint32_t frequency, 38 const uint32_t frequency,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 void CheckCSRC(const WebRtcRTPHeader& rtp_header); 71 void CheckCSRC(const WebRtcRTPHeader& rtp_header);
73 int32_t CheckPayloadChanged(const RTPHeader& rtp_header, 72 int32_t CheckPayloadChanged(const RTPHeader& rtp_header,
74 const int8_t first_payload_byte, 73 const int8_t first_payload_byte,
75 bool& is_red, 74 bool& is_red,
76 PayloadUnion* payload); 75 PayloadUnion* payload);
77 76
78 Clock* clock_; 77 Clock* clock_;
79 RTPPayloadRegistry* rtp_payload_registry_; 78 RTPPayloadRegistry* rtp_payload_registry_;
80 rtc::scoped_ptr<RTPReceiverStrategy> rtp_media_receiver_; 79 rtc::scoped_ptr<RTPReceiverStrategy> rtp_media_receiver_;
81 80
82 int32_t id_;
83
84 RtpFeedback* cb_rtp_feedback_; 81 RtpFeedback* cb_rtp_feedback_;
85 82
86 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtp_receiver_; 83 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtp_receiver_;
87 int64_t last_receive_time_; 84 int64_t last_receive_time_;
88 size_t last_received_payload_length_; 85 size_t last_received_payload_length_;
89 86
90 // SSRCs. 87 // SSRCs.
91 uint32_t ssrc_; 88 uint32_t ssrc_;
92 uint8_t num_csrcs_; 89 uint8_t num_csrcs_;
93 uint32_t current_remote_csrc_[kRtpCsrcSize]; 90 uint32_t current_remote_csrc_[kRtpCsrcSize];
94 91
95 uint32_t last_received_timestamp_; 92 uint32_t last_received_timestamp_;
96 int64_t last_received_frame_time_ms_; 93 int64_t last_received_frame_time_ms_;
97 uint16_t last_received_sequence_number_; 94 uint16_t last_received_sequence_number_;
98 95
99 NACKMethod nack_method_; 96 NACKMethod nack_method_;
100 }; 97 };
101 } // namespace webrtc 98 } // namespace webrtc
102 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ 99 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698