Skip to content

Commit

Permalink
Fix spelling
Browse files Browse the repository at this point in the history
Summary: sharpenning -> sharpening, and other aberrations

Reviewed By: fbriggs

Differential Revision: D4947374

fbshipit-source-id: dd5a8686e01fccf03808199111a179b91a92ca64
  • Loading branch information
aparrapo authored and facebook-github-bot committed Apr 25, 2017
1 parent 9d2b23d commit e172c7b
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
18 changes: 9 additions & 9 deletions surround360_render/res/config/isp/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.



Expand Down
2 changes: 1 addition & 1 deletion surround360_render/res/config/isp/cmosis_fujinon.json
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion surround360_render/res/config/isp/cmosis_sunex.json
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion surround360_render/scripts/batch_process_video.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}
"""

Expand Down
24 changes: 12 additions & 12 deletions surround360_render/source/camera_isp/CameraIspGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -571,9 +571,9 @@ class CameraIspGen
Param<float> clampMaxR,
Param<float> clampMaxG,
Param<float> clampMaxB,
Param<float> sharpenningR,
Param<float> sharpenningG,
Param<float> sharpenningB,
Param<float> sharpeningR,
Param<float> sharpeningG,
Param<float> sharpeningB,
Param<float> sharpeningSupport,
Param<float> noiseCore,
ImageParam ccm,
Expand All @@ -583,9 +583,9 @@ class CameraIspGen
int outputBpp) {

this->target = target;
Expr sR = 1.0f + cast<float>(sharpenningR);
Expr sG = 1.0f + cast<float>(sharpenningG);
Expr sB = 1.0f + cast<float>(sharpenningB);
Expr sR = 1.0f + cast<float>(sharpeningR);
Expr sG = 1.0f + cast<float>(sharpeningG);
Expr sB = 1.0f + cast<float>(sharpeningB);

// This is the ISP pipeline
Func vignettingGain("vignettingGain");
Expand Down Expand Up @@ -665,9 +665,9 @@ int main(int argc, char **argv) {
Param<float> clampMaxR("clampMaxR");
Param<float> clampMaxG("clampMaxG");
Param<float> clampMaxB("clampMaxB");
Param<float> sharpenningR("sharpenningR");
Param<float> sharpenningG("sharpenningG");
Param<float> sharpenningB("sharpenninngB");
Param<float> sharpeningR("sharpeningR");
Param<float> sharpeningG("sharpeningG");
Param<float> sharpeningB("sharpeningB");
Param<float> sharpeningSupport("sharpeningSupport");
Param<float> noiseCore("noiseCore");
ImageParam ccm(Float(32), 2, "ccm");
Expand Down Expand Up @@ -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 =
Expand All @@ -705,15 +705,15 @@ 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<Argument> args = {
input, width, height, vignetteTableH, vignetteTableV,
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
Expand Down
6 changes: 3 additions & 3 deletions surround360_render/source/test/TestRenderStereoPanorama.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -692,7 +692,7 @@ void sharpenThread(Mat* sphericalImage) {
iirLowPass<WrapBoundary<float>, ReflectBoundary<float>, Vec3b>(
*sphericalImage, 0.25f, lowPassSphericalImage, wrapB, reflectB);
sharpenWithIirLowPass<Vec3b>(
*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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit e172c7b

Please sign in to comment.