From d335a2de1dc5832bd729708c16c5636a0505a59b Mon Sep 17 00:00:00 2001 From: Jake Archibald Date: Wed, 5 May 2021 11:04:06 +0100 Subject: [PATCH] Bring chroma forward a step --- codecs/mozjpeg/enc/mozjpeg_enc.cpp | 17 +++++++++-------- codecs/mozjpeg/enc/mozjpeg_enc.wasm | Bin 236447 -> 236447 bytes codecs/mozjpeg/enc/mozjpeg_node_enc.wasm | Bin 236447 -> 236447 bytes 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/codecs/mozjpeg/enc/mozjpeg_enc.cpp b/codecs/mozjpeg/enc/mozjpeg_enc.cpp index 7f9a9a72..f955f335 100644 --- a/codecs/mozjpeg/enc/mozjpeg_enc.cpp +++ b/codecs/mozjpeg/enc/mozjpeg_enc.cpp @@ -183,7 +183,7 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio } scanptr->Ss = scanptr->Se = scanptr->Ah = scanptr->Al = 0; scanptr++; - // Luma progression + // Luma progressions scanptr->comps_in_scan = 1; scanptr->component_index[0] = 0; scanptr->Ss = 1; @@ -198,13 +198,6 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio scanptr->Ah = 2; scanptr->Al = 1; scanptr++; - scanptr->comps_in_scan = 1; - scanptr->component_index[0] = 0; - scanptr->Ss = 1; - scanptr->Se = 63; - scanptr->Ah = 1; - scanptr->Al = 0; - scanptr++; // Chroma full scanptr->comps_in_scan = 1; scanptr->component_index[0] = 2; @@ -220,6 +213,14 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio scanptr->Ah = 0; scanptr->Al = 0; scanptr++; + // Luma full + scanptr->comps_in_scan = 1; + scanptr->component_index[0] = 0; + scanptr->Ss = 1; + scanptr->Se = 63; + scanptr->Ah = 1; + scanptr->Al = 0; + scanptr++; } } else { cinfo.num_scans = 0; diff --git a/codecs/mozjpeg/enc/mozjpeg_enc.wasm b/codecs/mozjpeg/enc/mozjpeg_enc.wasm index e1fea38efbf670851ad1a0ca5fae042ceea3cb5b..d6c9f0795c2faf3479e9d076667042933c2655c7 100755 GIT binary patch delta 74 zcmbQgop1hjzJ@J~@0!IJ&6zGRDzG>;HZ(MRU^izv0pc)D=V)P6;1n=tngHT5OgC&{ W6k!D^QD}E-VFY5P?QSj1k>UVuD;5L* delta 88 zcmbQgop1hjzJ@J~@0z6;%$Y7QDzG>;HZ(MRU^izv0pkcvXK7(nkW(;cng9}FG-v97 XNrBWgfCby#S{Q+tX}ensbEG%`+)Wwt diff --git a/codecs/mozjpeg/enc/mozjpeg_node_enc.wasm b/codecs/mozjpeg/enc/mozjpeg_node_enc.wasm index e1fea38efbf670851ad1a0ca5fae042ceea3cb5b..d6c9f0795c2faf3479e9d076667042933c2655c7 100755 GIT binary patch delta 74 zcmbQgop1hjzJ@J~@0!IJ&6zGRDzG>;HZ(MRU^izv0pc)D=V)P6;1n=tngHT5OgC&{ W6k!D^QD}E-VFY5P?QSj1k>UVuD;5L* delta 88 zcmbQgop1hjzJ@J~@0z6;%$Y7QDzG>;HZ(MRU^izv0pkcvXK7(nkW(;cng9}FG-v97 XNrBWgfCby#S{Q+tX}ensbEG%`+)Wwt