diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index 126be98a9d..af937b9684 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -191,13 +191,10 @@ VideoSendStream::VideoSendStream( capture_->AllocateExternalCaptureDevice(capture_id_, external_capture_); capture_->ConnectCaptureDevice(capture_id_, channel_); - network_ = ViENetwork::GetInterface(video_engine); - DCHECK(network_ != nullptr); - - network_->RegisterSendTransport(channel_, transport_adapter_); + vie_channel_->RegisterSendTransport(&transport_adapter_); // 28 to match packet overhead in ModuleRtpRtcpImpl. - network_->SetMTU(channel_, - static_cast(config_.rtp.max_packet_size + 28)); + vie_channel_->SetMTU( + static_cast(config_.rtp.max_packet_size + 28)); DCHECK(config.encoder_settings.encoder != nullptr); DCHECK_GE(config.encoder_settings.payload_type, 0); @@ -251,7 +248,7 @@ VideoSendStream::~VideoSendStream() { image_process_->DeRegisterPreEncodeCallback(channel_); - network_->DeregisterSendTransport(channel_); + vie_channel_->DeregisterSendTransport(); capture_->DisconnectCaptureDevice(channel_); capture_->ReleaseCaptureDevice(capture_id_); @@ -265,7 +262,6 @@ VideoSendStream::~VideoSendStream() { video_engine_base_->Release(); capture_->Release(); codec_->Release(); - network_->Release(); } void VideoSendStream::IncomingCapturedFrame(const I420VideoFrame& frame) { @@ -426,7 +422,7 @@ bool VideoSendStream::ReconfigureVideoEncoder( } bool VideoSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { - return network_->ReceivedRTCPPacket(channel_, packet, length) == 0; + return vie_channel_->ReceivedRTCPPacket(packet, length) == 0; } VideoSendStream::Stats VideoSendStream::GetStats() { @@ -485,7 +481,7 @@ void VideoSendStream::SignalNetworkState(Call::NetworkState state) { // sent due to the network state changed will not be dropped. if (state == Call::kNetworkUp) vie_channel_->SetRTCPMode(kRtcpCompound); - network_->SetNetworkTransmissionState(channel_, state == Call::kNetworkUp); + vie_encoder_->SetNetworkTransmissionState(state == Call::kNetworkUp); if (state == Call::kNetworkDown) vie_channel_->SetRTCPMode(kRtcpOff); } diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h index 0a35ce0e1b..86e0534d7e 100644 --- a/webrtc/video/video_send_stream.h +++ b/webrtc/video/video_send_stream.h @@ -36,7 +36,6 @@ class ViEEncoder; class ViEExternalCapture; class ViEExternalCodec; class ViEImageProcess; -class ViENetwork; namespace internal { @@ -92,7 +91,6 @@ class VideoSendStream : public webrtc::VideoSendStream, ViECodec* codec_; ViEEncoder* vie_encoder_; ViEExternalCapture* external_capture_; - ViENetwork* network_; ViEImageProcess* image_process_; int channel_;