]> git.sesse.net Git - movit/blobdiff - resample_effect_test.cpp
Fix a typo.
[movit] / resample_effect_test.cpp
index 4faa810005e21759457de174dbb5c32ed6e73be1..16bd70c552c5627a63caea619fb913822c3628f1 100644 (file)
@@ -437,7 +437,7 @@ TEST(ResampleEffectTest, Precision) {
 }
 
 #ifdef HAVE_BENCHMARK
-template<> inline uint8_t from_fp32<uint8_t>(float x) { return x; }
+template<> inline uint8_t from_fp32<uint8_t>(float x) { return lrintf(x * 255.0f); }
 
 template<class T>
 void BM_ResampleEffect(benchmark::State &state, GammaCurve gamma_curve, GLenum output_format, const std::string &shader_type)
@@ -452,7 +452,7 @@ void BM_ResampleEffect(benchmark::State &state, GammaCurve gamma_curve, GLenum o
        unique_ptr<T[]> out_data(new T[out_width * out_height * 4]);
 
        for (unsigned i = 0; i < in_width * in_height * 4; ++i) {
-               data[i] = from_fp32<T>(float(rand()));
+               data[i] = from_fp32<T>(rand() / (RAND_MAX + 1.0));
        }
 
        EffectChainTester tester(nullptr, out_width, out_height, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, gamma_curve, output_format);
@@ -480,7 +480,7 @@ BENCHMARK_CAPTURE(BM_ResampleEffectHalf, Float16Upscale, GAMMA_LINEAR, "fragment
 BENCHMARK_CAPTURE(BM_ResampleEffectInt8, Int8Downscale, GAMMA_REC_709, "fragment")->Args({1280, 720, 640, 360})->Args({1280, 720, 320, 180})->Args({1280, 720, 321, 181})->UseRealTime()->Unit(benchmark::kMicrosecond);
 BENCHMARK_CAPTURE(BM_ResampleEffectHalf, Float16Downscale, GAMMA_LINEAR, "fragment")->Args({1280, 720, 640, 360})->Args({1280, 720, 320, 180})->Args({1280, 720, 321, 181})->UseRealTime()->Unit(benchmark::kMicrosecond);
 
-void BM_ComputeScalingWeights(benchmark::State &state)
+void BM_ComputeBilinearScalingWeights(benchmark::State &state)
 {
        constexpr unsigned src_size = 1280;
        constexpr unsigned dst_size = 35;
@@ -488,15 +488,15 @@ void BM_ComputeScalingWeights(benchmark::State &state)
        movit_texel_subpixel_precision = 64;  // To get consistent results across GPUs; this is a CPU test.
 
        // One iteration warmup to make sure the Lanczos table is computed.
-       calculate_scaling_weights(src_size, dst_size, 0.999f, 0.0f);
+       calculate_bilinear_scaling_weights(src_size, dst_size, 0.999f, 0.0f);
 
        for (auto _ : state) {
-               ScalingWeights weights = calculate_scaling_weights(src_size, dst_size, 0.999f, 0.0f);
+               ScalingWeights weights = calculate_bilinear_scaling_weights(src_size, dst_size, 0.999f, 0.0f);
        }
 
        movit_texel_subpixel_precision = old_precision;
 }
-BENCHMARK(BM_ComputeScalingWeights)->Unit(benchmark::kMicrosecond);
+BENCHMARK(BM_ComputeBilinearScalingWeights)->Unit(benchmark::kMicrosecond);
 
 #endif