zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove channel ids from various interfaces.

Browse Source 
Starts by removing channel/engine id from ViEChannel which propagates
down to the RTP/RTCP module as well as the transport class.

IncomingVideoStream::RenderFrame() is untouched for now but receives a
fake id instead of the previous channel id. Added a TODO to remove it
later but the RenderFrame call is implemented in a lot of
platform-dependent files and should probably remove the "manager" aspect
of renderers, so preferring to do it separately

BUG=webrtc:1695
R=henrika@webrtc.org, mflodman@webrtc.org

Review URL: https://codereview.webrtc.org/1335353005 .

Cr-Commit-Position: refs/heads/master@{#9978}
This commit is contained in:
Peter Boström
2015-09-17 23:03:57 +02:00
parent 1d5198d5d2
commit ac547a6538
59 changed files with 292 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
View File

@ -199,10 +199,10 @@ class TestTransport : public Transport,
public:
TestTransport() {}
int SendPacket(int /*ch*/, const void* /*data*/, size_t /*len*/) override {
int SendPacket(const void* /*data*/, size_t /*len*/) override {
return -1;
}
int SendRTCPPacket(int /*ch*/, const void* data, size_t len) override {
int SendRTCPPacket(const void* data, size_t len) override {
parser_.Parse(static_cast<const uint8_t*>(data), len);
return static_cast<int>(len);
}
@ -225,14 +225,13 @@ class RtcpSenderTest : public ::testing::Test {
: clock_(1335900000),
receive_statistics_(ReceiveStatistics::Create(&clock_)) {
RtpRtcp::Configuration configuration;
configuration.id = 0;
configuration.audio = false;
configuration.clock = &clock_;
configuration.outgoing_transport = &test_transport_;
rtp_rtcp_impl_.reset(new ModuleRtpRtcpImpl(configuration));
rtcp_sender_.reset(new RTCPSender(configuration.id, false, &clock_,
receive_statistics_.get(), nullptr));
rtcp_sender_.reset(
new RTCPSender(false, &clock_, receive_statistics_.get(), nullptr));
rtcp_sender_->SetSSRC(kSenderSsrc);
rtcp_sender_->SetRemoteSSRC(kRemoteSsrc);
EXPECT_EQ(0, rtcp_sender_->RegisterSendTransport(&test_transport_));
@ -669,7 +668,7 @@ TEST_F(RtcpSenderTest, TestSendTimeOfXrRrtr) {
TEST_F(RtcpSenderTest, TestRegisterRtcpPacketTypeObserver) {
RtcpPacketTypeCounterObserverImpl observer;
rtcp_sender_.reset(
new RTCPSender(0, false, &clock_, receive_statistics_.get(), &observer));
new RTCPSender(false, &clock_, receive_statistics_.get(), &observer));
rtcp_sender_->SetRemoteSSRC(kRemoteSsrc);
EXPECT_EQ(0, rtcp_sender_->RegisterSendTransport(&test_transport_));
rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);