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

Rename config structs in VideoProcessor tests.

Browse Source 
This CL harmonizes and improves the naming of the config structs
in the VideoProcessor tests. It should have no functional implications.

CodecConfigPars -> CodecParams:
  This struct mainly contains codec settings.

QualityMetrics -> QualityThresholds:
  This struct contains thresholds against which the calculated
  PSNR and SSIM metrics are compared to.

RateControlMetrics -> RateControlThresholds:
  This struct contains thresholds against which the calculated
  rate control metrics are compared to.

BUG=webrtc:6634

Review-Url: https://codereview.webrtc.org/2703333004
Cr-Commit-Position: refs/heads/master@{#16794}
This commit is contained in:
brandtr
2017-02-23 02:49:16 -08:00
committed by Commit bot
parent f166e1bcab
commit 1e46434e7e
3 changed files with 347 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc
View File

@ -53,36 +53,36 @@ class PlotVideoProcessorIntegrationTest
void RunTest(int width, int height, const std::string& filename) { void RunTest(int width, int height, const std::string& filename) {
// Bitrate and frame rate profile. // Bitrate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, SetRateProfile(&rate_profile,
0, // update_index 0, // update_index
bitrate_, framerate_, bitrate_, framerate_,
0); // frame_index_rate_update 0); // frame_index_rate_update
rate_profile.frame_index_rate_update[1] = kNumFramesLong + 1; rate_profile.frame_index_rate_update[1] = kNumFramesLong + 1;
rate_profile.num_frames = kNumFramesLong; rate_profile.num_frames = kNumFramesLong;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters( SetCodecParams(&process_settings, codec_type_, kHwCodec, kUseSingleCore,
&process_settings, codec_type_, kHwCodec, kUseSingleCore, kPacketLoss, kPacketLoss,
-1, // key_frame_interval -1, // key_frame_interval
1, // num_temporal_layers 1, // num_temporal_layers
kErrorConcealmentOn, kDenoisingOn, kFrameDropperOn, kSpatialResizeOn, kErrorConcealmentOn, kDenoisingOn, kFrameDropperOn,
width, height, filename, kVerboseLogging); kSpatialResizeOn, width, height, filename, kVerboseLogging);
// Metrics for expected quality (PSNR avg, PSNR min, SSIM avg, SSIM min). // Thresholds for expected quality (PSNR avg, PSNR min, SSIM avg, SSIM min).
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 15.0, 10.0, 0.2, 0.1); SetQualityThresholds(&quality_thresholds, 15.0, 10.0, 0.2, 0.1);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, SetRateControlThresholds(rc_thresholds,
0, // update_index 0, // update_index
300, // max_num_dropped_frames, 300, // max_num_dropped_frames,
400, // max_key_frame_size_mismatch 400, // max_key_frame_size_mismatch
200, // max_delta_frame_size_mismatch 200, // max_delta_frame_size_mismatch
100, // max_encoding_rate_mismatch 100, // max_encoding_rate_mismatch
300, // max_time_hit_target 300, // max_time_hit_target
0, // num_spatial_resizes 0, // num_spatial_resizes
1); // num_key_frames 1); // num_key_frames
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, &kVisualizationParams); rc_thresholds, &kVisualizationParams);
} }
const int bitrate_; const int bitrate_;
const int framerate_; const int framerate_;

374
webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
View File

@ -31,23 +31,23 @@ const bool kUseSingleCore = true;
// with H264. Therefore ProcessXPercentPacketLossH264, X != 0, unittests have // with H264. Therefore ProcessXPercentPacketLossH264, X != 0, unittests have
// not been added. // not been added.
TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) { TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 500, 30, 0); SetRateProfile(&rate_profile, 0, 500, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1; rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
rate_profile.num_frames = kNumFramesShort; rate_profile.num_frames = kNumFramesShort;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecH264, kHwCodec, SetCodecParams(&process_settings, kVideoCodecH264, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, false, true, false); 0.0f, -1, 1, false, false, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 35.0, 25.0, 0.93, 0.70); SetQualityThresholds(&quality_thresholds, 35.0, 25.0, 0.93, 0.70);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 2, 60, 20, 10, 20, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 2, 60, 20, 10, 20, 0, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
#endif // defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS) #endif // defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS)
@ -60,45 +60,45 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
// One key frame (first frame only) in sequence. Setting |key_frame_interval| // One key frame (first frame only) in sequence. Setting |key_frame_interval|
// to -1 below means no periodic key frames in test. // to -1 below means no periodic key frames in test.
TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) { TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 500, 30, 0); SetRateProfile(&rate_profile, 0, 500, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1; rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
rate_profile.num_frames = kNumFramesShort; rate_profile.num_frames = kNumFramesShort;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP9, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, false, true, false); 0.0f, -1, 1, false, false, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 37.0, 36.0, 0.93, 0.92); SetQualityThresholds(&quality_thresholds, 37.0, 36.0, 0.93, 0.92);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 40, 20, 10, 20, 0, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP9: Run with 5% packet loss and fixed bitrate. Quality should be a bit // VP9: Run with 5% packet loss and fixed bitrate. Quality should be a bit
// lower. One key frame (first frame only) in sequence. // lower. One key frame (first frame only) in sequence.
TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) { TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 500, 30, 0); SetRateProfile(&rate_profile, 0, 500, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1; rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
rate_profile.num_frames = kNumFramesShort; rate_profile.num_frames = kNumFramesShort;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP9, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.05f, -1, 1, false, false, true, false); 0.05f, -1, 1, false, false, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 17.0, 14.0, 0.45, 0.36); SetQualityThresholds(&quality_thresholds, 17.0, 14.0, 0.45, 0.36);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 40, 20, 10, 20, 0, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP9: Run with no packet loss, with varying bitrate (3 rate updates): // VP9: Run with no packet loss, with varying bitrate (3 rate updates):
@ -106,27 +106,27 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) {
// target rate/per-frame bandwidth (for each rate update) is within limits. // target rate/per-frame bandwidth (for each rate update) is within limits.
// One key frame (first frame only) in sequence. // One key frame (first frame only) in sequence.
TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) { TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 200, 30, 0); SetRateProfile(&rate_profile, 0, 200, 30, 0);
SetRateProfilePars(&rate_profile, 1, 700, 30, 100); SetRateProfile(&rate_profile, 1, 700, 30, 100);
SetRateProfilePars(&rate_profile, 2, 500, 30, 200); SetRateProfile(&rate_profile, 2, 500, 30, 200);
rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1; rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
rate_profile.num_frames = kNumFramesLong; rate_profile.num_frames = kNumFramesLong;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP9, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, false, true, false); 0.0f, -1, 1, false, false, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 35.5, 30.0, 0.90, 0.85); SetQualityThresholds(&quality_thresholds, 35.5, 30.0, 0.90, 0.85);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[3]; RateControlThresholds rc_thresholds[3];
SetRateControlMetrics(rc_metrics, 0, 0, 30, 20, 20, 30, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 30, 20, 20, 30, 0, 1);
SetRateControlMetrics(rc_metrics, 1, 2, 0, 20, 20, 60, 0, 0); SetRateControlThresholds(rc_thresholds, 1, 2, 0, 20, 20, 60, 0, 0);
SetRateControlMetrics(rc_metrics, 2, 0, 0, 25, 20, 40, 0, 0); SetRateControlThresholds(rc_thresholds, 2, 0, 0, 25, 20, 40, 0, 0);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP9: Run with no packet loss, with an update (decrease) in frame rate. // VP9: Run with no packet loss, with an update (decrease) in frame rate.
@ -139,48 +139,48 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
TEST_F(VideoProcessorIntegrationTest, TEST_F(VideoProcessorIntegrationTest,
ProcessNoLossChangeFrameRateFrameDropVP9) { ProcessNoLossChangeFrameRateFrameDropVP9) {
config_.networking_config.packet_loss_probability = 0; config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 100, 24, 0); SetRateProfile(&rate_profile, 0, 100, 24, 0);
SetRateProfilePars(&rate_profile, 1, 100, 15, 100); SetRateProfile(&rate_profile, 1, 100, 15, 100);
SetRateProfilePars(&rate_profile, 2, 100, 10, 200); SetRateProfile(&rate_profile, 2, 100, 10, 200);
rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1; rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
rate_profile.num_frames = kNumFramesLong; rate_profile.num_frames = kNumFramesLong;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP9, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, false, true, false); 0.0f, -1, 1, false, false, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 31.5, 18.0, 0.80, 0.43); SetQualityThresholds(&quality_thresholds, 31.5, 18.0, 0.80, 0.43);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[3]; RateControlThresholds rc_thresholds[3];
SetRateControlMetrics(rc_metrics, 0, 38, 50, 75, 15, 45, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 38, 50, 75, 15, 45, 0, 1);
SetRateControlMetrics(rc_metrics, 1, 10, 0, 40, 10, 30, 0, 0); SetRateControlThresholds(rc_thresholds, 1, 10, 0, 40, 10, 30, 0, 0);
SetRateControlMetrics(rc_metrics, 2, 5, 0, 30, 5, 20, 0, 0); SetRateControlThresholds(rc_thresholds, 2, 5, 0, 30, 5, 20, 0, 0);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP9: Run with no packet loss and denoiser on. One key frame (first frame). // VP9: Run with no packet loss and denoiser on. One key frame (first frame).
TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) { TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 500, 30, 0); SetRateProfile(&rate_profile, 0, 500, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1; rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
rate_profile.num_frames = kNumFramesShort; rate_profile.num_frames = kNumFramesShort;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP9, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, true, true, false); 0.0f, -1, 1, false, true, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 36.8, 35.8, 0.92, 0.91); SetQualityThresholds(&quality_thresholds, 36.8, 35.8, 0.92, 0.91);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 40, 20, 10, 20, 0, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// Run with no packet loss, at low bitrate. // Run with no packet loss, at low bitrate.
@ -189,23 +189,23 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
TEST_F(VideoProcessorIntegrationTest, TEST_F(VideoProcessorIntegrationTest,
DISABLED_ProcessNoLossSpatialResizeFrameDropVP9) { DISABLED_ProcessNoLossSpatialResizeFrameDropVP9) {
config_.networking_config.packet_loss_probability = 0; config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 50, 30, 0); SetRateProfile(&rate_profile, 0, 50, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesLong + 1; rate_profile.frame_index_rate_update[1] = kNumFramesLong + 1;
rate_profile.num_frames = kNumFramesLong; rate_profile.num_frames = kNumFramesLong;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP9, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, false, true, true); 0.0f, -1, 1, false, false, true, true);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 24.0, 13.0, 0.65, 0.37); SetQualityThresholds(&quality_thresholds, 24.0, 13.0, 0.65, 0.37);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 228, 70, 160, 15, 80, 1, 1); SetRateControlThresholds(rc_thresholds, 0, 228, 70, 160, 15, 80, 1, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// TODO(marpan): Add temporal layer test for VP9, once changes are in // TODO(marpan): Add temporal layer test for VP9, once changes are in
@ -217,67 +217,67 @@ TEST_F(VideoProcessorIntegrationTest,
// One key frame (first frame only) in sequence. Setting |key_frame_interval| // One key frame (first frame only) in sequence. Setting |key_frame_interval|
// to -1 below means no periodic key frames in test. // to -1 below means no periodic key frames in test.
TEST_F(VideoProcessorIntegrationTest, ProcessZeroPacketLoss) { TEST_F(VideoProcessorIntegrationTest, ProcessZeroPacketLoss) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 500, 30, 0); SetRateProfile(&rate_profile, 0, 500, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1; rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
rate_profile.num_frames = kNumFramesShort; rate_profile.num_frames = kNumFramesShort;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP8, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, true, true, false); 0.0f, -1, 1, false, true, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 34.95, 33.0, 0.90, 0.89); SetQualityThresholds(&quality_thresholds, 34.95, 33.0, 0.90, 0.89);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 40, 20, 10, 15, 0, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP8: Run with 5% packet loss and fixed bitrate. Quality should be a bit // VP8: Run with 5% packet loss and fixed bitrate. Quality should be a bit
// lower. One key frame (first frame only) in sequence. // lower. One key frame (first frame only) in sequence.
TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLoss) { TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLoss) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 500, 30, 0); SetRateProfile(&rate_profile, 0, 500, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1; rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
rate_profile.num_frames = kNumFramesShort; rate_profile.num_frames = kNumFramesShort;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP8, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.05f, -1, 1, false, true, true, false); 0.05f, -1, 1, false, true, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 20.0, 16.0, 0.60, 0.40); SetQualityThresholds(&quality_thresholds, 20.0, 16.0, 0.60, 0.40);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 40, 20, 10, 15, 0, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP8: Run with 10% packet loss and fixed bitrate. Quality should be lower. // VP8: Run with 10% packet loss and fixed bitrate. Quality should be lower.
// One key frame (first frame only) in sequence. // One key frame (first frame only) in sequence.
TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) { TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 500, 30, 0); SetRateProfile(&rate_profile, 0, 500, 30, 0);
rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1; rate_profile.frame_index_rate_update[1] = kNumFramesShort + 1;
rate_profile.num_frames = kNumFramesShort; rate_profile.num_frames = kNumFramesShort;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP8, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.1f, -1, 1, false, true, true, false); 0.1f, -1, 1, false, true, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 19.0, 16.0, 0.50, 0.35); SetQualityThresholds(&quality_thresholds, 19.0, 16.0, 0.50, 0.35);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[1]; RateControlThresholds rc_thresholds[1];
SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 40, 20, 10, 15, 0, 1);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
#endif // !defined(WEBRTC_IOS) #endif // !defined(WEBRTC_IOS)
@ -303,27 +303,27 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
#define MAYBE_ProcessNoLossChangeBitRateVP8 ProcessNoLossChangeBitRateVP8 #define MAYBE_ProcessNoLossChangeBitRateVP8 ProcessNoLossChangeBitRateVP8
#endif #endif
TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) { TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) {
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 200, 30, 0); SetRateProfile(&rate_profile, 0, 200, 30, 0);
SetRateProfilePars(&rate_profile, 1, 800, 30, 100); SetRateProfile(&rate_profile, 1, 800, 30, 100);
SetRateProfilePars(&rate_profile, 2, 500, 30, 200); SetRateProfile(&rate_profile, 2, 500, 30, 200);
rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1; rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
rate_profile.num_frames = kNumFramesLong; rate_profile.num_frames = kNumFramesLong;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP8, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, true, true, false); 0.0f, -1, 1, false, true, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 34.0, 32.0, 0.85, 0.80); SetQualityThresholds(&quality_thresholds, 34.0, 32.0, 0.85, 0.80);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[3]; RateControlThresholds rc_thresholds[3];
SetRateControlMetrics(rc_metrics, 0, 0, 45, 20, 10, 15, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 45, 20, 10, 15, 0, 1);
SetRateControlMetrics(rc_metrics, 1, 0, 0, 25, 20, 10, 0, 0); SetRateControlThresholds(rc_thresholds, 1, 0, 0, 25, 20, 10, 0, 0);
SetRateControlMetrics(rc_metrics, 2, 0, 0, 25, 15, 10, 0, 0); SetRateControlThresholds(rc_thresholds, 2, 0, 0, 25, 15, 10, 0, 0);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP8: Run with no packet loss, with an update (decrease) in frame rate. // VP8: Run with no packet loss, with an update (decrease) in frame rate.
@ -344,27 +344,27 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) {
TEST_F(VideoProcessorIntegrationTest, TEST_F(VideoProcessorIntegrationTest,
MAYBE_ProcessNoLossChangeFrameRateFrameDropVP8) { MAYBE_ProcessNoLossChangeFrameRateFrameDropVP8) {
config_.networking_config.packet_loss_probability = 0; config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 80, 24, 0); SetRateProfile(&rate_profile, 0, 80, 24, 0);
SetRateProfilePars(&rate_profile, 1, 80, 15, 100); SetRateProfile(&rate_profile, 1, 80, 15, 100);
SetRateProfilePars(&rate_profile, 2, 80, 10, 200); SetRateProfile(&rate_profile, 2, 80, 10, 200);
rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1; rate_profile.frame_index_rate_update[3] = kNumFramesLong + 1;
rate_profile.num_frames = kNumFramesLong; rate_profile.num_frames = kNumFramesLong;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP8, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 1, false, true, true, false); 0.0f, -1, 1, false, true, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 31.0, 22.0, 0.80, 0.65); SetQualityThresholds(&quality_thresholds, 31.0, 22.0, 0.80, 0.65);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[3]; RateControlThresholds rc_thresholds[3];
SetRateControlMetrics(rc_metrics, 0, 40, 20, 75, 15, 60, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 40, 20, 75, 15, 60, 0, 1);
SetRateControlMetrics(rc_metrics, 1, 10, 0, 25, 10, 35, 0, 0); SetRateControlThresholds(rc_thresholds, 1, 10, 0, 25, 10, 35, 0, 0);
SetRateControlMetrics(rc_metrics, 2, 0, 0, 20, 10, 15, 0, 0); SetRateControlThresholds(rc_thresholds, 2, 0, 0, 20, 10, 15, 0, 0);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
// VP8: Run with no packet loss, with 3 temporal layers, with a rate update in // VP8: Run with no packet loss, with 3 temporal layers, with a rate update in
@ -381,25 +381,25 @@ TEST_F(VideoProcessorIntegrationTest,
#endif #endif
TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossTemporalLayersVP8) { TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossTemporalLayersVP8) {
config_.networking_config.packet_loss_probability = 0; config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile. // Bit rate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 200, 30, 0); SetRateProfile(&rate_profile, 0, 200, 30, 0);
SetRateProfilePars(&rate_profile, 1, 400, 30, 150); SetRateProfile(&rate_profile, 1, 400, 30, 150);
rate_profile.frame_index_rate_update[2] = kNumFramesLong + 1; rate_profile.frame_index_rate_update[2] = kNumFramesLong + 1;
rate_profile.num_frames = kNumFramesLong; rate_profile.num_frames = kNumFramesLong;
// Codec/network settings. // Codec/network settings.
CodecConfigPars process_settings; CodecParams process_settings;
SetCodecParameters(&process_settings, kVideoCodecVP8, kHwCodec, SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore,
kUseSingleCore, 0.0f, -1, 3, false, true, true, false); 0.0f, -1, 3, false, true, true, false);
// Metrics for expected quality. // Thresholds for expected quality.
QualityMetrics quality_metrics; QualityThresholds quality_thresholds;
SetQualityMetrics(&quality_metrics, 32.5, 30.0, 0.85, 0.80); SetQualityThresholds(&quality_thresholds, 32.5, 30.0, 0.85, 0.80);
// Metrics for rate control. // Thresholds for rate control.
RateControlMetrics rc_metrics[2]; RateControlThresholds rc_thresholds[2];
SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1); SetRateControlThresholds(rc_thresholds, 0, 0, 20, 30, 10, 10, 0, 1);
SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0); SetRateControlThresholds(rc_thresholds, 1, 0, 0, 30, 15, 10, 0, 0);
ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, ProcessFramesAndVerify(quality_thresholds, rate_profile, process_settings,
rc_metrics, nullptr /* visualization_params */); rc_thresholds, nullptr /* visualization_params */);
} }
} // namespace test } // namespace test
} // namespace webrtc } // namespace webrtc

253
webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
View File

@ -62,32 +62,36 @@ const int kCifHeight = 288;
const char kFilenameForemanCif[] = "foreman_cif"; const char kFilenameForemanCif[] = "foreman_cif";
// Codec and network settings. // Codec and network settings.
struct CodecConfigPars { struct CodecParams {
VideoCodecType codec_type; VideoCodecType codec_type;
bool hw_codec; bool hw_codec;
bool use_single_core; bool use_single_core;
float packet_loss;
int width;
int height;
int num_temporal_layers; int num_temporal_layers;
int key_frame_interval; int key_frame_interval;
bool error_concealment_on; bool error_concealment_on;
bool denoising_on; bool denoising_on;
bool frame_dropper_on; bool frame_dropper_on;
bool spatial_resize_on; bool spatial_resize_on;
int width;
int height; float packet_loss_probability; // [0.0, 1.0].
std::string filename; std::string filename;
bool verbose_logging; bool verbose_logging;
}; };
// Quality metrics. // Thresholds for the quality metrics.
struct QualityMetrics { struct QualityThresholds {
double minimum_avg_psnr; double min_avg_psnr;
double minimum_min_psnr; double min_min_psnr;
double minimum_avg_ssim; double min_avg_ssim;
double minimum_min_ssim; double min_min_ssim;
}; };
// The sequence of bitrate and frame rate changes for the encoder, the frame // The sequence of bit rate and frame rate changes for the encoder, the frame
// number where the changes are made, and the total number of frames for the // number where the changes are made, and the total number of frames for the
// test. // test.
struct RateProfile { struct RateProfile {
@ -97,12 +101,12 @@ struct RateProfile {
int num_frames; int num_frames;
}; };
// Metrics for the rate control. The rate mismatch metrics are defined as // Thresholds for the rate control metrics. The rate mismatch thresholds are
// percentages.|max_time_hit_target| is defined as number of frames, after a // defined as percentages. |max_time_hit_target| is defined as number of frames,
// rate update is made to the encoder, for the encoder to reach within // after a rate update is made to the encoder, for the encoder to reach within
// |kPercTargetvsActualMismatch| of new target rate. The metrics are defined for // |kPercTargetvsActualMismatch| of new target rate. The thresholds are defined
// each rate update sequence. // for each rate update sequence.
struct RateControlMetrics { struct RateControlThresholds {
int max_num_dropped_frames; int max_num_dropped_frames;
int max_key_frame_size_mismatch; int max_key_frame_size_mismatch;
int max_delta_frame_size_mismatch; int max_delta_frame_size_mismatch;
@ -131,12 +135,13 @@ const float kScaleKeyFrameSize = 0.5f;
// Integration test for video processor. Encodes+decodes a clip and // Integration test for video processor. Encodes+decodes a clip and
// writes it to the output directory. After completion, quality metrics // writes it to the output directory. After completion, quality metrics
// (PSNR and SSIM) and rate control metrics are computed to verify that the // (PSNR and SSIM) and rate control metrics are computed and compared to given
// quality and encoder response is acceptable. The rate control tests allow us // thresholds, to verify that the quality and encoder response is acceptable.
// to verify the behavior for changing bitrate, changing frame rate, frame // The rate control tests allow us to verify the behavior for changing bit rate,
// dropping/spatial resize, and temporal layers. The limits for the rate // changing frame rate, frame dropping/spatial resize, and temporal layers.
// control metrics are set to be fairly conservative, so failure should only // The thresholds for the rate control metrics are set to be fairly
// happen when some significant regression or breakdown occurs. // conservative, so failure should only happen when some significant regression
// or breakdown occurs.
class VideoProcessorIntegrationTest : public testing::Test { class VideoProcessorIntegrationTest : public testing::Test {
protected: protected:
VideoProcessorIntegrationTest() { VideoProcessorIntegrationTest() {
@ -152,7 +157,7 @@ class VideoProcessorIntegrationTest : public testing::Test {
} }
virtual ~VideoProcessorIntegrationTest() = default; virtual ~VideoProcessorIntegrationTest() = default;
void SetUpCodecConfig(const CodecConfigPars& process, void SetUpCodecConfig(const CodecParams& process,
const VisualizationParams* visualization_params) { const VisualizationParams* visualization_params) {
if (process.hw_codec) { if (process.hw_codec) {
#if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED) #if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED)
@ -233,7 +238,8 @@ class VideoProcessorIntegrationTest : public testing::Test {
config_.use_single_core = process.use_single_core; config_.use_single_core = process.use_single_core;
// Key frame interval and packet loss are set for each test. // Key frame interval and packet loss are set for each test.
config_.keyframe_interval = process.key_frame_interval; config_.keyframe_interval = process.key_frame_interval;
config_.networking_config.packet_loss_probability = packet_loss_; config_.networking_config.packet_loss_probability =
packet_loss_probability_;
// Configure codec settings. // Configure codec settings.
config_.codec_settings = &codec_settings_; config_.codec_settings = &codec_settings_;
@ -393,14 +399,14 @@ class VideoProcessorIntegrationTest : public testing::Test {
} }
// Verify expected behavior of rate control and print out data. // Verify expected behavior of rate control and print out data.
void VerifyRateControl(int update_index, void VerifyRateControlMetrics(int update_index,
int max_key_frame_size_mismatch, int max_key_frame_size_mismatch,
int max_delta_frame_size_mismatch, int max_delta_frame_size_mismatch,
int max_encoding_rate_mismatch, int max_encoding_rate_mismatch,
int max_time_hit_target, int max_time_hit_target,
int max_num_dropped_frames, int max_num_dropped_frames,
int num_spatial_resizes, int num_spatial_resizes,
int num_key_frames) { int num_key_frames) {
int num_dropped_frames = processor_->NumberDroppedFrames(); int num_dropped_frames = processor_->NumberDroppedFrames();
int num_resize_actions = processor_->NumberSpatialResizes(); int num_resize_actions = processor_->NumberSpatialResizes();
printf( printf(
@ -454,6 +460,15 @@ class VideoProcessorIntegrationTest : public testing::Test {
EXPECT_EQ(num_key_frames_, num_key_frames); EXPECT_EQ(num_key_frames_, num_key_frames);
} }
void VerifyQuality(const test::QualityMetricsResult& psnr_result,
const test::QualityMetricsResult& ssim_result,
const QualityThresholds& quality_thresholds) {
EXPECT_GT(psnr_result.average, quality_thresholds.min_avg_psnr);
EXPECT_GT(psnr_result.min, quality_thresholds.min_min_psnr);
EXPECT_GT(ssim_result.average, quality_thresholds.min_avg_ssim);
EXPECT_GT(ssim_result.min, quality_thresholds.min_min_ssim);
}
// Layer index corresponding to frame number, for up to 3 layers. // Layer index corresponding to frame number, for up to 3 layers.
void LayerIndexForFrame(int frame_number) { void LayerIndexForFrame(int frame_number) {
if (num_temporal_layers_ == 1) { if (num_temporal_layers_ == 1) {
@ -505,15 +520,15 @@ class VideoProcessorIntegrationTest : public testing::Test {
} }
// Processes all frames in the clip and verifies the result. // Processes all frames in the clip and verifies the result.
void ProcessFramesAndVerify(QualityMetrics quality_metrics, void ProcessFramesAndVerify(QualityThresholds quality_thresholds,
RateProfile rate_profile, RateProfile rate_profile,
CodecConfigPars process, CodecParams process,
RateControlMetrics* rc_metrics, RateControlThresholds* rc_thresholds,
const VisualizationParams* visualization_params) { const VisualizationParams* visualization_params) {
// Codec/config settings. // Codec/config settings.
start_bitrate_ = rate_profile.target_bit_rate[0]; start_bitrate_ = rate_profile.target_bit_rate[0];
start_frame_rate_ = rate_profile.input_frame_rate[0]; start_frame_rate_ = rate_profile.input_frame_rate[0];
packet_loss_ = process.packet_loss; packet_loss_probability_ = process.packet_loss_probability;
num_temporal_layers_ = process.num_temporal_layers; num_temporal_layers_ = process.num_temporal_layers;
SetUpCodecConfig(process, visualization_params); SetUpCodecConfig(process, visualization_params);
// Update the layers and the codec with the initial rates. // Update the layers and the codec with the initial rates.
@ -548,14 +563,15 @@ class VideoProcessorIntegrationTest : public testing::Test {
// update layers and codec with new rates. // update layers and codec with new rates.
if (frame_number == if (frame_number ==
rate_profile.frame_index_rate_update[update_index + 1]) { rate_profile.frame_index_rate_update[update_index + 1]) {
VerifyRateControl( VerifyRateControlMetrics(
update_index, rc_metrics[update_index].max_key_frame_size_mismatch, update_index,
rc_metrics[update_index].max_delta_frame_size_mismatch, rc_thresholds[update_index].max_key_frame_size_mismatch,
rc_metrics[update_index].max_encoding_rate_mismatch, rc_thresholds[update_index].max_delta_frame_size_mismatch,
rc_metrics[update_index].max_time_hit_target, rc_thresholds[update_index].max_encoding_rate_mismatch,
rc_metrics[update_index].max_num_dropped_frames, rc_thresholds[update_index].max_time_hit_target,
rc_metrics[update_index].num_spatial_resizes, rc_thresholds[update_index].max_num_dropped_frames,
rc_metrics[update_index].num_key_frames); rc_thresholds[update_index].num_spatial_resizes,
rc_thresholds[update_index].num_key_frames);
// Update layer rates and the codec with new rates. // Update layer rates and the codec with new rates.
++update_index; ++update_index;
bit_rate_ = rate_profile.target_bit_rate[update_index]; bit_rate_ = rate_profile.target_bit_rate[update_index];
@ -566,14 +582,14 @@ class VideoProcessorIntegrationTest : public testing::Test {
processor_->SetRates(bit_rate_, frame_rate_); processor_->SetRates(bit_rate_, frame_rate_);
} }
} }
VerifyRateControl(update_index, VerifyRateControlMetrics(
rc_metrics[update_index].max_key_frame_size_mismatch, update_index, rc_thresholds[update_index].max_key_frame_size_mismatch,
rc_metrics[update_index].max_delta_frame_size_mismatch, rc_thresholds[update_index].max_delta_frame_size_mismatch,
rc_metrics[update_index].max_encoding_rate_mismatch, rc_thresholds[update_index].max_encoding_rate_mismatch,
rc_metrics[update_index].max_time_hit_target, rc_thresholds[update_index].max_time_hit_target,
rc_metrics[update_index].max_num_dropped_frames, rc_thresholds[update_index].max_num_dropped_frames,
rc_metrics[update_index].num_spatial_resizes, rc_thresholds[update_index].num_spatial_resizes,
rc_metrics[update_index].num_key_frames); rc_thresholds[update_index].num_key_frames);
EXPECT_EQ(num_frames, frame_number); EXPECT_EQ(num_frames, frame_number);
EXPECT_EQ(num_frames + 1, static_cast<int>(stats_.stats_.size())); EXPECT_EQ(num_frames + 1, static_cast<int>(stats_.stats_.size()));
@ -607,10 +623,7 @@ class VideoProcessorIntegrationTest : public testing::Test {
psnr_result.average, psnr_result.min, ssim_result.average, psnr_result.average, psnr_result.min, ssim_result.average,
ssim_result.min); ssim_result.min);
stats_.PrintSummary(); stats_.PrintSummary();
EXPECT_GT(psnr_result.average, quality_metrics.minimum_avg_psnr); VerifyQuality(psnr_result, ssim_result, quality_thresholds);
EXPECT_GT(psnr_result.min, quality_metrics.minimum_min_psnr);
EXPECT_GT(ssim_result.average, quality_metrics.minimum_avg_ssim);
EXPECT_GT(ssim_result.min, quality_metrics.minimum_min_ssim);
// Remove analysis file. // Remove analysis file.
if (remove(config_.output_filename.c_str()) < 0) { if (remove(config_.output_filename.c_str()) < 0) {
@ -618,25 +631,25 @@ class VideoProcessorIntegrationTest : public testing::Test {
} }
} }
static void SetCodecParameters(CodecConfigPars* process_settings, static void SetCodecParams(CodecParams* process_settings,
VideoCodecType codec_type, VideoCodecType codec_type,
bool hw_codec, bool hw_codec,
bool use_single_core, bool use_single_core,
float packet_loss, float packet_loss_probability,
int key_frame_interval, int key_frame_interval,
int num_temporal_layers, int num_temporal_layers,
bool error_concealment_on, bool error_concealment_on,
bool denoising_on, bool denoising_on,
bool frame_dropper_on, bool frame_dropper_on,
bool spatial_resize_on, bool spatial_resize_on,
int width, int width,
int height, int height,
const std::string& filename, const std::string& filename,
bool verbose_logging) { bool verbose_logging) {
process_settings->codec_type = codec_type; process_settings->codec_type = codec_type;
process_settings->hw_codec = hw_codec; process_settings->hw_codec = hw_codec;
process_settings->use_single_core = use_single_core; process_settings->use_single_core = use_single_core;
process_settings->packet_loss = packet_loss; process_settings->packet_loss_probability = packet_loss_probability;
process_settings->key_frame_interval = key_frame_interval; process_settings->key_frame_interval = key_frame_interval;
process_settings->num_temporal_layers = num_temporal_layers, process_settings->num_temporal_layers = num_temporal_layers,
process_settings->error_concealment_on = error_concealment_on; process_settings->error_concealment_on = error_concealment_on;
@ -649,65 +662,65 @@ class VideoProcessorIntegrationTest : public testing::Test {
process_settings->verbose_logging = verbose_logging; process_settings->verbose_logging = verbose_logging;
} }
static void SetCodecParameters(CodecConfigPars* process_settings, static void SetCodecParams(CodecParams* process_settings,
VideoCodecType codec_type, VideoCodecType codec_type,
bool hw_codec, bool hw_codec,
bool use_single_core, bool use_single_core,
float packet_loss, float packet_loss_probability,
int key_frame_interval, int key_frame_interval,
int num_temporal_layers, int num_temporal_layers,
bool error_concealment_on, bool error_concealment_on,
bool denoising_on, bool denoising_on,
bool frame_dropper_on, bool frame_dropper_on,
bool spatial_resize_on) { bool spatial_resize_on) {
SetCodecParameters(process_settings, codec_type, hw_codec, use_single_core, SetCodecParams(process_settings, codec_type, hw_codec, use_single_core,
packet_loss, key_frame_interval, num_temporal_layers, packet_loss_probability, key_frame_interval,
error_concealment_on, denoising_on, frame_dropper_on, num_temporal_layers, error_concealment_on, denoising_on,
spatial_resize_on, kCifWidth, kCifHeight, frame_dropper_on, spatial_resize_on, kCifWidth, kCifHeight,
kFilenameForemanCif, false /* verbose_logging */); kFilenameForemanCif, false /* verbose_logging */);
} }
static void SetQualityMetrics(QualityMetrics* quality_metrics, static void SetQualityThresholds(QualityThresholds* quality_thresholds,
double minimum_avg_psnr, double min_avg_psnr,
double minimum_min_psnr, double min_min_psnr,
double minimum_avg_ssim, double min_avg_ssim,
double minimum_min_ssim) { double min_min_ssim) {
quality_metrics->minimum_avg_psnr = minimum_avg_psnr; quality_thresholds->min_avg_psnr = min_avg_psnr;
quality_metrics->minimum_min_psnr = minimum_min_psnr; quality_thresholds->min_min_psnr = min_min_psnr;
quality_metrics->minimum_avg_ssim = minimum_avg_ssim; quality_thresholds->min_avg_ssim = min_avg_ssim;
quality_metrics->minimum_min_ssim = minimum_min_ssim; quality_thresholds->min_min_ssim = min_min_ssim;
} }
static void SetRateProfilePars(RateProfile* rate_profile, static void SetRateProfile(RateProfile* rate_profile,
int update_index, int update_index,
int bit_rate, int bit_rate,
int frame_rate, int frame_rate,
int frame_index_rate_update) { int frame_index_rate_update) {
rate_profile->target_bit_rate[update_index] = bit_rate; rate_profile->target_bit_rate[update_index] = bit_rate;
rate_profile->input_frame_rate[update_index] = frame_rate; rate_profile->input_frame_rate[update_index] = frame_rate;
rate_profile->frame_index_rate_update[update_index] = rate_profile->frame_index_rate_update[update_index] =
frame_index_rate_update; frame_index_rate_update;
} }
static void SetRateControlMetrics(RateControlMetrics* rc_metrics, static void SetRateControlThresholds(RateControlThresholds* rc_thresholds,
int update_index, int update_index,
int max_num_dropped_frames, int max_num_dropped_frames,
int max_key_frame_size_mismatch, int max_key_frame_size_mismatch,
int max_delta_frame_size_mismatch, int max_delta_frame_size_mismatch,
int max_encoding_rate_mismatch, int max_encoding_rate_mismatch,
int max_time_hit_target, int max_time_hit_target,
int num_spatial_resizes, int num_spatial_resizes,
int num_key_frames) { int num_key_frames) {
rc_metrics[update_index].max_num_dropped_frames = max_num_dropped_frames; rc_thresholds[update_index].max_num_dropped_frames = max_num_dropped_frames;
rc_metrics[update_index].max_key_frame_size_mismatch = rc_thresholds[update_index].max_key_frame_size_mismatch =
max_key_frame_size_mismatch; max_key_frame_size_mismatch;
rc_metrics[update_index].max_delta_frame_size_mismatch = rc_thresholds[update_index].max_delta_frame_size_mismatch =
max_delta_frame_size_mismatch; max_delta_frame_size_mismatch;
rc_metrics[update_index].max_encoding_rate_mismatch = rc_thresholds[update_index].max_encoding_rate_mismatch =
max_encoding_rate_mismatch; max_encoding_rate_mismatch;
rc_metrics[update_index].max_time_hit_target = max_time_hit_target; rc_thresholds[update_index].max_time_hit_target = max_time_hit_target;
rc_metrics[update_index].num_spatial_resizes = num_spatial_resizes; rc_thresholds[update_index].num_spatial_resizes = num_spatial_resizes;
rc_metrics[update_index].num_key_frames = num_key_frames; rc_thresholds[update_index].num_key_frames = num_key_frames;
} }
// Codecs. // Codecs.
@ -758,7 +771,7 @@ class VideoProcessorIntegrationTest : public testing::Test {
int start_frame_rate_; int start_frame_rate_;
// Codec and network settings. // Codec and network settings.
float packet_loss_; float packet_loss_probability_;
int num_temporal_layers_; int num_temporal_layers_;
}; };