| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 int Bitrate(unsigned int* bitrate) const override { | 118 int Bitrate(unsigned int* bitrate) const override { |
| 119 return sender_.Bitrate(bitrate); | 119 return sender_.Bitrate(bitrate); |
| 120 } | 120 } |
| 121 | 121 |
| 122 int FrameRate(unsigned int* framerate) const override { | 122 int FrameRate(unsigned int* framerate) const override { |
| 123 return sender_.FrameRate(framerate); | 123 return sender_.FrameRate(framerate); |
| 124 } | 124 } |
| 125 | 125 |
| 126 int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s. | 126 int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s. |
| 127 uint8_t lossRate, | 127 uint8_t lossRate, |
| 128 int64_t rtt) override { | 128 int64_t rtt, |
| 129 return sender_.SetChannelParameters(target_bitrate, lossRate, rtt); | 129 VideoBitrateAllocator* allocator) override { |
| 130 return sender_.SetChannelParameters(target_bitrate, lossRate, rtt, |
| 131 allocator); |
| 130 } | 132 } |
| 131 | 133 |
| 132 int32_t RegisterProtectionCallback( | 134 int32_t RegisterProtectionCallback( |
| 133 VCMProtectionCallback* protection) override { | 135 VCMProtectionCallback* protection) override { |
| 134 return sender_.RegisterProtectionCallback(protection); | 136 return sender_.RegisterProtectionCallback(protection); |
| 135 } | 137 } |
| 136 | 138 |
| 137 int32_t SetVideoProtection(VCMVideoProtection videoProtection, | 139 int32_t SetVideoProtection(VCMVideoProtection videoProtection, |
| 138 bool enable) override { | 140 bool enable) override { |
| 139 // TODO(pbos): Remove enable from receive-side protection modes as well. | 141 // TODO(pbos): Remove enable from receive-side protection modes as well. |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 EventFactory* event_factory, | 293 EventFactory* event_factory, |
| 292 NackSender* nack_sender, | 294 NackSender* nack_sender, |
| 293 KeyFrameRequestSender* keyframe_request_sender) { | 295 KeyFrameRequestSender* keyframe_request_sender) { |
| 294 assert(clock); | 296 assert(clock); |
| 295 assert(event_factory); | 297 assert(event_factory); |
| 296 return new VideoCodingModuleImpl(clock, event_factory, nack_sender, | 298 return new VideoCodingModuleImpl(clock, event_factory, nack_sender, |
| 297 keyframe_request_sender, nullptr); | 299 keyframe_request_sender, nullptr); |
| 298 } | 300 } |
| 299 | 301 |
| 300 } // namespace webrtc | 302 } // namespace webrtc |
| OLD | NEW |