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 |
11 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h" | 11 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h" |
12 | 12 |
13 #include <assert.h> | 13 #include <assert.h> |
14 #include <math.h> | 14 #include <math.h> |
15 #include <stdlib.h> | 15 #include <stdlib.h> |
16 #include <string.h> | 16 #include <string.h> |
17 | 17 |
18 #include "webrtc/base/logging.h" | 18 #include "webrtc/base/logging.h" |
hlundin-webrtc
2016/03/31 18:22:47
Can you remove any of these includes now that RtpA
| |
19 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" | 19 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" |
20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
21 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" | 21 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" |
22 | 22 |
23 namespace webrtc { | 23 namespace webrtc { |
24 | 24 |
25 using RtpUtility::Payload; | 25 using RtpUtility::Payload; |
26 | 26 |
27 RtpReceiver* RtpReceiver::CreateVideoReceiver( | 27 RtpReceiver* RtpReceiver::CreateVideoReceiver( |
28 Clock* clock, | 28 Clock* clock, |
(...skipping 16 matching lines...) Expand all Loading... | |
45 RTPPayloadRegistry* rtp_payload_registry) { | 45 RTPPayloadRegistry* rtp_payload_registry) { |
46 if (!incoming_payload_callback) | 46 if (!incoming_payload_callback) |
47 incoming_payload_callback = NullObjectRtpData(); | 47 incoming_payload_callback = NullObjectRtpData(); |
48 if (!incoming_messages_callback) | 48 if (!incoming_messages_callback) |
49 incoming_messages_callback = NullObjectRtpFeedback(); | 49 incoming_messages_callback = NullObjectRtpFeedback(); |
50 return new RtpReceiverImpl( | 50 return new RtpReceiverImpl( |
51 clock, incoming_messages_callback, rtp_payload_registry, | 51 clock, incoming_messages_callback, rtp_payload_registry, |
52 RTPReceiverStrategy::CreateAudioStrategy(incoming_payload_callback)); | 52 RTPReceiverStrategy::CreateAudioStrategy(incoming_payload_callback)); |
53 } | 53 } |
54 | 54 |
55 // TODO(solenberg): Remove, after updating downstream code. | |
56 RtpReceiver* RtpReceiver::CreateAudioReceiver( | |
57 Clock* clock, | |
58 RtpAudioFeedback* incoming_audio_feedback, | |
59 RtpData* incoming_payload_callback, | |
60 RtpFeedback* incoming_messages_callback, | |
61 RTPPayloadRegistry* rtp_payload_registry) { | |
62 return CreateAudioReceiver(clock, | |
63 incoming_payload_callback, | |
64 incoming_messages_callback, | |
65 rtp_payload_registry); | |
66 } | |
67 | |
68 RtpReceiverImpl::RtpReceiverImpl( | 55 RtpReceiverImpl::RtpReceiverImpl( |
69 Clock* clock, | 56 Clock* clock, |
70 RtpFeedback* incoming_messages_callback, | 57 RtpFeedback* incoming_messages_callback, |
71 RTPPayloadRegistry* rtp_payload_registry, | 58 RTPPayloadRegistry* rtp_payload_registry, |
72 RTPReceiverStrategy* rtp_media_receiver) | 59 RTPReceiverStrategy* rtp_media_receiver) |
73 : clock_(clock), | 60 : clock_(clock), |
74 rtp_payload_registry_(rtp_payload_registry), | 61 rtp_payload_registry_(rtp_payload_registry), |
75 rtp_media_receiver_(rtp_media_receiver), | 62 rtp_media_receiver_(rtp_media_receiver), |
76 cb_rtp_feedback_(incoming_messages_callback), | 63 cb_rtp_feedback_(incoming_messages_callback), |
77 critical_section_rtp_receiver_( | 64 critical_section_rtp_receiver_( |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
483 // implementations might have CSRC 0 as a valid value. | 470 // implementations might have CSRC 0 as a valid value. |
484 if (num_csrcs_diff > 0) { | 471 if (num_csrcs_diff > 0) { |
485 cb_rtp_feedback_->OnIncomingCSRCChanged(0, true); | 472 cb_rtp_feedback_->OnIncomingCSRCChanged(0, true); |
486 } else if (num_csrcs_diff < 0) { | 473 } else if (num_csrcs_diff < 0) { |
487 cb_rtp_feedback_->OnIncomingCSRCChanged(0, false); | 474 cb_rtp_feedback_->OnIncomingCSRCChanged(0, false); |
488 } | 475 } |
489 } | 476 } |
490 } | 477 } |
491 | 478 |
492 } // namespace webrtc | 479 } // namespace webrtc |
OLD | NEW |