sharpen: Use better tune names.

diff --git a/libhb/param.c b/libhb/param.c
index af0297748288a86800aa1d61469580eda3e98be0..11eb1733defee40b85cd55fcc69900a39a2629d3 100644 (file)
--- a/libhb/param.c
+++ b/libhb/param.c
@@ -85,11 +85,11 @@ static hb_filter_param_t unsharp_presets[] =
 static hb_filter_param_t unsharp_tunes[] =
 {
     { 0, "None",          "none",         NULL              },
-    { 1, "Fine",          "fine",         NULL              },
-    { 2, "Medium-Fine",   "mediumfine",   NULL              },
+    { 1, "Ultrafine",     "ultrafine",    NULL              },
+    { 2, "Fine",          "fine",         NULL              },
     { 3, "Medium",        "medium",       NULL              },
-    { 4, "Medium-Coarse", "mediumcoarse", NULL              },
-    { 5, "Coarse",        "coarse",       NULL              },
+    { 4, "Coarse",        "coarse",       NULL              },
+    { 5, "Very Coarse",   "verycoarse",   NULL              },
     { 0, NULL,            NULL,           NULL              }
 };
 
@@ -507,7 +507,7 @@ static hb_dict_t * generate_unsharp_settings(const char *preset,
                 strength[0] = strength[1] = 1.2;
             }
         }
-        else if (!strcasecmp(tune, "fine"))
+        else if (!strcasecmp(tune, "ultrafine"))
         {
             strength[0]     = 0.4; strength[1] = 0.25;
             size[0]         =      size[1]     = 3;
@@ -532,7 +532,7 @@ static hb_dict_t * generate_unsharp_settings(const char *preset,
                 strength[0] = 1.5;  strength[1] = 0.9;
             }
         }
-        else if (!strcasecmp(tune, "mediumfine"))
+        else if (!strcasecmp(tune, "fine"))
         {
             strength[0]     = 0.275; strength[1] = 0.165;
             size[0]         = 7;     size[1]     = 5;
@@ -582,7 +582,7 @@ static hb_dict_t * generate_unsharp_settings(const char *preset,
                 strength[0] = 1.35;   strength[1] = 0.9;
             }
         }
-        else if (!strcasecmp(tune, "mediumcoarse"))
+        else if (!strcasecmp(tune, "coarse"))
         {
             strength[0]     = 0.275; strength[1] = 0.165;
             size[0]         = 11;    size[1]     = 7;
@@ -607,7 +607,7 @@ static hb_dict_t * generate_unsharp_settings(const char *preset,
                 strength[0] = 1.35;   strength[1] = 0.9;
             }
         }
-        else if (!strcasecmp(tune, "coarse"))
+        else if (!strcasecmp(tune, "verycoarse"))
         {
             strength[0]     = 0.275; strength[1] = 0.165;
             size[0]         = 13;    size[1]     = 9;

diff --git a/macosx/English.lproj/HBPictureViewController.xib b/macosx/English.lproj/HBPictureViewController.xib
index 049dfb7e1f98e63d0aab402fb72f36458b8ed717..7d7d17d566f33e59480924e04eafa8e2c2e088d0 100644 (file)
--- a/macosx/English.lproj/HBPictureViewController.xib
+++ b/macosx/English.lproj/HBPictureViewController.xib
@@ -1354,7 +1354,7 @@ Lapsharp sharpens by using convolution kernels approximating Laplacian edge filt
 
 None uses the default preset settings.
 
-Unsharp can be tuned for Fine, Medium-Fine, Medium, Medium-Coarse, or Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.
+Unsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.
 
 Lapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.
 

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
index 5f16110fe813ad606d88384877dccec3b87582c6..70380a1681465d30885aec08e33e1ef11e9e2be4 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
@@ -292,7 +292,7 @@ namespace HandBrakeWPF.Properties {
         ///\r
         ///None uses the default preset settings.\r
         ///\r
-        ///Unsharp can be tuned for Fine, Medium-Fine, Medium, Medium-Coarse, or Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\r
+        ///Unsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\r
         ///\r
         ///Lapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharp [rest of string was truncated]";.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
index 4792a539f71f75722b7e18398a19c93657d4db10..20be73cef34597c9ed1d9bcfb200969835127f0b 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
@@ -444,7 +444,7 @@ Lapsharp sharpens by using convolution kernels approximating Laplacian edge filt
 \r
 None uses the default preset settings.\r
 \r
-Unsharp can be tuned for Fine, Medium-Fine, Medium, Medium-Coarse, or Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\r
+Unsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\r
 \r
 Lapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\r
 \r