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.h b/video_engine/internal/video_send_stream.h
index bd3494f..1241b48 100644
--- a/video_engine/internal/video_send_stream.h
+++ b/video_engine/internal/video_send_stream.h
@@ -14,6 +14,7 @@
#include <vector>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/video_engine/internal/transport_adapter.h"
#include "webrtc/video_engine/new_include/video_receive_stream.h"
#include "webrtc/video_engine/new_include/video_send_stream.h"
@@ -33,8 +34,7 @@
class ResolutionAdaptor;
class VideoSendStream : public webrtc::VideoSendStream,
- public VideoSendStreamInput,
- public webrtc::Transport {
+ public VideoSendStreamInput {
public:
VideoSendStream(newapi::Transport* transport,
bool overuse_detection,
@@ -58,17 +58,11 @@
virtual void GetSendCodec(VideoCodec* send_codec) OVERRIDE;
- virtual int SendPacket(int /*channel*/, const void* packet, int length)
- OVERRIDE;
-
- virtual int SendRTCPPacket(int /*channel*/, const void* packet, int length)
- OVERRIDE;
-
public:
bool DeliverRtcp(const uint8_t* packet, size_t length);
private:
- newapi::Transport* transport_;
+ TransportAdapter transport_adapter_;
VideoSendStream::Config config_;
ViEBase* video_engine_base_;