| Index: webrtc/modules/video_coding/receiver.cc
|
| diff --git a/webrtc/modules/video_coding/receiver.cc b/webrtc/modules/video_coding/receiver.cc
|
| index 988f1ef5c7558d07273894307e53286780f71d60..f74a40982f89a81b8423dfe56bcb05973dfcb20c 100644
|
| --- a/webrtc/modules/video_coding/receiver.cc
|
| +++ b/webrtc/modules/video_coding/receiver.cc
|
| @@ -30,19 +30,55 @@ enum { kMaxReceiverDelayMs = 10000 };
|
| VCMReceiver::VCMReceiver(VCMTiming* timing,
|
| Clock* clock,
|
| EventFactory* event_factory)
|
| + : VCMReceiver::VCMReceiver(timing,
|
| + clock,
|
| + event_factory,
|
| + nullptr, // ProcessThread
|
| + nullptr, // NackSender
|
| + nullptr) // KeyframeRequestSender
|
| +{}
|
| +
|
| +VCMReceiver::VCMReceiver(VCMTiming* timing,
|
| + Clock* clock,
|
| + EventFactory* event_factory,
|
| + ProcessThread* module_process_thread,
|
| + NackSender* nack_sender,
|
| + KeyFrameRequestSender* keyframe_request_sender)
|
| : VCMReceiver(timing,
|
| clock,
|
| std::unique_ptr<EventWrapper>(event_factory->CreateEvent()),
|
| - std::unique_ptr<EventWrapper>(event_factory->CreateEvent())) {
|
| -}
|
| + std::unique_ptr<EventWrapper>(event_factory->CreateEvent()),
|
| + module_process_thread,
|
| + nack_sender,
|
| + keyframe_request_sender) {}
|
|
|
| VCMReceiver::VCMReceiver(VCMTiming* timing,
|
| Clock* clock,
|
| std::unique_ptr<EventWrapper> receiver_event,
|
| std::unique_ptr<EventWrapper> jitter_buffer_event)
|
| + : VCMReceiver::VCMReceiver(timing,
|
| + clock,
|
| + std::move(receiver_event),
|
| + std::move(jitter_buffer_event),
|
| + nullptr, // ProcesThread
|
| + nullptr, // NackSender
|
| + nullptr) // KeyframeRequestSender
|
| +{}
|
| +
|
| +VCMReceiver::VCMReceiver(VCMTiming* timing,
|
| + Clock* clock,
|
| + std::unique_ptr<EventWrapper> receiver_event,
|
| + std::unique_ptr<EventWrapper> jitter_buffer_event,
|
| + ProcessThread* module_process_thread,
|
| + NackSender* nack_sender,
|
| + KeyFrameRequestSender* keyframe_request_sender)
|
| : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
|
| clock_(clock),
|
| - jitter_buffer_(clock_, std::move(jitter_buffer_event)),
|
| + jitter_buffer_(clock_,
|
| + std::move(jitter_buffer_event),
|
| + module_process_thread,
|
| + nack_sender,
|
| + keyframe_request_sender),
|
| timing_(timing),
|
| render_wait_event_(std::move(receiver_event)),
|
| max_video_delay_ms_(kMaxVideoDelayMs) {
|
|
|