Force creation of LSE marker for images with 12+ bit depth (for better JAI compatibility). Removed redundant type.

jdv_cp · jdv_cp · commit 232a4c2019ff · 2010-11-02T14:24:37.000-07:00
diff --git a/..svnbridge/.svnbridge b/..svnbridge/.svnbridge
@@ -1,41 +1,4 @@
-﻿<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:ignore</Name><Value>debug
-jpeg_ls_v2.2
-jpegls_0.04.981012
-junk
-release
-*.user
-CharLS.suo
-CharLS.ncb
-bin
-CMakeFiles
-xx
-</Value></Property><Property><Name>svn:ignore</Name><Value>debug
-jpeg_ls_v2.2
-jpegls_0.04.981012
-junk
-release
-*.user
-CharLS.suo
-CharLS.ncb
-bin
-CMakeFiles
-xx
-Debug
-CMakeCache.txt
-</Value></Property><Property><Name>svn:ignore</Name><Value>debug
-jpeg_ls_v2.2
-jpegls_0.04.981012
-junk
-release
-*.user
-CharLS.suo
-CharLS.ncb
-bin
-CMakeFiles
-xx
-Debug
-CMakeCache.txt
-_ReSharper.CharLS
+﻿<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:ignore</Name><Value>*.suo
 </Value></Property><Property><Name>svn:ignore</Name><Value>debug
 jpeg_ls_v2.2
 jpegls_0.04.981012
@@ -51,4 +14,6 @@ Debug
 CMakeCache.txt
 _ReSharper.CharLS
 Release
+x64
+ipch
 </Value></Property></Properties></ItemProperties>
diff --git a/header.cpp b/header.cpp
@@ -36,6 +36,30 @@ bool IsDefault(const JlsCustomParameters* pcustom)
 }
 
 
+LONG CLAMP(LONG i, LONG j, LONG MAXVAL)
+{
+	if (i > MAXVAL || i < j)
+		return j;
+
+	return i;
+}
+
+
+JlsCustomParameters ComputeDefault(LONG MAXVAL, LONG NEAR)
+{
+	JlsCustomParameters preset = JlsCustomParameters();
+
+	LONG FACTOR = (MIN(MAXVAL, 4095) + 128)/256;
+
+	preset.T1 = CLAMP(FACTOR * (BASIC_T1 - 2) + 2 + 3*NEAR, NEAR + 1, MAXVAL);
+	preset.T2 = CLAMP(FACTOR * (BASIC_T2 - 3) + 3 + 5*NEAR, preset.T1, MAXVAL);
+	preset.T3 = CLAMP(FACTOR * (BASIC_T3 - 4) + 4 + 7*NEAR, preset.T2, MAXVAL);
+	preset.MAXVAL = MAXVAL;
+	preset.RESET = BASIC_RESET;
+	return preset;
+}
+
+
 JLS_ERROR CheckParameterCoherent(const JlsParameters* pparams)
 {
 	if (pparams->bitspersample < 6 || pparams->bitspersample > 16)
@@ -550,6 +574,11 @@ void JLSOutputStream::AddScan(const void* compareData, const JlsParameters* ppar
 	{
 		_segments.push_back(CreateLSE(&pparams->custom));		
 	}
+	else if (pparams->bitspersample > 12)
+	{
+		JlsCustomParameters preset = ComputeDefault((1 << pparams->bitspersample) - 1, pparams->allowedlossyerror);
+        _segments.push_back(CreateLSE(&preset));
+	}
 
 	_icompLast += 1;
 	_segments.push_back(EncodeStartOfScan(pparams,pparams->ilv == ILV_NONE ? _icompLast : -1));
diff --git a/header.h b/header.h
@@ -23,6 +23,14 @@
 #define JPEG_APP8 0xE8 // colorXForm
 
 
+
+// Default bin sizes for JPEG-LS statistical modeling. Can be overriden at compression time, however this is rarely done.
+const int BASIC_T1		= 3;
+const int BASIC_T2		= 7;
+const int BASIC_T3		= 21;
+
+const LONG BASIC_RESET	= 64;
+
 class JLSOutputStream;
 
 
@@ -37,6 +45,7 @@ class JlsCodecFactory
 
 JLS_ERROR CheckParameterCoherent(const JlsParameters* pparams);
 
+JlsCustomParameters ComputeDefault(LONG MAXVAL, LONG NEAR);
 
 //
 // JpegSegment
diff --git a/jpegls.cpp b/jpegls.cpp
@@ -28,17 +28,14 @@ signed char* JlsContext::_tableC = CreateTableC();
 // used to determine how large runs should be encoded at a time. 
 const int J[32]			= {0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 10, 11, 12, 13, 14, 15};
 
-// Default bin sizes for JPEG-LS statistical modeling. Can be overriden at compression time, however this is rarely done.
-const int BASIC_T1		= 3;
-const int BASIC_T2		= 7;
-const int BASIC_T3		= 21;
+
 
 #include "losslesstraits.h"
 #include "defaulttraits.h"
 
 #include "scan.h"
 
-signed char QuantizeGratientOrg(const Presets& preset, LONG NEAR, LONG Di)
+signed char QuantizeGratientOrg(const JlsCustomParameters& preset, LONG NEAR, LONG Di)
 {
 	if (Di <= -preset.T3) return  -4;
 	if (Di <= -preset.T2) return  -3;
@@ -56,7 +53,7 @@ signed char QuantizeGratientOrg(const Presets& preset, LONG NEAR, LONG Di)
 
 std::vector<signed char> CreateQLutLossless(LONG cbit)
 {
-	Presets preset = ComputeDefault((1 << cbit) - 1, 0);
+	JlsCustomParameters preset = ComputeDefault((1 << cbit) - 1, 0);
 	LONG range = preset.MAXVAL + 1;
 
 	std::vector<signed char> lut(range * 2);
diff --git a/losslesstraits.h b/losslesstraits.h
@@ -7,6 +7,8 @@
 #ifndef CHARLS_LOSSLESSTRAITS
 #define CHARLS_LOSSLESSTRAITS
 
+#include "header.h"
+
 //
 // optimized trait classes for lossless compression of 8 bit color and 8/16 bit monochrome images.
 // This class is assumes MAXVAL correspond to a whole number of bits, and no custom RESET value is set when encoding.
diff --git a/scan.h b/scan.h
@@ -27,28 +27,6 @@ inlinehint LONG ApplySign(LONG i, LONG sign)
 { return (sign ^ i) - sign; }									
 
 
-LONG CLAMP(LONG i, LONG j, LONG MAXVAL)
-{
-	if (i > MAXVAL || i < j)
-		return j;
-
-	return i;
-}
-
-Presets ComputeDefault(LONG MAXVAL, LONG NEAR)
-{
-	Presets preset;
-
-	LONG FACTOR = (MIN(MAXVAL, 4095) + 128)/256;
-
-	preset.T1 = CLAMP(FACTOR * (BASIC_T1 - 2) + 2 + 3*NEAR, NEAR + 1, MAXVAL);
-	preset.T2 = CLAMP(FACTOR * (BASIC_T2 - 3) + 3 + 5*NEAR, preset.T1, MAXVAL);
-	preset.T3 = CLAMP(FACTOR * (BASIC_T3 - 4) + 4 + 7*NEAR, preset.T2, MAXVAL);
-	preset.MAXVAL = MAXVAL;
-	preset.RESET = BASIC_RESET;
-	return preset;
-}
-
 
 // Two alternatives for GetPredictedValue() (second is slightly faster due to reduced branching)
 
@@ -153,8 +131,7 @@ class JlsCodec : public STRATEGY
 
 	  void SetPresets(const JlsCustomParameters& presets)
 	  {
-
-		  Presets presetDefault = ComputeDefault(traits.MAXVAL, traits.NEAR);
+		  JlsCustomParameters presetDefault = ComputeDefault(traits.MAXVAL, traits.NEAR);
 
 		  InitParams(presets.T1 != 0 ? presets.T1 : presetDefault.T1,
 			  presets.T2 != 0 ? presets.T2 : presetDefault.T2,
@@ -390,7 +367,7 @@ void JlsCodec<TRAITS,STRATEGY>::InitQuantizationLUT()
 	// for lossless mode with default parameters, we have precomputed te luts for bitcounts 8,10,12 and 16 
 	if (traits.NEAR == 0 && traits.MAXVAL == (1 << traits.bpp) - 1)
 	{
-		Presets presets = ComputeDefault(traits.MAXVAL, traits.NEAR);
+		JlsCustomParameters presets = ComputeDefault(traits.MAXVAL, traits.NEAR);
 		if (presets.T1 == T1 && presets.T2 == T2 && presets.T3 == T3)
 		{
 			if (traits.bpp == 8) 
diff --git a/streams.h b/streams.h
@@ -97,21 +97,6 @@ class JLSOutputStream
 };
 
 
-
-struct Presets : public JlsCustomParameters
-{
-public:
-	Presets()			
-	{		
-		MAXVAL = 0;
-		T1 = 0;
-		T2 = 0;
-		T3 = 0;
-		RESET = 0;
-	}
-};
-
-
 //
 // JLSInputStream: minimal implementation to read JPEG header streams
 //
diff --git a/test/..svnbridge/.svnbridge b/test/..svnbridge/.svnbridge
@@ -37,4 +37,16 @@ rgb8bit
 jlsimage
 incorrect_images
 compsamples_jpegls
+</Value></Property><Property><Name>svn:ignore</Name><Value>Debug
+mars
+Release
+*.user
+CMakeFiles
+CMakeCache.txt
+rgb16bit
+rgb8bit
+jlsimage
+incorrect_images
+compsamples_jpegls
+x64
 </Value></Property></Properties></ItemProperties>
diff --git a/util.h b/util.h
@@ -20,8 +20,6 @@
 #endif
 
 
-const LONG BASIC_RESET	= 64;
-
 inline LONG log_2(LONG n)
 {
 	LONG x = 0;

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`#endif`
`21`	`21`
`22`	`22`
`23`		`-const LONG BASIC_RESET = 64;`
`24`		`-`
`25`	`23`	`inline LONG log_2(LONG n)`
`26`	`24`	`{`
`27`	`25`	`LONG x = 0;`