zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove pc level test framework redundant code.

Browse Source 
After the migration to passing frame video source implementation directly, part of the peer connection framework code became redundant. Removing screen_share_config and capturing_device_index from the VideoConfig is to be done in later reviews.

Bug: webrtc:11534
Change-Id: I7a8ea85d26d00fb5bfe7ec0d2facef9c44a0f749
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174541
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31178}
This commit is contained in:
Andrey Logvin
2020-05-07 07:19:15 +00:00
committed by Commit Bot
parent d6b10943c7
commit 1e83d34fc1
7 changed files with 11 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/BUILD.gn
View File

@ -483,6 +483,7 @@ rtc_library("create_peer_connection_quality_test_frame_generator") {
":create_frame_generator",
":frame_generator_api",
":peer_connection_quality_test_fixture_api",
"../rtc_base:checks",
"../test:fileutils",
"//third_party/abseil-cpp/absl/types:optional",
]

3
api/test/create_peer_connection_quality_test_frame_generator.cc
View File

@ -15,6 +15,7 @@
#include "api/test/create_frame_generator.h"
#include "api/test/peerconnection_quality_test_fixture.h"
#include "rtc_base/checks.h"
#include "test/testsupport/file_utils.h"
namespace webrtc {
@ -92,9 +93,9 @@ std::unique_ptr<test::FrameGeneratorInterface> CreateScreenShareFrameGenerator(
screen_share_config.slide_change_interval.seconds() * video_config.fps);
}
// |pause_duration| is nonnegative. It is validated in ValidateParams(...).
TimeDelta pause_duration = screen_share_config.slide_change_interval -
screen_share_config.scrolling_params->duration;
RTC_DCHECK(pause_duration >= TimeDelta::Zero());
return test::CreateScrollingInputFromYuvFilesFrameGenerator(
Clock::GetRealTimeClock(), slides,
screen_share_config.scrolling_params->source_width,

10
api/test/create_peer_connection_quality_test_frame_generator.h
View File

@ -20,16 +20,6 @@
namespace webrtc {
namespace webrtc_pc_e2e {
// Validates that ScreeanShare frame generator can be created based on the
// screen_share_config.
// This function is temporarily added to the public interface and will be
// removed from here after refactoring is done.
// TODO(landrey) remove from the header file
void ValidateScreenShareConfig(
const PeerConnectionE2EQualityTestFixture::VideoConfig& video_config,
const PeerConnectionE2EQualityTestFixture::ScreenShareConfig&
screen_share_config);
// Creates a frame generator that produces frames with small squares that move
// randomly towards the lower right corner. |type| has the default value
// FrameGeneratorInterface::OutputType::I420. video_config specifies frame

19
api/test/peerconnection_quality_test_fixture.h
View File

@ -170,23 +170,10 @@ class PeerConnectionE2EQualityTestFixture {
// Have to be unique among all specified configs for all peers in the call.
// Will be auto generated if omitted.
absl::optional<std::string> stream_label;
// You can specify one of |generator|, |input_file_name|,
// |screen_share_config| and |capturing_device_index|.
// If none of them are specified and config is added to the PeerConfigurer
// without specifying any video source, then |generator| will be set to
// VideoGeneratorType::kDefault.
// If video source implementation is specified,
// then it will be used as video source regardless of other
// options. Please consider this way unless you are using
// |capturing_device_index| option, since the possibility of using other
// three is about to be removed.
// If specified generator of this type will be used to produce input video.
absl::optional<VideoGeneratorType> generator;
// If specified this file will be used as input. Input video will be played
// in a circle.
absl::optional<std::string> input_file_name;
// If specified screen share video stream will be created as input.
// If set, determines whether VideoTrackInterface::ContentHint::kText is set
// for the current video track.
// TODO(landrey) replace by use_text_content_hint boolean field.
absl::optional<ScreenShareConfig> screen_share_config;
// If specified this capturing device will be used to get input video. The
// |capturing_device_index| is the index of required capturing device in OS