这是indexloc提供的服务，不要输入任何密码
Skip to content

Add djxl option to disable decoding to pixels #4498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 3, 2025
Merged

Add djxl option to disable decoding to pixels #4498

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37830d5
Add --reconstruct_jpeg option
alistair7 Oct 30, 2025
98dabb4
If output disabled, still try to reconstruct JPEG
alistair7 Oct 30, 2025
23c55ce
Merge branch 'main' into alistair7/reconstruct-jpeg
eustas Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions tools/djxl_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ struct DecompressArgs {
"encode a new (lossy) JPEG.",
&pixels_to_jpeg, &SetBooleanTrue, 1);

cmdline->AddOptionFlag(
'J', "reconstruct_jpeg",
"Losslessly reconstruct a JPEG if possible, and fail otherwise.",
&reconstruct_jpeg, &SetBooleanTrue, 1);

opt_jpeg_quality_id = cmdline->AddOptionValue(
'q', "jpeg_quality", "N",
"Sets the JPEG output quality, default is 95. "
Expand Down Expand Up @@ -250,6 +255,7 @@ struct DecompressArgs {
uint32_t downsampling = 0;
bool allow_partial_files = false;
bool pixels_to_jpeg = false;
bool reconstruct_jpeg = false;
size_t jpeg_quality = 95;
bool use_sjpeg = false;
bool render_spotcolors = true;
Expand Down Expand Up @@ -495,6 +501,24 @@ int main(int argc, const char* argv[]) {
!cmdline.GetOption(args.opt_jpeg_quality_id)->matched())) {
args.bits_per_sample = 0;
}
if (args.reconstruct_jpeg) {
// If output is disabled, still try to reconstruct JPEG
if (filename_out.empty()) {
codec = jxl::extras::Codec::kJPG;
}
if (codec != jxl::extras::Codec::kJPG) {
fprintf(stderr,
"Error: --reconstruct_jpeg requires output format to be JPEG.\n");
return EXIT_FAILURE;
}
if (args.pixels_to_jpeg ||
cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) {
fprintf(stderr,
"Error: --pixels_to_jpeg and --jpeg_quality cannot be"
" used with --reconstruct_jpeg.\n");
return EXIT_FAILURE;
}
}

jpegxl::tools::SpeedStats stats;
size_t num_worker_threads = JxlThreadParallelRunnerDefaultNumWorkerThreads();
Expand All @@ -521,6 +545,10 @@ int main(int argc, const char* argv[]) {
if (!DecompressJxlReconstructJPEG(args, compressed, runner.get(), &bytes,
&stats)) {
if (bytes.empty()) {
if (args.reconstruct_jpeg) {
fprintf(stderr, "Error: could not decode losslessly to JPEG.\n");
return EXIT_FAILURE;
}
if (!args.quiet) {
fprintf(stderr,
"Warning: could not decode losslessly to JPEG. Retrying "
Expand Down
Loading