| 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 970236dd519baab187e8a2d4ec84b8f8da43be95..72bcc9a059448bc3760402200e1aaf28ca0b051d 100644
|
| --- a/webrtc/modules/video_coding/video_coding_impl.cc
|
| +++ b/webrtc/modules/video_coding/video_coding_impl.cc
|
| @@ -74,16 +74,11 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
| VideoCodingModuleImpl(Clock* clock,
|
| EventFactory* event_factory,
|
| VideoEncoderRateObserver* encoder_rate_observer,
|
| - VCMQMSettingsCallback* qm_settings_callback,
|
| NackSender* nack_sender,
|
| KeyFrameRequestSender* keyframe_request_sender,
|
| EncodedImageCallback* pre_decode_image_callback)
|
| : VideoCodingModule(),
|
| - sender_(clock,
|
| - &post_encode_callback_,
|
| - encoder_rate_observer,
|
| - qm_settings_callback,
|
| - nullptr),
|
| + sender_(clock, &post_encode_callback_, encoder_rate_observer, nullptr),
|
| receiver_(clock,
|
| event_factory,
|
| pre_decode_image_callback,
|
| @@ -147,9 +142,8 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
| }
|
|
|
| int32_t AddVideoFrame(const VideoFrame& videoFrame,
|
| - const VideoContentMetrics* contentMetrics,
|
| const CodecSpecificInfo* codecSpecificInfo) override {
|
| - return sender_.AddVideoFrame(videoFrame, contentMetrics, codecSpecificInfo);
|
| + return sender_.AddVideoFrame(videoFrame, codecSpecificInfo);
|
| }
|
|
|
| int32_t IntraFrameRequest(size_t stream_index) override {
|
| @@ -298,9 +292,9 @@ VideoCodingModule* VideoCodingModule::Create(
|
| NackSender* nack_sender,
|
| KeyFrameRequestSender* keyframe_request_sender,
|
| EncodedImageCallback* pre_decode_image_callback) {
|
| - return new VideoCodingModuleImpl(
|
| - clock, nullptr, encoder_rate_observer, qm_settings_callback, nack_sender,
|
| - keyframe_request_sender, pre_decode_image_callback);
|
| + return new VideoCodingModuleImpl(clock, nullptr, encoder_rate_observer,
|
| + nack_sender, keyframe_request_sender,
|
| + pre_decode_image_callback);
|
| }
|
|
|
| // Create method for current interface, will be removed when the
|
| @@ -320,9 +314,8 @@ VideoCodingModule* VideoCodingModule::Create(
|
| KeyFrameRequestSender* keyframe_request_sender) {
|
| assert(clock);
|
| assert(event_factory);
|
| - return new VideoCodingModuleImpl(clock, event_factory, nullptr, nullptr,
|
| - nack_sender, keyframe_request_sender,
|
| - nullptr);
|
| + return new VideoCodingModuleImpl(clock, event_factory, nullptr, nack_sender,
|
| + keyframe_request_sender, nullptr);
|
| }
|
|
|
| } // namespace webrtc
|
|
|