Using different sequence numbers for different SSRCs

webrtc/test/layer_filtering_transport.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 11 matching lines @@
 LayerFilteringTransport::LayerFilteringTransport(
     const FakeNetworkPipe::Config& config,
     uint8_t vp8_video_payload_type,
     uint8_t vp9_video_payload_type,
     uint8_t tl_discard_threshold,
     uint8_t sl_discard_threshold)
     : test::DirectTransport(config),
       vp8_video_payload_type_(vp8_video_payload_type),
       vp9_video_payload_type_(vp9_video_payload_type),
       tl_discard_threshold_(tl_discard_threshold),
-      sl_discard_threshold_(sl_discard_threshold),
-      current_seq_num_(10000) {
-}  // TODO(ivica): random seq num?
+      sl_discard_threshold_(sl_discard_threshold) {
+}
+
+uint16_t LayerFilteringTransport::NextSequenceNumber(uint32_t ssrc) {
+  auto it = current_seq_nums_.find(ssrc);
+  if (it == current_seq_nums_.end())
+    return current_seq_nums_[ssrc] = 10000;
+  else

[sprang_webrtc, 2015/09/23 13:58:19]

don't need this else

[ivica, 2015/10/07 12:07:41]

Done.

+    return ++it->second;
+}
 
 bool LayerFilteringTransport::SendRtp(const uint8_t* packet, size_t length) {
   if (tl_discard_threshold_ == 0 && sl_discard_threshold_ == 0) {
     // Nothing to change, forward the packet immediately.
     return test::DirectTransport::SendRtp(packet, length);
   }
 
   bool set_marker_bit = false;
   rtc::scoped_ptr<RtpHeaderParser> parser(RtpHeaderParser::Create());
   RTPHeader header;
@@ skipping 36 matching lines @@
   }
 
   uint8_t temp_buffer[IP_PACKET_SIZE];
   memcpy(temp_buffer, packet, length);
 
   // We are discarding some of the packets (specifically, whole layers), so
   // make sure the marker bit is set properly, and that sequence numbers are
   // continuous.
   if (set_marker_bit) {
     temp_buffer[1] |= kRtpMarkerBitMask;
   }

[sprang_webrtc, 2015/09/23 13:58:19]

Remove {}

[ivica, 2015/10/07 12:07:41]

Done.

-  ByteWriter<uint16_t>::WriteBigEndian(&temp_buffer[2], current_seq_num_);
 
-  ++current_seq_num_;  // Increase only if packet not discarded.
-
+  uint16_t seq_num = NextSequenceNumber(header.ssrc);
+  ByteWriter<uint16_t>::WriteBigEndian(&temp_buffer[2], seq_num);
   return test::DirectTransport::SendRtp(temp_buffer, length);
 }
 
 }  // namespace test
 }  // namespace webrtc