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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 return sender_return; | 101 return sender_return; |
102 return receiver_return; | 102 return receiver_return; |
103 } | 103 } |
104 | 104 |
105 int32_t RegisterSendCodec(const VideoCodec* sendCodec, | 105 int32_t RegisterSendCodec(const VideoCodec* sendCodec, |
106 uint32_t numberOfCores, | 106 uint32_t numberOfCores, |
107 uint32_t maxPayloadSize) override { | 107 uint32_t maxPayloadSize) override { |
108 return sender_.RegisterSendCodec(sendCodec, numberOfCores, maxPayloadSize); | 108 return sender_.RegisterSendCodec(sendCodec, numberOfCores, maxPayloadSize); |
109 } | 109 } |
110 | 110 |
111 const VideoCodec& GetSendCodec() const override { | |
112 return sender_.GetSendCodec(); | |
113 } | |
114 | |
115 // DEPRECATED. | |
116 int32_t SendCodec(VideoCodec* currentSendCodec) const override { | |
117 return sender_.SendCodecBlocking(currentSendCodec); | |
118 } | |
119 | |
120 // DEPRECATED. | |
121 VideoCodecType SendCodec() const override { | |
122 return sender_.SendCodecBlocking(); | |
123 } | |
124 | |
125 int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder, | 111 int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder, |
126 uint8_t payloadType, | 112 uint8_t payloadType, |
127 bool internalSource) override { | 113 bool internalSource) override { |
128 sender_.RegisterExternalEncoder(externalEncoder, payloadType, | 114 sender_.RegisterExternalEncoder(externalEncoder, payloadType, |
129 internalSource); | 115 internalSource); |
130 return 0; | 116 return 0; |
131 } | 117 } |
132 | 118 |
133 int Bitrate(unsigned int* bitrate) const override { | 119 int Bitrate(unsigned int* bitrate) const override { |
134 return sender_.Bitrate(bitrate); | 120 return sender_.Bitrate(bitrate); |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 void TriggerDecoderShutdown() override { receiver_.TriggerDecoderShutdown(); } | 285 void TriggerDecoderShutdown() override { receiver_.TriggerDecoderShutdown(); } |
300 | 286 |
301 private: | 287 private: |
302 EncodedImageCallbackWrapper post_encode_callback_; | 288 EncodedImageCallbackWrapper post_encode_callback_; |
303 vcm::VideoSender sender_; | 289 vcm::VideoSender sender_; |
304 vcm::VideoReceiver receiver_; | 290 vcm::VideoReceiver receiver_; |
305 rtc::scoped_ptr<EventFactory> own_event_factory_; | 291 rtc::scoped_ptr<EventFactory> own_event_factory_; |
306 }; | 292 }; |
307 } // namespace | 293 } // namespace |
308 | 294 |
309 int32_t VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) { | 295 void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) { |
310 VCMCodecDataBase::Codec(codecType, codec); | 296 VCMCodecDataBase::Codec(codecType, codec); |
311 return 0; | |
312 } | 297 } |
313 | 298 |
314 VideoCodingModule* VideoCodingModule::Create( | 299 VideoCodingModule* VideoCodingModule::Create( |
315 Clock* clock, | 300 Clock* clock, |
316 VideoEncoderRateObserver* encoder_rate_observer, | 301 VideoEncoderRateObserver* encoder_rate_observer, |
317 VCMQMSettingsCallback* qm_settings_callback) { | 302 VCMQMSettingsCallback* qm_settings_callback) { |
318 return new VideoCodingModuleImpl(clock, new EventFactoryImpl, true, | 303 return new VideoCodingModuleImpl(clock, new EventFactoryImpl, true, |
319 encoder_rate_observer, qm_settings_callback); | 304 encoder_rate_observer, qm_settings_callback); |
320 } | 305 } |
321 | 306 |
322 VideoCodingModule* VideoCodingModule::Create(Clock* clock, | 307 VideoCodingModule* VideoCodingModule::Create(Clock* clock, |
323 EventFactory* event_factory) { | 308 EventFactory* event_factory) { |
324 assert(clock); | 309 assert(clock); |
325 assert(event_factory); | 310 assert(event_factory); |
326 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr, | 311 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr, |
327 nullptr); | 312 nullptr); |
328 } | 313 } |
329 | 314 |
330 void VideoCodingModule::Destroy(VideoCodingModule* module) { | 315 void VideoCodingModule::Destroy(VideoCodingModule* module) { |
331 if (module != NULL) { | 316 if (module != NULL) { |
332 delete static_cast<VideoCodingModuleImpl*>(module); | 317 delete static_cast<VideoCodingModuleImpl*>(module); |
333 } | 318 } |
334 } | 319 } |
335 } // namespace webrtc | 320 } // namespace webrtc |
OLD | NEW |