| 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 std::unique_ptr<VideoBitrateAllocator> rate_allocator_; | 269 std::unique_ptr<VideoBitrateAllocator> rate_allocator_; |
| 270 std::unique_ptr<VCMTiming> timing_; | 270 std::unique_ptr<VCMTiming> timing_; |
| 271 vcm::VideoReceiver receiver_; | 271 vcm::VideoReceiver receiver_; |
| 272 }; | 272 }; |
| 273 } // namespace | 273 } // namespace |
| 274 | 274 |
| 275 void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) { | 275 void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) { |
| 276 VCMCodecDataBase::Codec(codecType, codec); | 276 VCMCodecDataBase::Codec(codecType, codec); |
| 277 } | 277 } |
| 278 | 278 |
| 279 // Create method for the new jitter buffer. | 279 // DEPRECATED. Create method for current interface, will be removed when the |
| 280 VideoCodingModule* VideoCodingModule::Create( | |
| 281 Clock* clock, | |
| 282 VCMQMSettingsCallback* qm_settings_callback, | |
| 283 NackSender* nack_sender, | |
| 284 KeyFrameRequestSender* keyframe_request_sender, | |
| 285 EncodedImageCallback* pre_decode_image_callback) { | |
| 286 return new VideoCodingModuleImpl(clock, nullptr, nack_sender, | |
| 287 keyframe_request_sender, | |
| 288 pre_decode_image_callback); | |
| 289 } | |
| 290 | |
| 291 // Create method for current interface, will be removed when the | |
| 292 // new jitter buffer is in place. | 280 // new jitter buffer is in place. |
| 293 VideoCodingModule* VideoCodingModule::Create(Clock* clock, | 281 VideoCodingModule* VideoCodingModule::Create(Clock* clock, |
| 294 EventFactory* event_factory) { | 282 EventFactory* event_factory) { |
| 295 return VideoCodingModule::Create(clock, event_factory, | |
| 296 nullptr, // NackSender | |
| 297 nullptr); // KeyframeRequestSender | |
| 298 } | |
| 299 | |
| 300 // Create method for the new jitter buffer. | |
| 301 VideoCodingModule* VideoCodingModule::Create( | |
| 302 Clock* clock, | |
| 303 EventFactory* event_factory, | |
| 304 NackSender* nack_sender, | |
| 305 KeyFrameRequestSender* keyframe_request_sender) { | |
| 306 RTC_DCHECK(clock); | 283 RTC_DCHECK(clock); |
| 307 RTC_DCHECK(event_factory); | 284 RTC_DCHECK(event_factory); |
| 308 return new VideoCodingModuleImpl(clock, event_factory, nack_sender, | 285 return new VideoCodingModuleImpl(clock, event_factory, nullptr, nullptr, |
| 309 keyframe_request_sender, nullptr); | 286 nullptr); |
| 310 } | 287 } |
| 311 | 288 |
| 312 } // namespace webrtc | 289 } // namespace webrtc |
| OLD | NEW |