Remove unused field |output_filename| from TestConfig.
Bug: webrtc:8448 Change-Id: I8bb35f6d66112c6590564815e10cb4ec7b516268 Reviewed-on: https://webrtc-review.googlesource.com/49820 Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Commit-Queue: Rasmus Brandt <brandtr@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21960}
This commit is contained in:
committed by
Commit Bot
parent
cb87efd7d3
commit
2018823a68
@ -46,21 +46,14 @@ struct TestConfig {
|
|||||||
void ConfigureSimulcast();
|
void ConfigureSimulcast();
|
||||||
|
|
||||||
size_t NumberOfCores() const;
|
size_t NumberOfCores() const;
|
||||||
|
|
||||||
size_t NumberOfTemporalLayers() const;
|
size_t NumberOfTemporalLayers() const;
|
||||||
|
|
||||||
size_t NumberOfSpatialLayers() const;
|
size_t NumberOfSpatialLayers() const;
|
||||||
|
|
||||||
size_t NumberOfSimulcastStreams() const;
|
size_t NumberOfSimulcastStreams() const;
|
||||||
|
|
||||||
std::vector<FrameType> FrameTypeForFrame(size_t frame_idx) const;
|
std::vector<FrameType> FrameTypeForFrame(size_t frame_idx) const;
|
||||||
|
|
||||||
std::string ToString() const;
|
std::string ToString() const;
|
||||||
|
|
||||||
std::string CodecName() const;
|
std::string CodecName() const;
|
||||||
|
|
||||||
std::string FilenameWithParams() const;
|
std::string FilenameWithParams() const;
|
||||||
|
|
||||||
bool IsAsyncCodec() const;
|
bool IsAsyncCodec() const;
|
||||||
|
|
||||||
// Plain name of YUV file to process without file extension.
|
// Plain name of YUV file to process without file extension.
|
||||||
@ -69,10 +62,6 @@ struct TestConfig {
|
|||||||
// File to process. This must be a video file in the YUV format.
|
// File to process. This must be a video file in the YUV format.
|
||||||
std::string input_filename;
|
std::string input_filename;
|
||||||
|
|
||||||
// File to write to during processing for the test. Will be a video file in
|
|
||||||
// the YUV format.
|
|
||||||
std::string output_filename;
|
|
||||||
|
|
||||||
// Number of frames to process.
|
// Number of frames to process.
|
||||||
size_t num_frames = 0;
|
size_t num_frames = 0;
|
||||||
|
|
||||||
|
|||||||
@ -40,8 +40,6 @@ class VideoProcessorIntegrationTestLibvpx
|
|||||||
VideoProcessorIntegrationTestLibvpx() {
|
VideoProcessorIntegrationTestLibvpx() {
|
||||||
config_.filename = "foreman_cif";
|
config_.filename = "foreman_cif";
|
||||||
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
||||||
config_.output_filename =
|
|
||||||
TempFilename(OutputPath(), "videoprocessor_integrationtest_libvpx");
|
|
||||||
config_.num_frames = kNumFramesLong;
|
config_.num_frames = kNumFramesLong;
|
||||||
// Only allow encoder/decoder to use single core, for predictability.
|
// Only allow encoder/decoder to use single core, for predictability.
|
||||||
config_.use_single_core = true;
|
config_.use_single_core = true;
|
||||||
|
|||||||
@ -30,8 +30,6 @@ class VideoProcessorIntegrationTestMediaCodec
|
|||||||
VideoProcessorIntegrationTestMediaCodec() {
|
VideoProcessorIntegrationTestMediaCodec() {
|
||||||
config_.filename = "foreman_cif";
|
config_.filename = "foreman_cif";
|
||||||
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
||||||
config_.output_filename =
|
|
||||||
TempFilename(OutputPath(), "videoprocessor_integrationtest_mediacodec");
|
|
||||||
config_.num_frames = kForemanNumFrames;
|
config_.num_frames = kForemanNumFrames;
|
||||||
config_.hw_encoder = true;
|
config_.hw_encoder = true;
|
||||||
config_.hw_decoder = true;
|
config_.hw_decoder = true;
|
||||||
|
|||||||
@ -37,8 +37,6 @@ class VideoProcessorIntegrationTestOpenH264
|
|||||||
VideoProcessorIntegrationTestOpenH264() {
|
VideoProcessorIntegrationTestOpenH264() {
|
||||||
config_.filename = "foreman_cif";
|
config_.filename = "foreman_cif";
|
||||||
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
||||||
config_.output_filename =
|
|
||||||
TempFilename(OutputPath(), "videoprocessor_integrationtest_libvpx");
|
|
||||||
config_.num_frames = kNumFrames;
|
config_.num_frames = kNumFrames;
|
||||||
// Only allow encoder/decoder to use single core, for predictability.
|
// Only allow encoder/decoder to use single core, for predictability.
|
||||||
config_.use_single_core = true;
|
config_.use_single_core = true;
|
||||||
|
|||||||
@ -61,8 +61,6 @@ class VideoProcessorIntegrationTestParameterized
|
|||||||
const std::string& filename) {
|
const std::string& filename) {
|
||||||
config_.filename = filename;
|
config_.filename = filename;
|
||||||
config_.input_filename = ResourcePath(filename, "yuv");
|
config_.input_filename = ResourcePath(filename, "yuv");
|
||||||
config_.output_filename =
|
|
||||||
TempFilename(OutputPath(), "plot_videoprocessor_integrationtest");
|
|
||||||
config_.use_single_core = kUseSingleCore;
|
config_.use_single_core = kUseSingleCore;
|
||||||
config_.measure_cpu = kMeasureCpu;
|
config_.measure_cpu = kMeasureCpu;
|
||||||
config_.hw_encoder = hw_codec_;
|
config_.hw_encoder = hw_codec_;
|
||||||
|
|||||||
@ -29,8 +29,6 @@ class VideoProcessorIntegrationTestVideoToolbox
|
|||||||
VideoProcessorIntegrationTestVideoToolbox() {
|
VideoProcessorIntegrationTestVideoToolbox() {
|
||||||
config_.filename = "foreman_cif";
|
config_.filename = "foreman_cif";
|
||||||
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
config_.input_filename = ResourcePath(config_.filename, "yuv");
|
||||||
config_.output_filename = TempFilename(
|
|
||||||
OutputPath(), "videoprocessor_integrationtest_videotoolbox");
|
|
||||||
config_.num_frames = kForemanNumFrames;
|
config_.num_frames = kForemanNumFrames;
|
||||||
config_.hw_encoder = true;
|
config_.hw_encoder = true;
|
||||||
config_.hw_decoder = true;
|
config_.hw_decoder = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user