summaryrefslogtreecommitdiffstats
path: root/third_party/jpeg-xl/lib/jxl/modular/options.h
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/jpeg-xl/lib/jxl/modular/options.h')
-rw-r--r--third_party/jpeg-xl/lib/jxl/modular/options.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/third_party/jpeg-xl/lib/jxl/modular/options.h b/third_party/jpeg-xl/lib/jxl/modular/options.h
index ce6596b912..6613b513de 100644
--- a/third_party/jpeg-xl/lib/jxl/modular/options.h
+++ b/third_party/jpeg-xl/lib/jxl/modular/options.h
@@ -11,6 +11,8 @@
#include <array>
#include <vector>
+#include "lib/jxl/enc_ans_params.h"
+
namespace jxl {
using PropertyVal = int32_t;
@@ -37,6 +39,8 @@ enum class Predictor : uint32_t {
15, // Find the best decision tree for predictors/predictor per row
};
+constexpr Predictor kUndefinedPredictor = static_cast<Predictor>(~0u);
+
constexpr size_t kNumModularPredictors =
static_cast<size_t>(Predictor::Average4) + 1;
constexpr size_t kNumModularEncoderPredictors =
@@ -80,7 +84,7 @@ struct ModularOptions {
size_t max_property_values = 32;
// Predictor to use for each channel.
- Predictor predictor = static_cast<Predictor>(-1);
+ Predictor predictor = kUndefinedPredictor;
int wp_mode = 0;
@@ -108,6 +112,8 @@ struct ModularOptions {
};
TreeKind tree_kind = TreeKind::kLearn;
+ HistogramParams histogram_params;
+
// Ignore the image and just pretend all tokens are zeroes
bool zero_tokens = false;
};