Move rtp dump writer from quality test to test transport

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.
  */
 
 #include <memory>
 
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/layer_filtering_transport.h"
+#include "webrtc/test/rtp_file_writer.h"
 
 namespace webrtc {
 namespace test {
 
 LayerFilteringTransport::LayerFilteringTransport(
     SingleThreadedTaskQueueForTesting* task_queue,
     const FakeNetworkPipe::Config& config,
     Call* send_call,
     uint8_t vp8_video_payload_type,
     uint8_t vp9_video_payload_type,
     int selected_tl,
     int selected_sl,
-    const std::map<uint8_t, MediaType>& payload_type_map)
+    const std::map<uint8_t, MediaType>& payload_type_map,
+    std::unique_ptr<test::RtpFileWriter> rtp_file_writer)
     : DirectTransport(task_queue, config, send_call, payload_type_map),
       vp8_video_payload_type_(vp8_video_payload_type),
       vp9_video_payload_type_(vp9_video_payload_type),
       selected_tl_(selected_tl),
       selected_sl_(selected_sl),
-      discarded_last_packet_(false) {}
+      discarded_last_packet_(false),
+      receiver_(nullptr),
+      start_ms_(rtc::TimeMillis()),
+      rtp_file_writer_(std::move(rtp_file_writer)) {
+  DirectTransport::SetReceiver(this);
+}
 
 bool LayerFilteringTransport::DiscardedLastPacket() const {
   return discarded_last_packet_;
 }
 
 bool LayerFilteringTransport::SendRtp(const uint8_t* packet,
                                       size_t length,
                                       const PacketOptions& options) {
+
   if (selected_tl_ == -1 && selected_sl_ == -1) {
     // Nothing to change, forward the packet immediately.
     return test::DirectTransport::SendRtp(packet, length, options);
   }
 
   bool set_marker_bit = false;
   RtpUtility::RtpHeaderParser parser(packet, length);
   RTPHeader header;
   parser.Parse(&header);
-
   RTC_DCHECK_LE(length, IP_PACKET_SIZE);
   uint8_t temp_buffer[IP_PACKET_SIZE];
   memcpy(temp_buffer, packet, length);
 
   if (header.payloadType == vp8_video_payload_type_ ||
       header.payloadType == vp9_video_payload_type_) {
     const uint8_t* payload = packet + header.headerLength;
     RTC_DCHECK_GT(length, header.headerLength);
     const size_t payload_length = length - header.headerLength;
     RTC_DCHECK_GT(payload_length, header.paddingLength);
@@ skipping 32 matching lines @@
 
   // 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;
 
   return test::DirectTransport::SendRtp(temp_buffer, length, options);
 }
 
+void LayerFilteringTransport::SetReceiver(PacketReceiver* receiver) {
+  receiver_ = receiver;
+}
+
+PacketReceiver::DeliveryStatus LayerFilteringTransport::DeliverPacket(

[stefan-webrtc, 2017/08/24 12:52:18]

Maybe we should make this a feature of DirectTransport instead?

+    MediaType media_type,
+    const uint8_t* packet,
+    size_t length,
+    const PacketTime& packet_time) {
+  if (rtp_file_writer_.get()) {
+    RtpPacket rtp_packet;
+    RTC_DCHECK_LE(length, IP_PACKET_SIZE);
+    memcpy(rtp_packet.data, packet, length);
+    rtp_packet.length = length;
+    rtp_packet.original_length = length;
+    rtp_packet.time_ms = rtc::TimeMillis() - start_ms_;
+    rtp_file_writer_->WritePacket(&rtp_packet);
+  }
+
+  if (!receiver_)
+    return PacketReceiver::DELIVERY_PACKET_ERROR;
+  return receiver_->DeliverPacket(media_type, packet, length, packet_time);
+}
+
 }  // namespace test
 }  // namespace webrtc