Break out glue for old->new Transport.
Reduces multiple inheritance and code duplication.
BUG=
R=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2239004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4774 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video_engine/internal/video_send_stream.cc b/video_engine/internal/video_send_stream.cc
index 5adf8b9..799cec7 100644
--- a/video_engine/internal/video_send_stream.cc
+++ b/video_engine/internal/video_send_stream.cc
@@ -80,7 +80,7 @@
bool overuse_detection,
webrtc::VideoEngine* video_engine,
const VideoSendStream::Config& config)
- : transport_(transport), config_(config), external_codec_(NULL) {
+ : transport_adapter_(transport), config_(config), external_codec_(NULL) {
if (config_.codec.numberOfSimulcastStreams > 0) {
assert(config_.rtp.ssrcs.size() == config_.codec.numberOfSimulcastStreams);
@@ -146,7 +146,7 @@
network_ = ViENetwork::GetInterface(video_engine);
assert(network_ != NULL);
- network_->RegisterSendTransport(channel_, *this);
+ network_->RegisterSendTransport(channel_, transport_adapter_);
if (config.encoder) {
external_codec_ = ViEExternalCodec::GetInterface(video_engine);
@@ -250,26 +250,6 @@
*send_codec = config_.codec;
}
-int VideoSendStream::SendPacket(int /*channel*/,
- const void* packet,
- int length) {
- // TODO(pbos): Lock these methods and the destructor so it can't be processing
- // a packet when the destructor has been called.
- assert(length >= 0);
- bool success = transport_->SendRTP(static_cast<const uint8_t*>(packet),
- static_cast<size_t>(length));
- return success ? length : -1;
-}
-
-int VideoSendStream::SendRTCPPacket(int /*channel*/,
- const void* packet,
- int length) {
- assert(length >= 0);
- bool success = transport_->SendRTCP(static_cast<const uint8_t*>(packet),
- static_cast<size_t>(length));
- return success ? length : -1;
-}
-
bool VideoSendStream::DeliverRtcp(const uint8_t* packet, size_t length) {
return network_->ReceivedRTCPPacket(
channel_, packet, static_cast<int>(length)) == 0;