generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ViENetwork usage in VideoSendStream.

Browse Source 
Replaces interface usage with direct calls on ViEEncoder and ViEChannel
removing a layer of indirection.

BUG=1695
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/50809004

Cr-Commit-Position: refs/heads/master@{#9096}
This commit is contained in:
Peter Boström 2015-04-28 12:35:44 +02:00
parent 038df3c5d7
commit ddbddbdee6
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/video/video_send_stream.cc
View File

@ -191,13 +191,10 @@ VideoSendStream::VideoSendStream(
capture_->AllocateExternalCaptureDevice(capture_id_, external_capture_); capture_->AllocateExternalCaptureDevice(capture_id_, external_capture_);
capture_->ConnectCaptureDevice(capture_id_, channel_); capture_->ConnectCaptureDevice(capture_id_, channel_);
network_ = ViENetwork::GetInterface(video_engine); vie_channel_->RegisterSendTransport(&transport_adapter_);
DCHECK(network_ != nullptr);
network_->RegisterSendTransport(channel_, transport_adapter_);
// 28 to match packet overhead in ModuleRtpRtcpImpl. // 28 to match packet overhead in ModuleRtpRtcpImpl.
network_->SetMTU(channel_, vie_channel_->SetMTU(
static_cast<unsigned int>(config_.rtp.max_packet_size + 28)); static_cast<unsigned int>(config_.rtp.max_packet_size + 28));
DCHECK(config.encoder_settings.encoder != nullptr); DCHECK(config.encoder_settings.encoder != nullptr);
DCHECK_GE(config.encoder_settings.payload_type, 0); DCHECK_GE(config.encoder_settings.payload_type, 0);
@ -251,7 +248,7 @@ VideoSendStream::~VideoSendStream() {
image_process_->DeRegisterPreEncodeCallback(channel_); image_process_->DeRegisterPreEncodeCallback(channel_);
network_->DeregisterSendTransport(channel_); vie_channel_->DeregisterSendTransport();
capture_->DisconnectCaptureDevice(channel_); capture_->DisconnectCaptureDevice(channel_);
capture_->ReleaseCaptureDevice(capture_id_); capture_->ReleaseCaptureDevice(capture_id_);
@ -265,7 +262,6 @@ VideoSendStream::~VideoSendStream() {
video_engine_base_->Release(); video_engine_base_->Release();
capture_->Release(); capture_->Release();
codec_->Release(); codec_->Release();
network_->Release();
} }
void VideoSendStream::IncomingCapturedFrame(const I420VideoFrame& frame) { void VideoSendStream::IncomingCapturedFrame(const I420VideoFrame& frame) {
@ -426,7 +422,7 @@ bool VideoSendStream::ReconfigureVideoEncoder(
} }
bool VideoSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { 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() { 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. // sent due to the network state changed will not be dropped.
if (state == Call::kNetworkUp) if (state == Call::kNetworkUp)
vie_channel_->SetRTCPMode(kRtcpCompound); vie_channel_->SetRTCPMode(kRtcpCompound);
network_->SetNetworkTransmissionState(channel_, state == Call::kNetworkUp); vie_encoder_->SetNetworkTransmissionState(state == Call::kNetworkUp);
if (state == Call::kNetworkDown) if (state == Call::kNetworkDown)
vie_channel_->SetRTCPMode(kRtcpOff); vie_channel_->SetRTCPMode(kRtcpOff);
} }

2
webrtc/video/video_send_stream.h
View File

@ -36,7 +36,6 @@ class ViEEncoder;
class ViEExternalCapture; class ViEExternalCapture;
class ViEExternalCodec; class ViEExternalCodec;
class ViEImageProcess; class ViEImageProcess;
class ViENetwork;
namespace internal { namespace internal {
@ -92,7 +91,6 @@ class VideoSendStream : public webrtc::VideoSendStream,
ViECodec* codec_; ViECodec* codec_;
ViEEncoder* vie_encoder_; ViEEncoder* vie_encoder_;
ViEExternalCapture* external_capture_; ViEExternalCapture* external_capture_;
ViENetwork* network_;
ViEImageProcess* image_process_; ViEImageProcess* image_process_;
int channel_; int channel_;