Allow any unsignalled SSRC changes on default video receive channel.
The first unsignalled SSRC creates a default receive channel.
Any unsignalled SSRC changes after that replace the default SSRC.
Add unit tests for changing unsignalled SSRCs.
BUG=webrtc:5208
Review-Url: https://codereview.webrtc.org/2692993009
Cr-Commit-Position: refs/heads/master@{#16682}
diff --git a/AUTHORS b/AUTHORS
index 1c23c3e..4ff9c39 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@
Matthias Liebig <matthias.gcode@gmail.com>
Maxim Potapov <vopatop.skam@gmail.com>
Mike Gilbert <floppymaster@gmail.com>
+Mo Zanaty <mzanaty@cisco.com>
Pali Rohar
Paul Kapustin <pkapustin@gmail.com>
Philipp Hancke <philipp.hancke@googlemail.com>
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index df796da..c192b52 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -428,9 +428,9 @@
UnsignalledSsrcHandler::Action DefaultUnsignalledSsrcHandler::OnUnsignalledSsrc(
WebRtcVideoChannel2* channel,
uint32_t ssrc) {
- if (default_recv_ssrc_ != 0) { // Already one default stream.
- LOG(LS_WARNING) << "Unknown SSRC, but default receive stream already set.";
- return kDropPacket;
+ if (default_recv_ssrc_ != 0) { // Already one default stream, so replace it.
+ channel->RemoveRecvStream(default_recv_ssrc_);
+ default_recv_ssrc_ = 0;
}
StreamParams sp;
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index a65265f..5c560c1 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -20,6 +20,7 @@
#include "webrtc/common_video/h264/profile_level_id.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/mediaconstants.h"
+#include "webrtc/media/base/rtputils.h"
#include "webrtc/media/base/testutils.h"
#include "webrtc/media/base/videoengine_unittest.h"
#include "webrtc/media/engine/constants.h"
@@ -43,6 +44,8 @@
static const uint32_t kRtxSsrcs1[] = {4};
static const uint32_t kFlexfecSsrc = 5;
static const uint32_t kIncomingUnsignalledSsrc = 0xC0FFEE;
+static const uint32_t kDefaultRecvSsrc = 0;
+
static const char kUnsupportedExtensionName[] =
"urn:ietf:params:rtp-hdrext:unsupported";
@@ -3754,6 +3757,83 @@
false /* expect_created_receive_stream */);
}
+// Test that receiving any unsignalled SSRC works even if it changes.
+// The first unsignalled SSRC received will create a default receive stream.
+// Any different unsignalled SSRC received will replace the default.
+TEST_F(WebRtcVideoChannel2Test, ReceiveDifferentUnsignaledSsrc) {
+
+ // Allow receiving VP8, VP9, H264 (if enabled).
+ cricket::VideoRecvParameters parameters;
+ parameters.codecs.push_back(GetEngineCodec("VP8"));
+ parameters.codecs.push_back(GetEngineCodec("VP9"));
+
+#if defined(WEBRTC_USE_H264)
+ cricket::VideoCodec H264codec(126, "H264");
+ parameters.codecs.push_back(H264codec);
+#endif
+
+ EXPECT_TRUE(channel_->SetRecvParameters(parameters));
+ // No receive streams yet.
+ ASSERT_EQ(0u, fake_call_->GetVideoReceiveStreams().size());
+ cricket::FakeVideoRenderer renderer;
+ EXPECT_TRUE(channel_->SetSink(kDefaultRecvSsrc, &renderer));
+
+ // Receive VP8 packet on first SSRC.
+ uint8_t data[kMinRtpPacketLen];
+ cricket::RtpHeader rtpHeader;
+ rtpHeader.payload_type = GetEngineCodec("VP8").id;
+ rtpHeader.seq_num = rtpHeader.timestamp = 0;
+ rtpHeader.ssrc = kIncomingUnsignalledSsrc+1;
+ cricket::SetRtpHeader(data, sizeof(data), rtpHeader);
+ rtc::CopyOnWriteBuffer packet(data, sizeof(data));
+ rtc::PacketTime packet_time;
+ channel_->OnPacketReceived(&packet, packet_time);
+ // VP8 packet should create default receive stream.
+ ASSERT_EQ(1u, fake_call_->GetVideoReceiveStreams().size());
+ FakeVideoReceiveStream* recv_stream =
+ fake_call_->GetVideoReceiveStreams()[0];
+ EXPECT_EQ(rtpHeader.ssrc, recv_stream->GetConfig().rtp.remote_ssrc);
+ // Verify that the receive stream sinks to a renderer.
+ webrtc::VideoFrame video_frame(CreateBlackFrameBuffer(4, 4), 100, 0,
+ webrtc::kVideoRotation_0);
+ recv_stream->InjectFrame(video_frame);
+ EXPECT_EQ(1, renderer.num_rendered_frames());
+
+ // Receive VP9 packet on second SSRC.
+ rtpHeader.payload_type = GetEngineCodec("VP9").id;
+ rtpHeader.ssrc = kIncomingUnsignalledSsrc+2;
+ cricket::SetRtpHeader(data, sizeof(data), rtpHeader);
+ rtc::CopyOnWriteBuffer packet2(data, sizeof(data));
+ channel_->OnPacketReceived(&packet2, packet_time);
+ // VP9 packet should replace the default receive SSRC.
+ ASSERT_EQ(1u, fake_call_->GetVideoReceiveStreams().size());
+ recv_stream = fake_call_->GetVideoReceiveStreams()[0];
+ EXPECT_EQ(rtpHeader.ssrc, recv_stream->GetConfig().rtp.remote_ssrc);
+ // Verify that the receive stream sinks to a renderer.
+ webrtc::VideoFrame video_frame2(CreateBlackFrameBuffer(4, 4), 200, 0,
+ webrtc::kVideoRotation_0);
+ recv_stream->InjectFrame(video_frame2);
+ EXPECT_EQ(2, renderer.num_rendered_frames());
+
+#if defined(WEBRTC_USE_H264)
+ // Receive H264 packet on third SSRC.
+ rtpHeader.payload_type = 126;
+ rtpHeader.ssrc = kIncomingUnsignalledSsrc+3;
+ cricket::SetRtpHeader(data, sizeof(data), rtpHeader);
+ rtc::CopyOnWriteBuffer packet3(data, sizeof(data));
+ channel_->OnPacketReceived(&packet3, packet_time);
+ // H264 packet should replace the default receive SSRC.
+ ASSERT_EQ(1u, fake_call_->GetVideoReceiveStreams().size());
+ recv_stream = fake_call_->GetVideoReceiveStreams()[0];
+ EXPECT_EQ(rtpHeader.ssrc, recv_stream->GetConfig().rtp.remote_ssrc);
+ // Verify that the receive stream sinks to a renderer.
+ webrtc::VideoFrame video_frame3(CreateBlackFrameBuffer(4, 4), 300, 0,
+ webrtc::kVideoRotation_0);
+ recv_stream->InjectFrame(video_frame3);
+ EXPECT_EQ(3, renderer.num_rendered_frames());
+#endif
+}
+
TEST_F(WebRtcVideoChannel2Test, CanSentMaxBitrateForExistingStream) {
AddSendStream();
