Making FakeNetworkPipe demux audio and video packets.

webrtc/video/video_quality_test.h

 /*
  *  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.
  */
 #ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
 #define WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/frame_generator.h"
 #include "webrtc/test/testsupport/trace_to_stderr.h"
 
 namespace webrtc {
 
+// Helper class to ensure we deliver correct media_type to the receiving call.

[nisse-webrtc, 2017/04/04 09:57:28]

I wasn't aware of this class.

I think we can delete this one, and instead make sure that the underlying
FakeNetworkPipe is configured with the right media type.

+class MediaTypePacketReceiver : public PacketReceiver {
+ public:
+  MediaTypePacketReceiver(PacketReceiver* packet_receiver, MediaType media_type)
+      : packet_receiver_(packet_receiver), media_type_(media_type) {}
+
+  DeliveryStatus DeliverPacket(MediaType media_type,
+                               const uint8_t* packet,
+                               size_t length,
+                               const PacketTime& packet_time) override {
+    return packet_receiver_->DeliverPacket(media_type_, packet, length,
+                                           packet_time);
+  }
+
+ private:
+  PacketReceiver* packet_receiver_;
+  const MediaType media_type_;
+
+  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaTypePacketReceiver);
+};
+
 class VideoQualityTest : public test::CallTest {
  public:
   // Parameters are grouped into smaller structs to make it easier to set
   // the desired elements and skip unused, using aggregate initialization.
   // Unfortunately, C++11 (as opposed to C11) doesn't support unnamed structs,
   // which makes the implementation of VideoQualityTest a bit uglier.
   struct Params {
     Params();
     ~Params();
     struct CallConfig {
@@ skipping 112 matching lines @@
   int send_logs_;
 
   VideoSendStream::DegradationPreference degradation_preference_ =
       VideoSendStream::DegradationPreference::kMaintainFramerate;
   Params params_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_