Enabling spatial layers in VP9Impl. Filter layers in the loopback test.

webrtc/video/loopback.cc

 /*
  *  Copyright (c) 2013 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 <stdio.h>
 
 #include <map>
 
 #include "webrtc/video/loopback.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/call.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #include "webrtc/system_wrappers/interface/clock.h"
-#include "webrtc/test/direct_transport.h"
 #include "webrtc/test/encoder_settings.h"
 #include "webrtc/test/fake_encoder.h"
+#include "webrtc/test/layer_filtering_transport.h"
 #include "webrtc/test/run_loop.h"
 #include "webrtc/test/testsupport/trace_to_stderr.h"
 #include "webrtc/test/video_capturer.h"
 #include "webrtc/test/video_renderer.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 namespace test {
 
 static const int kAbsSendTimeExtensionId = 7;
 
 static const uint32_t kSendSsrc = 0x654321;
 static const uint32_t kSendRtxSsrc = 0x654322;
 static const uint32_t kReceiverLocalSsrc = 0x123456;
 
 static const uint8_t kRtxVideoPayloadType = 96;
-static const uint8_t kVideoPayloadType = 124;
+static const uint8_t kVideoPayloadTypeVP8 = 124;
+static const uint8_t kVideoPayloadTypeVP9 = 125;
 
 Loopback::Loopback(const Config& config)
     : config_(config), clock_(Clock::GetRealTimeClock()) {
 }
 
 Loopback::~Loopback() {
 }
 
 void Loopback::Run() {
   rtc::scoped_ptr<test::TraceToStderr> trace_to_stderr_;
@@ skipping 15 matching lines @@
   call_config.bitrate_config.max_bitrate_bps =
       static_cast<int>(config_.max_bitrate_kbps) * 1000;
   rtc::scoped_ptr<Call> call(Call::Create(call_config));
 
   FakeNetworkPipe::Config pipe_config;
   pipe_config.loss_percent = config_.loss_percent;
   pipe_config.link_capacity_kbps = config_.link_capacity_kbps;
   pipe_config.queue_length_packets = config_.queue_size;
   pipe_config.queue_delay_ms = config_.avg_propagation_delay_ms;
   pipe_config.delay_standard_deviation_ms = config_.std_propagation_delay_ms;
-  test::DirectTransport send_transport(pipe_config);
+  LayerFilteringTransport send_transport(
+      pipe_config, kVideoPayloadTypeVP8, kVideoPayloadTypeVP9,
+      static_cast<uint8_t>(config_.tl_discard_threshold),
+      static_cast<uint8_t>(config_.sl_discard_threshold));
+
   // Loopback, call sends to itself.
   send_transport.SetReceiver(call->Receiver());
 
   VideoSendStream::Config send_config(&send_transport);
   send_config.rtp.ssrcs.push_back(kSendSsrc);
   send_config.rtp.rtx.ssrcs.push_back(kSendRtxSsrc);
   send_config.rtp.rtx.payload_type = kRtxVideoPayloadType;
   send_config.rtp.nack.rtp_history_ms = 1000;
   send_config.rtp.extensions.push_back(
       RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId));
 
   send_config.local_renderer = local_preview.get();
   rtc::scoped_ptr<VideoEncoder> encoder;
   if (config_.codec == "VP8") {
     encoder.reset(VideoEncoder::Create(VideoEncoder::kVp8));
   } else if (config_.codec == "VP9") {
     encoder.reset(VideoEncoder::Create(VideoEncoder::kVp9));
   } else {
     // Codec not supported.
     RTC_NOTREACHED() << "Codec not supported!";
     return;
   }
+  const int payload_type =
+      config_.codec == "VP8" ? kVideoPayloadTypeVP8 : kVideoPayloadTypeVP9;
   send_config.encoder_settings.encoder = encoder.get();
   send_config.encoder_settings.payload_name = config_.codec;
-  send_config.encoder_settings.payload_type = kVideoPayloadType;
+  send_config.encoder_settings.payload_type = payload_type;
 
   VideoEncoderConfig encoder_config(CreateEncoderConfig());
 
   VideoSendStream* send_stream =
       call->CreateVideoSendStream(send_config, encoder_config);
 
   rtc::scoped_ptr<test::VideoCapturer> capturer(CreateCapturer(send_stream));
 
   VideoReceiveStream::Config receive_config(&send_transport);
   receive_config.rtp.remote_ssrc = send_config.rtp.ssrcs[0];
   receive_config.rtp.local_ssrc = kReceiverLocalSsrc;
   receive_config.rtp.nack.rtp_history_ms = 1000;
   receive_config.rtp.remb = true;
-  receive_config.rtp.rtx[kVideoPayloadType].ssrc = kSendRtxSsrc;
-  receive_config.rtp.rtx[kVideoPayloadType].payload_type = kRtxVideoPayloadType;
+  receive_config.rtp.rtx[payload_type].ssrc = kSendRtxSsrc;
+  receive_config.rtp.rtx[payload_type].payload_type = kRtxVideoPayloadType;
   receive_config.rtp.extensions.push_back(
       RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId));
   receive_config.renderer = loopback_video.get();
   VideoReceiveStream::Decoder decoder =
       test::CreateMatchingDecoder(send_config.encoder_settings);
   receive_config.decoders.push_back(decoder);
 
   VideoReceiveStream* receive_stream =
       call->CreateVideoReceiveStream(receive_config);
 
@@ skipping 34 matching lines @@
   return encoder_config;
 }
 
 test::VideoCapturer* Loopback::CreateCapturer(VideoSendStream* send_stream) {
   return test::VideoCapturer::Create(send_stream->Input(), config_.width,
                                      config_.height, config_.fps, clock_);
 }
 
 }  // namespace test
 }  // namespace webrtc