Unify Transport and newapi::Transport interfaces.
BUG=webrtc:1695
R=stefan@webrtc.org
TBR=mflodman@webrtc.org
Review URL: https://codereview.webrtc.org/1369263002
Cr-Original-Commit-Position: refs/heads/master@{#10096}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 2d566686a23fe93ada58f1c38a0d4b9a0d68556e
diff --git a/test/call_test.cc b/test/call_test.cc
index 19e292f..0986df5 100644
--- a/test/call_test.cc
+++ b/test/call_test.cc
@@ -90,7 +90,7 @@
}
void CallTest::CreateSendConfig(size_t num_streams,
- newapi::Transport* send_transport) {
+ Transport* send_transport) {
assert(num_streams <= kNumSsrcs);
send_config_ = VideoSendStream::Config(send_transport);
send_config_.encoder_settings.encoder = &fake_encoder_;
@@ -106,7 +106,7 @@
}
void CallTest::CreateMatchingReceiveConfigs(
- newapi::Transport* rtcp_send_transport) {
+ Transport* rtcp_send_transport) {
assert(!send_config_.rtp.ssrcs.empty());
assert(receive_configs_.empty());
assert(allocated_decoders_.empty());
diff --git a/test/call_test.h b/test/call_test.h
index 105259d..2b9dcee 100644
--- a/test/call_test.h
+++ b/test/call_test.h
@@ -53,8 +53,8 @@
void CreateSenderCall(const Call::Config& config);
void CreateReceiverCall(const Call::Config& config);
- void CreateSendConfig(size_t num_streams, newapi::Transport* send_transport);
- void CreateMatchingReceiveConfigs(newapi::Transport* rtcp_send_transport);
+ void CreateSendConfig(size_t num_streams, Transport* send_transport);
+ void CreateMatchingReceiveConfigs(Transport* rtcp_send_transport);
void CreateFrameGeneratorCapturer();
diff --git a/test/channel_transport/udp_transport.h b/test/channel_transport/udp_transport.h
index a923835..0c5079e 100644
--- a/test/channel_transport/udp_transport.h
+++ b/test/channel_transport/udp_transport.h
@@ -12,6 +12,7 @@
#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_H_
#include "webrtc/common_types.h"
+#include "webrtc/transport.h"
#include "webrtc/typedefs.h"
/*
diff --git a/test/channel_transport/udp_transport_impl.cc b/test/channel_transport/udp_transport_impl.cc
index e16c742..f66f4ef 100644
--- a/test/channel_transport/udp_transport_impl.cc
+++ b/test/channel_transport/udp_transport_impl.cc
@@ -1931,18 +1931,18 @@
return -1;
}
-int UdpTransportImpl::SendPacket(const void* data, size_t length) {
+bool UdpTransportImpl::SendRtp(const uint8_t* data, size_t length) {
WEBRTC_TRACE(kTraceStream, kTraceTransport, _id, "%s", __FUNCTION__);
CriticalSectionScoped cs(_crit);
if(_destIP[0] == 0)
{
- return -1;
+ return false;
}
if(_destPort == 0)
{
- return -1;
+ return false;
}
// Create socket if it hasn't been set up already.
@@ -1980,32 +1980,32 @@
"SendPacket() failed to bind RTP socket");
_lastError = retVal;
CloseReceiveSockets();
- return -1;
+ return false;
}
}
if(_ptrSendRtpSocket)
{
return _ptrSendRtpSocket->SendTo((const int8_t*)data, length,
- _remoteRTPAddr);
+ _remoteRTPAddr) >= 0;
} else if(_ptrRtpSocket)
{
return _ptrRtpSocket->SendTo((const int8_t*)data, length,
- _remoteRTPAddr);
+ _remoteRTPAddr) >= 0;
}
- return -1;
+ return false;
}
-int UdpTransportImpl::SendRTCPPacket(const void* data, size_t length) {
+bool UdpTransportImpl::SendRtcp(const uint8_t* data, size_t length) {
CriticalSectionScoped cs(_crit);
if(_destIP[0] == 0)
{
- return -1;
+ return false;
}
if(_destPortRTCP == 0)
{
- return -1;
+ return false;
}
// Create socket if it hasn't been set up already.
@@ -2041,22 +2041,22 @@
{
_lastError = retVal;
WEBRTC_TRACE(kTraceError, kTraceTransport, _id,
- "SendRTCPPacket() failed to bind RTCP socket");
+ "SendRtcp() failed to bind RTCP socket");
CloseReceiveSockets();
- return -1;
+ return false;
}
}
if(_ptrSendRtcpSocket)
{
return _ptrSendRtcpSocket->SendTo((const int8_t*)data, length,
- _remoteRTCPAddr);
+ _remoteRTCPAddr) >= 0;
} else if(_ptrRtcpSocket)
{
return _ptrRtcpSocket->SendTo((const int8_t*)data, length,
- _remoteRTCPAddr);
+ _remoteRTCPAddr) >= 0;
}
- return -1;
+ return false;
}
int32_t UdpTransportImpl::SetSendIP(const char* ipaddr)
diff --git a/test/channel_transport/udp_transport_impl.h b/test/channel_transport/udp_transport_impl.h
index cbc53bc..80562f3 100644
--- a/test/channel_transport/udp_transport_impl.h
+++ b/test/channel_transport/udp_transport_impl.h
@@ -116,8 +116,8 @@
size_t length,
uint16_t rtcpPort) override;
// Transport functions
- int SendPacket(const void* data, size_t length) override;
- int SendRTCPPacket(const void* data, size_t length) override;
+ bool SendRtp(const uint8_t* data, size_t length) override;
+ bool SendRtcp(const uint8_t* data, size_t length) override;
// UdpTransport functions continue.
int32_t SetSendIP(const char* ipaddr) override;
diff --git a/test/direct_transport.h b/test/direct_transport.h
index 7295588..a0aaecb 100644
--- a/test/direct_transport.h
+++ b/test/direct_transport.h
@@ -28,7 +28,7 @@
namespace test {
-class DirectTransport : public newapi::Transport {
+class DirectTransport : public Transport {
public:
DirectTransport();
explicit DirectTransport(const FakeNetworkPipe::Config& config);
diff --git a/test/mock_transport.h b/test/mock_transport.h
index 823baf4..ca08809 100644
--- a/test/mock_transport.h
+++ b/test/mock_transport.h
@@ -16,10 +16,10 @@
namespace webrtc {
-class MockTransport : public webrtc::Transport {
+class MockTransport : public Transport {
public:
- MOCK_METHOD2(SendPacket, int(const void* data, size_t len));
- MOCK_METHOD2(SendRTCPPacket, int(const void* data, size_t len));
+ MOCK_METHOD2(SendRtp, bool(const uint8_t* data, size_t len));
+ MOCK_METHOD2(SendRtcp, bool(const uint8_t* data, size_t len));
};
} // namespace webrtc
#endif // WEBRTC_TEST_MOCK_TRANSPORT_H_
diff --git a/test/null_transport.h b/test/null_transport.h
index b80f751..a60d8cb 100644
--- a/test/null_transport.h
+++ b/test/null_transport.h
@@ -17,7 +17,7 @@
class PacketReceiver;
namespace test {
-class NullTransport : public newapi::Transport {
+class NullTransport : public Transport {
public:
bool SendRtp(const uint8_t* packet, size_t length) override;
bool SendRtcp(const uint8_t* packet, size_t length) override;
diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
index 38e2fa7..24f7256 100644
--- a/test/rtp_rtcp_observer.h
+++ b/test/rtp_rtcp_observer.h
@@ -27,11 +27,11 @@
class RtpRtcpObserver {
public:
virtual ~RtpRtcpObserver() {}
- newapi::Transport* SendTransport() {
+ Transport* SendTransport() {
return &send_transport_;
}
- newapi::Transport* ReceiveTransport() {
+ Transport* ReceiveTransport() {
return &receive_transport_;
}
