diff --git a/surround360_render/res/config/isp/README.txt b/surround360_render/res/config/isp/README.txt index 6d52d687..8d342ff6 100644 --- a/surround360_render/res/config/isp/README.txt +++ b/surround360_render/res/config/isp/README.txt @@ -23,7 +23,7 @@ WhiteBalanceGain Nominally the red and blue channels are usually around 2x gain to the green channels. Strictly speaking this should be - computed using a global white balance algrotihm. + computed using a global white balance algorithm. stuckPixelThreshold @@ -51,20 +51,20 @@ denoiseRadius Single value Radius for noise reduction 3 or 4 is reasonable. 1 will be fast but will leave low frequency noise behind. - + ccm 3x3 matrix [[m00, m01, m01], ..., [m20, m21, m22]] - An identity leaves the color unchanged. This matrix shold + An identity leaves the color unchanged. This matrix should calculated from a color calibration session. It usually best if - the rows sume unity to conserve energy. + the rows sum to unity to conserve energy. -sharpenning +sharpening 3 channel vector value [r, g, b] - 1.0 means no sharpenning. Below 1.o means blurring and values - greater than 1.0 will sharpen the image. Execessive - sharpenning will cause "ringing." + 1.0 means no sharpening. Below 1.o means blurring and values + greater than 1.0 will sharpen the image. Excessive + sharpening will cause "ringing." saturation Single value @@ -92,7 +92,7 @@ gamma Raises the pixel value to the power of the gamma value. 0.454545 is the classic 2.2 gamma used to to move from linear sRGB to - gamm corrected sRGB. + gamma corrected sRGB. diff --git a/surround360_render/res/config/isp/cmosis_fujinon.json b/surround360_render/res/config/isp/cmosis_fujinon.json index 6bc6eb81..dfabf668 100644 --- a/surround360_render/res/config/isp/cmosis_fujinon.json +++ b/surround360_render/res/config/isp/cmosis_fujinon.json @@ -26,7 +26,7 @@ "ccm" : [[1.02169, -0.05711, 0.03543], [0.16789, 1.13419, -0.30208], [-0.15726, -0.07864, 1.2359]], - "sharpenning" : [0.5, 0.5, 0.5], + "sharpening" : [0.5, 0.5, 0.5], "saturation" : 1.2, "contrast" : 1.0, "lowKeyBoost" : [-0.2, -0.2, -0.2], diff --git a/surround360_render/res/config/isp/cmosis_sunex.json b/surround360_render/res/config/isp/cmosis_sunex.json index 0ef3361d..0e75cb62 100644 --- a/surround360_render/res/config/isp/cmosis_sunex.json +++ b/surround360_render/res/config/isp/cmosis_sunex.json @@ -27,7 +27,7 @@ "ccm" : [[1.02169, -0.05711, 0.03543], [0.16789, 1.13419, -0.30208], [-0.15726, -0.07864, 1.2359]], - "sharpenning" : [0.5, 0.5, 0.5], + "sharpening" : [0.5, 0.5, 0.5], "saturation" : 1.2, "contrast" : 1.0, "lowKeyBoost" : [-0.2, -0.2, -0.2], diff --git a/surround360_render/scripts/batch_process_video.py b/surround360_render/scripts/batch_process_video.py index 6be7741e..3bc73b5d 100755 --- a/surround360_render/scripts/batch_process_video.py +++ b/surround360_render/scripts/batch_process_video.py @@ -50,7 +50,7 @@ def signal_term_handler(signal, frame): --final_eqr_height {FINAL_EQR_HEIGHT} --interpupilary_dist 6.4 --zero_parallax_dist 10000 ---sharpenning {SHARPENNING} +--sharpening {SHARPENNING} {EXTRA_FLAGS} """ diff --git a/surround360_render/source/camera_isp/CameraIspGen.cpp b/surround360_render/source/camera_isp/CameraIspGen.cpp index d0a96205..165cf805 100644 --- a/surround360_render/source/camera_isp/CameraIspGen.cpp +++ b/surround360_render/source/camera_isp/CameraIspGen.cpp @@ -571,9 +571,9 @@ class CameraIspGen Param clampMaxR, Param clampMaxG, Param clampMaxB, - Param sharpenningR, - Param sharpenningG, - Param sharpenningB, + Param sharpeningR, + Param sharpeningG, + Param sharpeningB, Param sharpeningSupport, Param noiseCore, ImageParam ccm, @@ -583,9 +583,9 @@ class CameraIspGen int outputBpp) { this->target = target; - Expr sR = 1.0f + cast(sharpenningR); - Expr sG = 1.0f + cast(sharpenningG); - Expr sB = 1.0f + cast(sharpenningB); + Expr sR = 1.0f + cast(sharpeningR); + Expr sG = 1.0f + cast(sharpeningG); + Expr sB = 1.0f + cast(sharpeningB); // This is the ISP pipeline Func vignettingGain("vignettingGain"); @@ -665,9 +665,9 @@ int main(int argc, char **argv) { Param clampMaxR("clampMaxR"); Param clampMaxG("clampMaxG"); Param clampMaxB("clampMaxB"); - Param sharpenningR("sharpenningR"); - Param sharpenningG("sharpenningG"); - Param sharpenningB("sharpenninngB"); + Param sharpeningR("sharpeningR"); + Param sharpeningG("sharpeningG"); + Param sharpeningB("sharpeningB"); Param sharpeningSupport("sharpeningSupport"); Param noiseCore("noiseCore"); ImageParam ccm(Float(32), 2, "ccm"); @@ -696,7 +696,7 @@ int main(int argc, char **argv) { blackLevelR, blackLevelG, blackLevelB, whiteBalanceGainR, whiteBalanceGainG, whiteBalanceGainB, clampMinR, clampMinG, clampMinB, clampMaxR, clampMaxG, clampMaxB, - sharpenningR, sharpenningG, sharpenningB, sharpeningSupport, noiseCore, + sharpeningR, sharpeningG, sharpeningB, sharpeningSupport, noiseCore, ccm, toneTable, BGR, bayerPattern, FLAGS_output_bpp); Func cameraIspFast = @@ -705,7 +705,7 @@ int main(int argc, char **argv) { blackLevelR, blackLevelG, blackLevelB, whiteBalanceGainR, whiteBalanceGainG, whiteBalanceGainB, clampMinR, clampMinG, clampMinB, clampMaxR, clampMaxG, clampMaxB, - sharpenningR, sharpenningG, sharpenningB, sharpeningSupport, noiseCore, + sharpeningR, sharpeningG, sharpeningB, sharpeningSupport, noiseCore, ccm, toneTable, BGR, bayerPattern, FLAGS_output_bpp); std::vector args = { @@ -713,7 +713,7 @@ int main(int argc, char **argv) { blackLevelR, blackLevelG, blackLevelB, whiteBalanceGainR, whiteBalanceGainG, whiteBalanceGainB, clampMinR, clampMinG, clampMinB, clampMaxR, clampMaxG, clampMaxB, - sharpenningR, sharpenningG, sharpenningB, sharpeningSupport, noiseCore, ccm, toneTable, BGR, bayerPattern}; + sharpeningR, sharpeningG, sharpeningB, sharpeningSupport, noiseCore, ccm, toneTable, BGR, bayerPattern}; // Compile the pipelines // Use to cameraIsp.print_loop_nest() here to debug loop unrolling diff --git a/surround360_render/source/test/TestRenderStereoPanorama.cpp b/surround360_render/source/test/TestRenderStereoPanorama.cpp index 0f302feb..ca37ebf8 100644 --- a/surround360_render/source/test/TestRenderStereoPanorama.cpp +++ b/surround360_render/source/test/TestRenderStereoPanorama.cpp @@ -52,7 +52,7 @@ DEFINE_double(interpupilary_dist, 6.4, "separation of eyes fo DEFINE_int32(side_alpha_feather_size, 100, "alpha feather for projection of side cameras to spherical coordinates"); DEFINE_int32(std_alpha_feather_size, 31, "alpha feather for all other purposes. must be odd"); DEFINE_bool(save_debug_images, false, "if true, lots of debug images are generated"); -DEFINE_double(sharpenning, 0.0f, "0.0 to 1.0 amount of sharpenning"); +DEFINE_double(sharpening, 0.0f, "0.0 to 1.0 amount of sharpening"); DEFINE_bool(enable_top, false, "is there a top camera?"); DEFINE_bool(enable_bottom, false, "are there two bottom cameras?"); DEFINE_bool(enable_pole_removal, false, "if true, pole removal masks are used; if false, primary bottom camera is used"); @@ -692,7 +692,7 @@ void sharpenThread(Mat* sphericalImage) { iirLowPass, ReflectBoundary, Vec3b>( *sphericalImage, 0.25f, lowPassSphericalImage, wrapB, reflectB); sharpenWithIirLowPass( - *sphericalImage, lowPassSphericalImage, 1.0f + FLAGS_sharpenning); + *sphericalImage, lowPassSphericalImage, 1.0f + FLAGS_sharpening); } // If the un-padded height is odd and targetHeight is even, we can't do equal @@ -899,7 +899,7 @@ void renderStereoPanorama() { } const double startSharpenTime = getCurrTimeSec(); - if (FLAGS_sharpenning > 0.0f) { + if (FLAGS_sharpening > 0.0f) { VLOG(1) << "Sharpening"; std::thread sharpenThreadL(sharpenThread, &sphericalImageL); std::thread sharpenThreadR(sharpenThread, &sphericalImageR);