quality & dict size presets

Source/astcenc_entry.cpp

@@ -56,6 +56,8 @@ struct astcenc_preset_config
  float tune_3partition_early_out_limit_factor;
  float tune_2plane_early_out_limit_correlation;
  float tune_search_mode0_enable;
+ float rdo_quality;
+ unsigned int rdo_dict_size;
 };
 
 /**
@@ -64,22 +66,22 @@ struct astcenc_preset_config
 static const std::array<astcenc_preset_config, 6> preset_configs_high {{
  {
  ASTCENC_PRE_FASTEST,
- 2, 10, 6, 4, 43, 2, 2, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.85f, 0.0f
+ 2, 10, 6, 4, 43, 2, 2, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.85f, 0.0f, 4.0f, 256
  }, {
  ASTCENC_PRE_FAST,
- 3, 18, 10, 8, 55, 3, 3, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.90f, 0.0f
+ 3, 18, 10, 8, 55, 3, 3, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.90f, 0.0f, 2.0f, 1024
  }, {
  ASTCENC_PRE_MEDIUM,
- 4, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 2.5f, 1.1f, 1.05f, 0.95f, 0.0f
+ 4, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 2.5f, 1.1f, 1.05f, 0.95f, 0.0f, 1.0f, 4096
  }, {
  ASTCENC_PRE_THOROUGH,
- 4, 82, 60, 30, 94, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.35f, 1.15f, 0.97f, 0.0f
+ 4, 82, 60, 30, 94, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.35f, 1.15f, 0.97f, 0.0f, 0.5f, 4096
  }, {
  ASTCENC_PRE_VERYTHOROUGH,
- 4, 256, 128, 64, 98, 4, 6, 8, 6, 4, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 0.0f
+ 4, 256, 128, 64, 98, 4, 6, 8, 6, 4, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 0.0f, 0.4f, 4096
  }, {
  ASTCENC_PRE_EXHAUSTIVE,
- 4, 512, 512, 512, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 0.0f
+ 4, 512, 512, 512, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 0.0f, 0.2f, 4096
  }
 }};
 
@@ -89,22 +91,22 @@ static const std::array<astcenc_preset_config, 6> preset_configs_high {{
 static const std::array<astcenc_preset_config, 6> preset_configs_mid {{
  {
  ASTCENC_PRE_FASTEST,
- 2, 10, 6, 4, 43, 2, 2, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.80f, 1.0f
+ 2, 10, 6, 4, 43, 2, 2, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.80f, 1.0f, 4.0f, 256
  }, {
  ASTCENC_PRE_FAST,
- 3, 18, 12, 10, 55, 3, 3, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.85f, 1.0f
+ 3, 18, 12, 10, 55, 3, 3, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.85f, 1.0f, 2.0f, 1024
  }, {
  ASTCENC_PRE_MEDIUM,
- 3, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 3.0f, 1.1f, 1.05f, 0.90f, 1.0f
+ 3, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 3.0f, 1.1f, 1.05f, 0.90f, 1.0f, 1.0f, 4096
  }, {
  ASTCENC_PRE_THOROUGH,
- 4, 82, 60, 30, 94, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.4f, 1.2f, 0.95f, 0.0f
+ 4, 82, 60, 30, 94, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.4f, 1.2f, 0.95f, 0.0f, 0.5f, 4096
  }, {
  ASTCENC_PRE_VERYTHOROUGH,
- 4, 256, 128, 64, 98, 4, 6, 8, 6, 3, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 0.0f
+ 4, 256, 128, 64, 98, 4, 6, 8, 6, 3, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 0.0f, 0.4f, 4096
  }, {
  ASTCENC_PRE_EXHAUSTIVE,
- 4, 256, 256, 256, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 0.0f
+ 4, 256, 256, 256, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 0.0f, 0.2f, 4096
  }
 }};
 
@@ -114,22 +116,22 @@ static const std::array<astcenc_preset_config, 6> preset_configs_mid {{
 static const std::array<astcenc_preset_config, 6> preset_configs_low {{
  {
  ASTCENC_PRE_FASTEST,
- 2, 10, 6, 4, 40, 2, 2, 2, 2, 2, 85.0f, 63.0f, 3.5f, 1.0f, 1.0f, 0.80f, 1.0f
+ 2, 10, 6, 4, 40, 2, 2, 2, 2, 2, 85.0f, 63.0f, 3.5f, 1.0f, 1.0f, 0.80f, 1.0f, 4.0f, 256
  }, {
  ASTCENC_PRE_FAST,
- 2, 18, 12, 10, 55, 3, 3, 2, 2, 2, 85.0f, 63.0f, 3.5f, 1.0f, 1.0f, 0.85f, 1.0f
+ 2, 18, 12, 10, 55, 3, 3, 2, 2, 2, 85.0f, 63.0f, 3.5f, 1.0f, 1.0f, 0.85f, 1.0f, 2.0f, 1024
  }, {
  ASTCENC_PRE_MEDIUM,
- 3, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 3.5f, 1.1f, 1.05f, 0.90f, 1.0f
+ 3, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 3.5f, 1.1f, 1.05f, 0.90f, 1.0f, 1.0f, 4096
  }, {
  ASTCENC_PRE_THOROUGH,
- 4, 82, 60, 30, 93, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.3f, 1.2f, 0.97f, 1.0f
+ 4, 82, 60, 30, 93, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.3f, 1.2f, 0.97f, 1.0f, 0.5f, 4096
  }, {
  ASTCENC_PRE_VERYTHOROUGH,
- 4, 256, 128, 64, 98, 4, 6, 8, 5, 2, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 1.0f
+ 4, 256, 128, 64, 98, 4, 6, 8, 5, 2, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 1.0f, 0.4f, 4096
  }, {
  ASTCENC_PRE_EXHAUSTIVE,
- 4, 256, 256, 256, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 1.0f
+ 4, 256, 256, 256, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 1.0f, 0.2f, 4096
  }
 }};
 
@@ -533,6 +535,8 @@ astcenc_error astcenc_config_init(
  config.tune_3partition_early_out_limit_factor = (*preset_configs)[start].tune_3partition_early_out_limit_factor;
  config.tune_2plane_early_out_limit_correlation = (*preset_configs)[start].tune_2plane_early_out_limit_correlation;
  config.tune_search_mode0_enable = (*preset_configs)[start].tune_search_mode0_enable;
+ config.rdo_quality = (*preset_configs)[start].rdo_quality;
+ config.rdo_dict_size = (*preset_configs)[start].rdo_dict_size;
  }
  // Start and end node are not the same - so interpolate between them
  else
@@ -572,11 +576,16 @@ astcenc_error astcenc_config_init(
  config.tune_3partition_early_out_limit_factor = LERP(tune_3partition_early_out_limit_factor);
  config.tune_2plane_early_out_limit_correlation = LERP(tune_2plane_early_out_limit_correlation);
  config.tune_search_mode0_enable = LERP(tune_search_mode0_enable);
+ config.rdo_quality = LERP(rdo_quality);
+ config.rdo_dict_size = LERPUI(rdo_dict_size);
  #undef LERP
  #undef LERPI
  #undef LERPUI
  }
 
+ config.rdo_max_smooth_block_error_scale = 10.0f;
+ config.rdo_max_smooth_block_std_dev = 18.0f;
+
  // Set heuristics to the defaults for each color profile
  config.cw_r_weight = 1.0f;
  config.cw_g_weight = 1.0f;
@@ -655,12 +664,6 @@ astcenc_error astcenc_config_init(
  }
  config.flags = flags;
 
- // These are the reasonable defaults that leverages performance & compression rate
- config.rdo_quality = 1.0f;
- config.rdo_dict_size = 4096;
- config.rdo_max_smooth_block_error_scale = 10.0f;
- config.rdo_max_smooth_block_std_dev = 18.0f;
-
  return ASTCENC_SUCCESS;
 }
 

Source/astcenccli_toplevel.cpp

@@ -1181,7 +1181,7 @@ static int edit_astcenc_config(
  config.rdo_enabled = true;
 
  // Unpacking RDO trials blocks requires full initialization
- if (config.rdo_quality > 0.0f && static_cast<bool>(config.flags & ASTCENC_FLG_SELF_DECOMPRESS_ONLY))
+ if (static_cast<bool>(config.flags & ASTCENC_FLG_SELF_DECOMPRESS_ONLY))
  {
  config.flags &= ~ASTCENC_FLG_SELF_DECOMPRESS_ONLY;
  }
@@ -1325,7 +1325,7 @@ static void print_astcenc_config(
  printf(" Candidate cutoff: %u candidates\n", config.tune_candidate_limit);
  printf(" Refinement cutoff: %u iterations\n", config.tune_refinement_limit);
  printf(" Compressor thread count: %d\n", cli_config.thread_count);
- printf(" RDO:  %s\n", config.rdo_enabled ? "Enabled" : "Disabled");
+ printf(" Rate-distortion opt: %s\n", config.rdo_enabled ? "Enabled" : "Disabled");
  if (config.rdo_enabled)
  {
  printf(" RDO multithreading: %s\n", config.rdo_no_multithreading ? "Disabled" : "Enabled");

Source/astcenccli_toplevel_help.cpp

@@ -396,11 +396,25 @@ ADVANCED COMPRESSION
  RDO quality scalar (lambda). Lower values yield higher
  quality/larger LZ compressed files, higher values yield lower
  quality/smaller LZ compressed files. A good range to try is [.2,4].
- Full range is [.001,50.0]. Default is 1.0.
+ Full range is [.001,50.0]. Preset defaults are:
+
+ -fastest : 4.0
+ -fast : 2.0
+ -medium : 1.0
+ -thorough : 0.5
+ -verythorough : 0.4
+ -exhaustive : 0.2
 
  -rdo-dict-size <number>
- RDO dictionary size in bytes. Default is 4096. Lower
- values=faster, but give less compression. Range is [64,65536].
+ RDO dictionary size in bytes. Lower values=faster,
+ but give less compression. Range is [64,65536]. Preset defaults are:
+
+ -fastest : 256
+ -fast : 1024
+ -medium : 4096
+ -thorough : 4096
+ -verythorough : 4096
+ -exhaustive : 4096
 
  -rdo-max-smooth-block-error-scale <factor>
  RDO max smooth block error scale. Range is [1,300].