Skip to content

Commit 6271247

Browse files
Make -p more progressive (#4258)
* Use progressive DC and Centre First group ordering * Compile fixes :) --------- Co-authored-by: Galaxy4594 <164440799+Galaxy4594@users.noreply.github.com>
1 parent 6bc5cdf commit 6271247

1 file changed

Lines changed: 14 additions & 8 deletions

File tree

tools/cjxl_main.cc

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,19 @@ void ProcessFlags(const jxl::extras::Codec codec,
764764

765765
SetDistanceFromFlags(cmdline, args, params, codec);
766766

767+
bool responsive_set = cmdline->GetOption(args->opt_responsive_id)->matched();
768+
769+
// Set progressive options before processing flags
770+
if (args->progressive) {
771+
args->qprogressive_ac = true;
772+
if (args->progressive_dc == -1) {
773+
args->progressive_dc = 1;
774+
}
775+
args->group_order = jxl::Override::kOn;
776+
args->responsive = 1;
777+
responsive_set = true;
778+
}
779+
767780
if (args->group_order != jxl::Override::kOn &&
768781
(args->center_x != -1 || args->center_y != -1)) {
769782
std::cerr << "Invalid flag combination. Setting --center_x or --center_y "
@@ -788,8 +801,6 @@ void ProcessFlags(const jxl::extras::Codec codec,
788801
});
789802

790803
// Progressive/responsive mode settings.
791-
bool responsive_set = cmdline->GetOption(args->opt_responsive_id)->matched();
792-
793804
ProcessFlag("progressive_dc", args->progressive_dc,
794805
JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC, params,
795806
[](int64_t x) -> std::string {
@@ -798,12 +809,7 @@ void ProcessFlags(const jxl::extras::Codec codec,
798809
});
799810
ProcessFlag("progressive_ac", static_cast<int64_t>(args->progressive_ac),
800811
JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC, params);
801-
802-
if (args->progressive) {
803-
args->qprogressive_ac = true;
804-
args->responsive = 1;
805-
responsive_set = true;
806-
}
812+
807813
if (responsive_set) {
808814
ProcessFlag("responsive", args->responsive,
809815
JXL_ENC_FRAME_SETTING_RESPONSIVE, params);

0 commit comments

Comments
 (0)