Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

Issue 2707763005: Remove codec setting members in VideoProcessorIntegrationTest. Use settings in CodecConfigPars dire… (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
index e1c085ed436e39d0cf5a798fd50f2397a15f7fe0..02a9fa0471539f450a1e724671ae8c40b5e7b35b 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
@@ -142,35 +142,32 @@ class VideoProcessorIntegrationTest : public testing::Test {
}
virtual ~VideoProcessorIntegrationTest() = default;
- void SetUpCodecConfig(const std::string& filename,
- int width,
- int height,
- bool verbose_logging) {
- if (hw_codec_) {
+ void SetUpCodecConfig(const CodecConfigPars& process) {
+ if (process.hw_codec) {
#if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED)
#if defined(WEBRTC_ANDROID)
// In general, external codecs should be destroyed by the factories that
// allocated them. For the particular case of the Android
// MediaCodecVideo{En,De}coderFactory's, however, it turns out that it is
// fine for the std::unique_ptr to destroy the owned codec directly.
- if (codec_type_ == kVideoCodecH264) {
+ if (process.codec_type == kVideoCodecH264) {
sprang_webrtc 2017/02/21 15:21:35 While you're here, can you switch (ehm) this to a
åsapersson 2017/02/21 15:49:33 Done.
encoder_.reset(external_encoder_factory_->CreateVideoEncoder(
cricket::VideoCodec(cricket::kH264CodecName)));
decoder_.reset(
external_decoder_factory_->CreateVideoDecoder(kVideoCodecH264));
- } else if (codec_type_ == kVideoCodecVP8) {
+ } else if (process.codec_type == kVideoCodecVP8) {
encoder_.reset(external_encoder_factory_->CreateVideoEncoder(
cricket::VideoCodec(cricket::kVp8CodecName)));
decoder_.reset(
external_decoder_factory_->CreateVideoDecoder(kVideoCodecVP8));
- } else if (codec_type_ == kVideoCodecVP9) {
+ } else if (process.codec_type == kVideoCodecVP9) {
encoder_.reset(external_encoder_factory_->CreateVideoEncoder(
cricket::VideoCodec(cricket::kVp9CodecName)));
decoder_.reset(
external_decoder_factory_->CreateVideoDecoder(kVideoCodecVP9));
}
#elif defined(WEBRTC_IOS)
- RTC_DCHECK_EQ(kVideoCodecH264, codec_type_)
+ RTC_DCHECK_EQ(kVideoCodecH264, process.codec_type)
<< "iOS HW codecs only support H264.";
encoder_.reset(new H264VideoToolboxEncoder(
cricket::VideoCodec(cricket::kH264CodecName)));
@@ -183,65 +180,71 @@ class VideoProcessorIntegrationTest : public testing::Test {
RTC_DCHECK(decoder_) << "HW decoder not successfully created.";
} else {
// SW codecs.
- if (codec_type_ == kVideoCodecH264) {
+ if (process.codec_type == kVideoCodecH264) {
sprang_webrtc 2017/02/21 15:21:35 dito
åsapersson 2017/02/21 15:49:33 Done.
encoder_.reset(
H264Encoder::Create(cricket::VideoCodec(cricket::kH264CodecName)));
decoder_.reset(H264Decoder::Create());
- } else if (codec_type_ == kVideoCodecVP8) {
+ } else if (process.codec_type == kVideoCodecVP8) {
encoder_.reset(VP8Encoder::Create());
decoder_.reset(VP8Decoder::Create());
- } else if (codec_type_ == kVideoCodecVP9) {
+ } else if (process.codec_type == kVideoCodecVP9) {
encoder_.reset(VP9Encoder::Create());
decoder_.reset(VP9Decoder::Create());
}
}
- VideoCodingModule::Codec(codec_type_, &codec_settings_);
+ VideoCodingModule::Codec(process.codec_type, &codec_settings_);
// Configure input filename.
- config_.input_filename = test::ResourcePath(filename, "yuv");
- if (verbose_logging)
- printf("Filename: %s\n", filename.c_str());
+ config_.input_filename = test::ResourcePath(process.filename, "yuv");
+ if (process.verbose_logging)
+ printf("Filename: %s\n", process.filename.c_str());
// Generate an output filename in a safe way.
config_.output_filename = test::TempFilename(
test::OutputPath(), "videoprocessor_integrationtest");
- config_.frame_length_in_bytes = CalcBufferSize(kI420, width, height);
- config_.verbose = verbose_logging;
+ config_.frame_length_in_bytes =
+ CalcBufferSize(kI420, process.width, process.height);
+ config_.verbose = process.verbose_logging;
// Only allow encoder/decoder to use single core, for predictability.
config_.use_single_core = true;
// Key frame interval and packet loss are set for each test.
- config_.keyframe_interval = key_frame_interval_;
+ config_.keyframe_interval = process.key_frame_interval;
config_.networking_config.packet_loss_probability = packet_loss_;
// Configure codec settings.
config_.codec_settings = &codec_settings_;
config_.codec_settings->startBitrate = start_bitrate_;
- config_.codec_settings->width = width;
- config_.codec_settings->height = height;
+ config_.codec_settings->width = process.width;
+ config_.codec_settings->height = process.height;
// These features may be set depending on the test.
switch (config_.codec_settings->codecType) {
case kVideoCodecH264:
- config_.codec_settings->H264()->frameDroppingOn = frame_dropper_on_;
+ config_.codec_settings->H264()->frameDroppingOn =
+ process.frame_dropper_on;
config_.codec_settings->H264()->keyFrameInterval =
kBaseKeyFrameInterval;
break;
case kVideoCodecVP8:
config_.codec_settings->VP8()->errorConcealmentOn =
- error_concealment_on_;
- config_.codec_settings->VP8()->denoisingOn = denoising_on_;
+ process.error_concealment_on;
+ config_.codec_settings->VP8()->denoisingOn = process.denoising_on;
config_.codec_settings->VP8()->numberOfTemporalLayers =
num_temporal_layers_;
- config_.codec_settings->VP8()->frameDroppingOn = frame_dropper_on_;
- config_.codec_settings->VP8()->automaticResizeOn = spatial_resize_on_;
+ config_.codec_settings->VP8()->frameDroppingOn =
+ process.frame_dropper_on;
+ config_.codec_settings->VP8()->automaticResizeOn =
+ process.spatial_resize_on;
config_.codec_settings->VP8()->keyFrameInterval = kBaseKeyFrameInterval;
break;
case kVideoCodecVP9:
- config_.codec_settings->VP9()->denoisingOn = denoising_on_;
+ config_.codec_settings->VP9()->denoisingOn = process.denoising_on;
config_.codec_settings->VP9()->numberOfTemporalLayers =
num_temporal_layers_;
- config_.codec_settings->VP9()->frameDroppingOn = frame_dropper_on_;
- config_.codec_settings->VP9()->automaticResizeOn = spatial_resize_on_;
+ config_.codec_settings->VP9()->frameDroppingOn =
+ process.frame_dropper_on;
+ config_.codec_settings->VP9()->automaticResizeOn =
+ process.spatial_resize_on;
config_.codec_settings->VP9()->keyFrameInterval = kBaseKeyFrameInterval;
break;
default:
@@ -448,18 +451,10 @@ class VideoProcessorIntegrationTest : public testing::Test {
CodecConfigPars process,
RateControlMetrics* rc_metrics) {
// Codec/config settings.
- codec_type_ = process.codec_type;
- hw_codec_ = process.hw_codec;
start_bitrate_ = rate_profile.target_bit_rate[0];
packet_loss_ = process.packet_loss;
- key_frame_interval_ = process.key_frame_interval;
num_temporal_layers_ = process.num_temporal_layers;
- error_concealment_on_ = process.error_concealment_on;
- denoising_on_ = process.denoising_on;
- frame_dropper_on_ = process.frame_dropper_on;
- spatial_resize_on_ = process.spatial_resize_on;
- SetUpCodecConfig(process.filename, process.width, process.height,
- process.verbose_logging);
+ SetUpCodecConfig(process);
// Update the layers and the codec with the initial rates.
bit_rate_ = rate_profile.target_bit_rate[0];
frame_rate_ = rate_profile.input_frame_rate[0];
@@ -678,15 +673,8 @@ class VideoProcessorIntegrationTest : public testing::Test {
float start_bitrate_;
// Codec and network settings.
- VideoCodecType codec_type_;
- bool hw_codec_;
float packet_loss_;
int num_temporal_layers_;
- int key_frame_interval_;
- bool error_concealment_on_;
- bool denoising_on_;
- bool frame_dropper_on_;
- bool spatial_resize_on_;
};
} // namespace test
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698