Refactor SimulcastTestUtility into SimulcastTestFixture{,Impl}

This will allow exposing the interface to downstream users that
want to test VP8 simulcast. No functional changes to the tests
themselves are expected.

Bug: webrtc:9281
Change-Id: I4128b8f35a4412c5b330cf55c8dc0e173d4570da
Reviewed-on: https://webrtc-review.googlesource.com/77361
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23469}
This commit is contained in:
Rasmus Brandt
2018-05-31 12:53:00 +02:00
committed by Commit Bot
parent 29921cf097
commit 0cedc054a2
15 changed files with 1298 additions and 956 deletions

View File

@ -283,6 +283,33 @@ if (rtc_include_tests) {
}
}
rtc_source_set("simulcast_test_fixture_api") {
visibility = [ "*" ]
testonly = true
sources = [
"test/simulcast_test_fixture.h",
]
}
rtc_source_set("create_simulcast_test_fixture_api") {
visibility = [ "*" ]
testonly = true
sources = [
"test/create_simulcast_test_fixture.cc",
"test/create_simulcast_test_fixture.h",
]
deps = [
":simulcast_test_fixture_api",
"../modules/video_coding:simulcast_test_fixture_impl",
"../rtc_base:rtc_base_approved",
"video_codecs:video_codecs_api",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("videocodec_test_fixture_api") {
visibility = [ "*" ]
testonly = true

View File

@ -0,0 +1,31 @@
/*
* Copyright (c) 2018 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 "api/test/create_simulcast_test_fixture.h"
#include <memory>
#include <utility>
#include "api/test/simulcast_test_fixture.h"
#include "modules/video_coding/codecs/vp8/simulcast_test_fixture_impl.h"
#include "rtc_base/ptr_util.h"
namespace webrtc {
namespace test {
std::unique_ptr<SimulcastTestFixture> CreateSimulcastTestFixture(
std::unique_ptr<VideoEncoderFactory> encoder_factory,
std::unique_ptr<VideoDecoderFactory> decoder_factory) {
return rtc::MakeUnique<SimulcastTestFixtureImpl>(std::move(encoder_factory),
std::move(decoder_factory));
}
} // namespace test
} // namespace webrtc

View File

@ -0,0 +1,30 @@
/*
* Copyright (c) 2018 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 API_TEST_CREATE_SIMULCAST_TEST_FIXTURE_H_
#define API_TEST_CREATE_SIMULCAST_TEST_FIXTURE_H_
#include <memory>
#include "api/test/simulcast_test_fixture.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
namespace webrtc {
namespace test {
std::unique_ptr<SimulcastTestFixture> CreateSimulcastTestFixture(
std::unique_ptr<VideoEncoderFactory> encoder_factory,
std::unique_ptr<VideoDecoderFactory> decoder_factory);
} // namespace test
} // namespace webrtc
#endif // API_TEST_CREATE_SIMULCAST_TEST_FIXTURE_H_

View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2018 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 API_TEST_SIMULCAST_TEST_FIXTURE_H_
#define API_TEST_SIMULCAST_TEST_FIXTURE_H_
namespace webrtc {
namespace test {
class SimulcastTestFixture {
public:
virtual ~SimulcastTestFixture() = default;
virtual void TestKeyFrameRequestsOnAllStreams() = 0;
virtual void TestPaddingAllStreams() = 0;
virtual void TestPaddingTwoStreams() = 0;
virtual void TestPaddingTwoStreamsOneMaxedOut() = 0;
virtual void TestPaddingOneStream() = 0;
virtual void TestPaddingOneStreamTwoMaxedOut() = 0;
virtual void TestSendAllStreams() = 0;
virtual void TestDisablingStreams() = 0;
virtual void TestActiveStreams() = 0;
virtual void TestSwitchingToOneStream() = 0;
virtual void TestSwitchingToOneOddStream() = 0;
virtual void TestSwitchingToOneSmallStream() = 0;
virtual void TestSpatioTemporalLayers333PatternEncoder() = 0;
virtual void TestSpatioTemporalLayers321PatternEncoder() = 0;
virtual void TestStrideEncodeDecode() = 0;
};
} // namespace test
} // namespace webrtc
#endif // API_TEST_SIMULCAST_TEST_FIXTURE_H_