| Index: webrtc/test/testsupport/metrics/video_metrics.cc
|
| diff --git a/webrtc/test/testsupport/metrics/video_metrics.cc b/webrtc/test/testsupport/metrics/video_metrics.cc
|
| index 289533763c857871485eadb706987ef6b4cfbf15..8f88715ab3630fa7470465ea20ecbebc7dab92d8 100644
|
| --- a/webrtc/test/testsupport/metrics/video_metrics.cc
|
| +++ b/webrtc/test/testsupport/metrics/video_metrics.cc
|
| @@ -57,9 +57,9 @@ void CalculateFrame(VideoMetricsType video_metrics_type,
|
| result->frames.push_back(frame_result);
|
| }
|
|
|
| -// Calculates average, min and max values for the supplied struct, if non-NULL.
|
| +// Calculates average, min and max values for the supplied struct, if non-null.
|
| void CalculateStats(QualityMetricsResult* result) {
|
| - if (result == NULL || result->frames.size() == 0) {
|
| + if (result == nullptr || result->frames.size() == 0) {
|
| return;
|
| }
|
| // Calculate average.
|
| @@ -82,7 +82,7 @@ void CalculateStats(QualityMetricsResult* result) {
|
| }
|
|
|
| // Single method that handles all combinations of video metrics calculation, to
|
| -// minimize code duplication. Either psnr_result or ssim_result may be NULL,
|
| +// minimize code duplication. Either psnr_result or ssim_result may be null,
|
| // depending on which VideoMetricsType is targeted.
|
| int CalculateMetrics(VideoMetricsType video_metrics_type,
|
| const char* ref_filename,
|
| @@ -91,19 +91,19 @@ int CalculateMetrics(VideoMetricsType video_metrics_type,
|
| int height,
|
| QualityMetricsResult* psnr_result,
|
| QualityMetricsResult* ssim_result) {
|
| - assert(ref_filename != NULL);
|
| - assert(test_filename != NULL);
|
| + assert(ref_filename != nullptr);
|
| + assert(test_filename != nullptr);
|
| assert(width > 0);
|
| assert(height > 0);
|
|
|
| FILE* ref_fp = fopen(ref_filename, "rb");
|
| - if (ref_fp == NULL) {
|
| + if (ref_fp == nullptr) {
|
| // Cannot open reference file.
|
| fprintf(stderr, "Cannot open file %s\n", ref_filename);
|
| return -1;
|
| }
|
| FILE* test_fp = fopen(test_filename, "rb");
|
| - if (test_fp == NULL) {
|
| + if (test_fp == nullptr) {
|
| // Cannot open test file.
|
| fprintf(stderr, "Cannot open file %s\n", test_filename);
|
| fclose(ref_fp);
|
| @@ -163,8 +163,8 @@ int I420MetricsFromFiles(const char* ref_filename,
|
| int height,
|
| QualityMetricsResult* psnr_result,
|
| QualityMetricsResult* ssim_result) {
|
| - assert(psnr_result != NULL);
|
| - assert(ssim_result != NULL);
|
| + assert(psnr_result != nullptr);
|
| + assert(ssim_result != nullptr);
|
| return CalculateMetrics(kBoth, ref_filename, test_filename, width, height,
|
| psnr_result, ssim_result);
|
| }
|
| @@ -174,9 +174,9 @@ int I420PSNRFromFiles(const char* ref_filename,
|
| int width,
|
| int height,
|
| QualityMetricsResult* result) {
|
| - assert(result != NULL);
|
| + assert(result != nullptr);
|
| return CalculateMetrics(kPSNR, ref_filename, test_filename, width, height,
|
| - result, NULL);
|
| + result, nullptr);
|
| }
|
|
|
| int I420SSIMFromFiles(const char* ref_filename,
|
| @@ -184,9 +184,9 @@ int I420SSIMFromFiles(const char* ref_filename,
|
| int width,
|
| int height,
|
| QualityMetricsResult* result) {
|
| - assert(result != NULL);
|
| + assert(result != nullptr);
|
| return CalculateMetrics(kSSIM, ref_filename, test_filename, width, height,
|
| - NULL, result);
|
| + nullptr, result);
|
| }
|
|
|
| } // namespace test
|
|
|