| Index: webrtc/modules/video_coding/video_coding_impl.cc
|
| diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc
|
| index 8955e54db70d5dc6aabbb68eb7ace54d98d42597..077f3368a33446a1ade6bdde581fbddd415bc62d 100644
|
| --- a/webrtc/modules/video_coding/video_coding_impl.cc
|
| +++ b/webrtc/modules/video_coding/video_coding_impl.cc
|
| @@ -73,12 +73,11 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
| public:
|
| VideoCodingModuleImpl(Clock* clock,
|
| EventFactory* event_factory,
|
| - VideoEncoderRateObserver* encoder_rate_observer,
|
| NackSender* nack_sender,
|
| KeyFrameRequestSender* keyframe_request_sender,
|
| EncodedImageCallback* pre_decode_image_callback)
|
| : VideoCodingModule(),
|
| - sender_(clock, &post_encode_callback_, encoder_rate_observer, nullptr),
|
| + sender_(clock, &post_encode_callback_, nullptr),
|
| receiver_(clock,
|
| event_factory,
|
| pre_decode_image_callback,
|
| @@ -263,29 +262,15 @@ void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) {
|
| VCMCodecDataBase::Codec(codecType, codec);
|
| }
|
|
|
| -// Create method for current interface, will be removed when the
|
| -// new jitter buffer is in place.
|
| -VideoCodingModule* VideoCodingModule::Create(
|
| - Clock* clock,
|
| - VideoEncoderRateObserver* encoder_rate_observer,
|
| - VCMQMSettingsCallback* qm_settings_callback) {
|
| - return VideoCodingModule::Create(clock, encoder_rate_observer,
|
| - qm_settings_callback,
|
| - nullptr, // NackSender
|
| - nullptr, // KeyframeRequestSender
|
| - nullptr); // Pre-decode image callback
|
| -}
|
| -
|
| // Create method for the new jitter buffer.
|
| VideoCodingModule* VideoCodingModule::Create(
|
| Clock* clock,
|
| - VideoEncoderRateObserver* encoder_rate_observer,
|
| VCMQMSettingsCallback* qm_settings_callback,
|
| NackSender* nack_sender,
|
| KeyFrameRequestSender* keyframe_request_sender,
|
| EncodedImageCallback* pre_decode_image_callback) {
|
| - return new VideoCodingModuleImpl(clock, nullptr, encoder_rate_observer,
|
| - nack_sender, keyframe_request_sender,
|
| + return new VideoCodingModuleImpl(clock, nullptr, nack_sender,
|
| + keyframe_request_sender,
|
| pre_decode_image_callback);
|
| }
|
|
|
| @@ -306,7 +291,7 @@ VideoCodingModule* VideoCodingModule::Create(
|
| KeyFrameRequestSender* keyframe_request_sender) {
|
| assert(clock);
|
| assert(event_factory);
|
| - return new VideoCodingModuleImpl(clock, event_factory, nullptr, nack_sender,
|
| + return new VideoCodingModuleImpl(clock, event_factory, nack_sender,
|
| keyframe_request_sender, nullptr);
|
| }
|
|
|
|
|