Don't create unsignalled receive streams for RTX and ULPFEC packets.

talk/media/webrtc/webrtcvideoengine2_unittest.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 2563 matching lines @@
   ASSERT_TRUE(channel_->GetStats(&info));
 
   ASSERT_EQ(1u, info.senders.size());
   ASSERT_EQ(1u, info.receivers.size());
 
   EXPECT_NE(sender_sp.ssrc_groups, receiver_sp.ssrc_groups);
   EXPECT_EQ(sender_sp.ssrc_groups, info.senders[0].ssrc_groups);
   EXPECT_EQ(receiver_sp.ssrc_groups, info.receivers[0].ssrc_groups);
 }
 
+TEST_F(WebRtcVideoChannel2Test, RtxPacketsDontCreateUnsignalledReceiveStreams) {
+  std::vector<VideoCodec> codecs(engine_.codecs());
+  // Add a RED RTX codec.
+  VideoCodec red_rtx_codec =
+      VideoCodec::CreateRtxCodec(125, kDefaultRedPlType);

[pbos-webrtc, 2015/07/09 10:38:43]

Name this 125 constant and use it below as well.

[noahric, 2015/07/09 17:29:55]

Done.

+  codecs.push_back(red_rtx_codec);
+  EXPECT_TRUE(channel_->SetRecvCodecs(codecs));
+  const std::vector<uint32> rtx_ssrcs = MAKE_VECTOR(kRtxSsrcs1);

[pbos-webrtc, 2015/07/09 10:38:43]

Just use a static const int kIncomingUnsignalledSsrc = 0xC0FFEE. This isn't a
RTX SSRC specifically, and unsignalled streams have nothing to do with
RTX/non-RTX SSRCs, since they can't be distinguished between (so I think the
test is confusing, as it looks like it should handle the RTX SSRC differently).

[noahric, 2015/07/09 17:29:55]

Done.

+
+  ASSERT_EQ(0u, fake_call_->GetVideoReceiveStreams().size());
+  const size_t kDataLength = 12;
+  uint8_t data[kDataLength];
+  memset(data, 0, sizeof(data));
+
+  // RTX (including the RED RTX we registered above) and ulpfec should be
+  // ignored.
+  for (int payload_type : { kDefaultRtxVp8PlType, kDefaultUlpfecType, 125 }) {

[pbos-webrtc, 2015/07/09 10:38:43]

Looks like you can't get away with this sir. :)

[noahric, 2015/07/09 17:29:55]

Aww, sadtimes. It's gone now anyways.

+    rtc::Set8(data, 1, payload_type);
+    rtc::SetBE32(&data[8], rtx_ssrcs[0]);
+    rtc::Buffer packet(data, kDataLength);
+    rtc::PacketTime packet_time;
+    channel_->OnPacketReceived(&packet, packet_time);
+
+    ASSERT_EQ(0u, fake_call_->GetVideoReceiveStreams().size())

[pbos-webrtc, 2015/07/09 10:38:43]

Is there a test asserting that we do create it for VP8? If there is I'd like you
to consolidate them into one (if not, add one for VP8):

void WebRtcVideoChannel2Test::ReceiveUnsignalledSsrc(uint8_t payload_type, bool
expect_created_receive_stream);

Then do four different instantiations, but expect only the codec one to succeed,
so fail on RTX, FEC etc. ?

[noahric, 2015/07/09 17:29:55]

DefaultReceiveStreamReconfiguresToUseRtx does, but I can make an explicit set
and refactor it to use a shared function. PTAL.

+        << "Shouldn't have created a receive stream for payload type: "
+        << payload_type;
+  }
+}
+
 void WebRtcVideoChannel2Test::TestReceiverLocalSsrcConfiguration(
     bool receiver_first) {
   EXPECT_TRUE(channel_->SetSendCodecs(engine_.codecs()));
 
   const uint32_t kSenderSsrc = 0xC0FFEE;
   const uint32_t kReceiverSsrc = 0x4711;
 
   if (receiver_first) {
     AddRecvStream(StreamParams::CreateLegacy(kReceiverSsrc));
     std::vector<FakeVideoReceiveStream*> receive_streams =
@@ skipping 430 matching lines @@
 // Ensures that the correct settings are applied to the codec when two temporal
 // layer screencasting is enabled, and that the correct simulcast settings are
 // reapplied when disabling screencasting.
 TEST_F(WebRtcVideoChannel2SimulcastTest,
        DISABLED_TwoTemporalLayerScreencastSettings) {
   // TODO(pbos): Implement.
   FAIL() << "Not implemented.";
 }
 
 }  // namespace cricket