| Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| index fadecb1e5362f5f89195f998a31bbafe365ec40c..1525d27621e87135bc39cd3d3540077d0d702771 100644
|
| --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| @@ -48,8 +48,8 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecH264, 1, false, false, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -68,8 +68,7 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
|
|
|
| #if !defined(RTC_DISABLE_VP9)
|
| // VP9: Run with no packet loss and fixed bitrate. Quality should be very high.
|
| -// One key frame (first frame only) in sequence. Setting |key_frame_interval|
|
| -// to -1 below means no periodic key frames in test.
|
| +// One key frame (first frame only) in sequence.
|
| TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
|
| // Bit rate and frame rate profile.
|
| RateProfile rate_profile;
|
| @@ -77,8 +76,8 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP9, 1, false, false, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -99,8 +98,8 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.05f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.05f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP9, 1, false, false, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -125,8 +124,8 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
|
| rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
|
| rate_profile.num_frames = kNumFramesLong;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP9, 1, false, false, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -157,8 +156,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
| rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
|
| rate_profile.num_frames = kNumFramesLong;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP9, 1, false, false, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -180,8 +179,8 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP9, 1, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -204,8 +203,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
| rate_profile.frame_index_rate_update[1] = kNumFramesLong + 1;
|
| rate_profile.num_frames = kNumFramesLong;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP9, 1, false, false, true, true,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -232,8 +231,8 @@ TEST_F(VideoProcessorIntegrationTest, ProcessZeroPacketLoss) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP8, 1, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -254,8 +253,8 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLoss) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.05f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.05f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP8, 1, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -276,8 +275,8 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.1f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.1f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP8, 1, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -300,8 +299,8 @@ TEST_F(VideoProcessorIntegrationTest, ProcessInBatchMode) {
|
| rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
|
| rate_profile.num_frames = kNumFramesShort;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, true /* batch_mode */);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, true /* batch_mode */);
|
| SetCodecSettings(&config_, kVideoCodecVP8, 1, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -344,8 +343,8 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) {
|
| rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
|
| rate_profile.num_frames = kNumFramesLong;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP8, 1, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -384,8 +383,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
| rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
|
| rate_profile.num_frames = kNumFramesLong;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP8, 1, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
| @@ -419,8 +418,8 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossTemporalLayersVP8) {
|
| rate_profile.frame_index_rate_update[2] = kNumFramesLong + 1;
|
| rate_profile.num_frames = kNumFramesLong;
|
| // Codec/network settings.
|
| - SetProcessParams(&config_, kHwCodec, kUseSingleCore, 0.0f, -1, kForemanCif,
|
| - kVerboseLogging, kBatchMode);
|
| + SetTestConfig(&config_, kHwCodec, kUseSingleCore, 0.0f, kForemanCif,
|
| + kVerboseLogging, kBatchMode);
|
| SetCodecSettings(&config_, kVideoCodecVP8, 3, false, true, true, false,
|
| kResilienceOn, kCifWidth, kCifHeight);
|
| // Thresholds for expected quality.
|
|
|