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/video_engine/vie_channel.h" | 11 #include "webrtc/video_engine/vie_channel.h" |
12 | 12 |
13 #include <algorithm> | 13 #include <algorithm> |
| 14 #include <map> |
14 #include <vector> | 15 #include <vector> |
15 | 16 |
16 #include "webrtc/base/checks.h" | 17 #include "webrtc/base/checks.h" |
17 #include "webrtc/base/logging.h" | 18 #include "webrtc/base/logging.h" |
18 #include "webrtc/base/platform_thread.h" | 19 #include "webrtc/base/platform_thread.h" |
19 #include "webrtc/common.h" | 20 #include "webrtc/common.h" |
20 #include "webrtc/common_video/include/incoming_video_stream.h" | 21 #include "webrtc/common_video/include/incoming_video_stream.h" |
21 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" | 22 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" |
22 #include "webrtc/frame_callback.h" | 23 #include "webrtc/frame_callback.h" |
23 #include "webrtc/modules/pacing/paced_sender.h" | 24 #include "webrtc/modules/pacing/paced_sender.h" |
(...skipping 29 matching lines...) Expand all Loading... |
53 virtual void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | 54 virtual void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
54 owner_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); | 55 owner_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); |
55 } | 56 } |
56 | 57 |
57 private: | 58 private: |
58 ViEChannel* const owner_; | 59 ViEChannel* const owner_; |
59 }; | 60 }; |
60 | 61 |
61 class ViEChannelProtectionCallback : public VCMProtectionCallback { | 62 class ViEChannelProtectionCallback : public VCMProtectionCallback { |
62 public: | 63 public: |
63 ViEChannelProtectionCallback(ViEChannel* owner) : owner_(owner) {} | 64 explicit ViEChannelProtectionCallback(ViEChannel* owner) : owner_(owner) {} |
64 ~ViEChannelProtectionCallback() {} | 65 ~ViEChannelProtectionCallback() {} |
65 | 66 |
66 | 67 |
67 int ProtectionRequest( | 68 int ProtectionRequest( |
68 const FecProtectionParams* delta_fec_params, | 69 const FecProtectionParams* delta_fec_params, |
69 const FecProtectionParams* key_fec_params, | 70 const FecProtectionParams* key_fec_params, |
70 uint32_t* sent_video_rate_bps, | 71 uint32_t* sent_video_rate_bps, |
71 uint32_t* sent_nack_rate_bps, | 72 uint32_t* sent_nack_rate_bps, |
72 uint32_t* sent_fec_rate_bps) override { | 73 uint32_t* sent_fec_rate_bps) override { |
73 return owner_->ProtectionRequest(delta_fec_params, key_fec_params, | 74 return owner_->ProtectionRequest(delta_fec_params, key_fec_params, |
(...skipping 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1219 CriticalSectionScoped cs(crit_.get()); | 1220 CriticalSectionScoped cs(crit_.get()); |
1220 receive_stats_callback_ = receive_statistics_proxy; | 1221 receive_stats_callback_ = receive_statistics_proxy; |
1221 } | 1222 } |
1222 | 1223 |
1223 void ViEChannel::SetIncomingVideoStream( | 1224 void ViEChannel::SetIncomingVideoStream( |
1224 IncomingVideoStream* incoming_video_stream) { | 1225 IncomingVideoStream* incoming_video_stream) { |
1225 CriticalSectionScoped cs(crit_.get()); | 1226 CriticalSectionScoped cs(crit_.get()); |
1226 incoming_video_stream_ = incoming_video_stream; | 1227 incoming_video_stream_ = incoming_video_stream; |
1227 } | 1228 } |
1228 } // namespace webrtc | 1229 } // namespace webrtc |
OLD | NEW |