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

12
webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
View File

@ -39,15 +39,12 @@ class TestTransport : public Transport,
void SetRTCPReceiver(RTCPReceiver* rtcp_receiver) {
rtcp_receiver_ = rtcp_receiver;
}
int SendPacket(int /*ch*/, const void* /*data*/, size_t /*len*/) override {
int SendPacket(const void* /*data*/, size_t /*len*/) override {
ADD_FAILURE(); // FAIL() gives a compile error.
return -1;
}
// Injects an RTCP packet into the receiver.
int SendRTCPPacket(int /* ch */,
const void* packet,
size_t packet_len) override {
int SendRTCPPacket(const void* packet, size_t packet_len) override {
ADD_FAILURE();
return 0;
}
@ -76,14 +73,13 @@ class RtcpReceiverTest : public ::testing::Test {
test_transport_ = new TestTransport();
RtpRtcp::Configuration configuration;
configuration.id = 0;
configuration.audio = false;
configuration.clock = &system_clock_;
configuration.outgoing_transport = test_transport_;
configuration.remote_bitrate_estimator = remote_bitrate_estimator_.get();
rtp_rtcp_impl_ = new ModuleRtpRtcpImpl(configuration);
rtcp_receiver_ = new RTCPReceiver(0, &system_clock_, false, NULL, NULL,
NULL, rtp_rtcp_impl_);
rtcp_receiver_ = new RTCPReceiver(&system_clock_, false, NULL, NULL, NULL,
rtp_rtcp_impl_);
test_transport_->SetRTCPReceiver(rtcp_receiver_);
}
~RtcpReceiverTest() {