X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;fp=perl%2FSesse%2Fpr0n%2FCommon.pm;h=816c003cb016eac4d55b11d3dde730ceb89b19bf;hp=f6cea5b98ab8e9de7721decb63f167707eea8e43;hb=a2d71665db6bf86f40ae9deb956cfc6463645529;hpb=c7fd47d6b2323d28a5ece7f3019b40224605cb61

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index f6cea5b..816c003 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -573,16 +573,21 @@ sub read_original_image {
 }
 
 sub ensure_cached {
-	my ($r, $avif_ok, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_;
+	my ($r, $avif_ok, $jxl_ok, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_;
 
 	my $fname = get_disk_location($r, $id);
 	unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
 		return ($fname, undef);
 	}
 
-	# See if we have an up-to-date AVIF to serve.
+	# See if we have an up-to-date JPEG-XL or AVIF to serve.
 	# (We never generate them on-the-fly, since they're so slow.)
-	my $cachename = get_cache_location($id, $xres, $yres, 'avif');
+	my $cachename = get_cache_location($id, $xres, $yres, 'jxl');
+	if ($jxl_ok && -r $cachename and (-M $cachename <= -M $fname)) {
+		return ($cachename, 'image/jxl');
+	}
+
+	$cachename = get_cache_location($id, $xres, $yres, 'avif');
 	if ($avif_ok && -r $cachename and (-M $cachename <= -M $fname)) {
 		return ($cachename, 'image/avif');
 	}
@@ -677,6 +682,18 @@ sub make_cache {
 			unlink($raw_filename);
 			system('MP4Box', '-quiet', '-add-image', "$ivf_filename:primary", '-ab', 'avif', '-ab', 'miaf', '-new', $cachename);
 			unlink($ivf_filename);
+		} elsif ($format eq 'jxl') {
+			# Similar, for JPEG-XL.
+			(my $dirname = $cachename) =~ s,/[^/]*$,,;
+			my ($fh, $raw_filename) = File::Temp::tempfile('tmp.XXXXXXXX', DIR => $dirname, SUFFIX => '.ppm');
+			my %parms = (
+				file => $fh,
+				filename => $raw_filename
+			);
+			$cimg->write(%parms);
+			close($fh);
+			system('cjxl', '-p', $raw_filename, $cachename);
+			unlink($raw_filename);
 		} else {
 			die "Unknown format $format";
 		}