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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 configuration.intra_frame_callback = nullptr; | 56 configuration.intra_frame_callback = nullptr; |
57 configuration.rtt_stats = rtt_stats; | 57 configuration.rtt_stats = rtt_stats; |
58 configuration.rtcp_packet_type_counter_observer = | 58 configuration.rtcp_packet_type_counter_observer = |
59 rtcp_packet_type_counter_observer; | 59 rtcp_packet_type_counter_observer; |
60 configuration.paced_sender = paced_sender; | 60 configuration.paced_sender = paced_sender; |
61 configuration.transport_sequence_number_allocator = | 61 configuration.transport_sequence_number_allocator = |
62 transport_sequence_number_allocator; | 62 transport_sequence_number_allocator; |
63 configuration.send_bitrate_observer = nullptr; | 63 configuration.send_bitrate_observer = nullptr; |
64 configuration.send_frame_count_observer = nullptr; | 64 configuration.send_frame_count_observer = nullptr; |
65 configuration.send_side_delay_observer = nullptr; | 65 configuration.send_side_delay_observer = nullptr; |
| 66 configuration.send_packet_observer = nullptr; |
66 configuration.bandwidth_callback = nullptr; | 67 configuration.bandwidth_callback = nullptr; |
67 configuration.transport_feedback_callback = nullptr; | 68 configuration.transport_feedback_callback = nullptr; |
68 | 69 |
69 std::unique_ptr<RtpRtcp> rtp_rtcp(RtpRtcp::CreateRtpRtcp(configuration)); | 70 std::unique_ptr<RtpRtcp> rtp_rtcp(RtpRtcp::CreateRtpRtcp(configuration)); |
70 rtp_rtcp->SetSendingStatus(false); | 71 rtp_rtcp->SetSendingStatus(false); |
71 rtp_rtcp->SetSendingMediaStatus(false); | 72 rtp_rtcp->SetSendingMediaStatus(false); |
72 rtp_rtcp->SetRTCPStatus(RtcpMode::kCompound); | 73 rtp_rtcp->SetRTCPStatus(RtcpMode::kCompound); |
73 | 74 |
74 return rtp_rtcp; | 75 return rtp_rtcp; |
75 } | 76 } |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 rtc::CritScope lock(&crit_); | 356 rtc::CritScope lock(&crit_); |
356 receive_stats_callback_ = receive_statistics_proxy; | 357 receive_stats_callback_ = receive_statistics_proxy; |
357 } | 358 } |
358 | 359 |
359 void ViEChannel::SetIncomingVideoStream( | 360 void ViEChannel::SetIncomingVideoStream( |
360 IncomingVideoStream* incoming_video_stream) { | 361 IncomingVideoStream* incoming_video_stream) { |
361 rtc::CritScope lock(&crit_); | 362 rtc::CritScope lock(&crit_); |
362 incoming_video_stream_ = incoming_video_stream; | 363 incoming_video_stream_ = incoming_video_stream; |
363 } | 364 } |
364 } // namespace webrtc | 365 } // namespace webrtc |
OLD | NEW |