Immediately discontinue the current compression/decompression/transform diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJ.html b/java/doc/org/libjpegturbo/turbojpeg/TJ.html index 6733749..a544179 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -210,138 +210,145 @@ extends java.lang.Object static int +FLAG_PROGRESSIVE +

Use progressive entropy coding in JPEG images generated by compression and + transform operations.

+ + + +static int FLAG_STOPONWARNING

Immediately discontinue the current compression/decompression/transform operation if the underlying codec throws a warning (non-fatal error).

- + static int NUMCS

The number of JPEG colorspaces

- + static int NUMERR

The number of error codes

- + static int NUMPF

The number of pixel formats

- + static int NUMSAMP

The number of chrominance subsampling options

- + static int PF_ABGR

ABGR pixel format.

- + static int PF_ARGB

ARGB pixel format.

- + static int PF_BGR

BGR pixel format.

- + static int PF_BGRA

BGRA pixel format.

- + static int PF_BGRX

BGRX pixel format.

- + static int PF_CMYK

CMYK pixel format.

- + static int PF_GRAY

Grayscale pixel format.

- + static int PF_RGB

RGB pixel format.

- + static int PF_RGBA

RGBA pixel format.

- + static int PF_RGBX

RGBX pixel format.

- + static int PF_XBGR

XBGR pixel format.

- + static int PF_XRGB

XRGB pixel format.

- + static int SAMP_411

4:1:1 chrominance subsampling.

- + static int SAMP_420

4:2:0 chrominance subsampling.

- + static int SAMP_422

4:2:2 chrominance subsampling.

- + static int SAMP_440

4:4:0 chrominance subsampling.

- + static int SAMP_444

4:4:4 chrominance subsampling (no chrominance subsampling).

- + static int SAMP_GRAY

Grayscale.

@@ -992,6 +999,20 @@ public static final int FLAG_FORCESSE3

See Also:: Constant Field Values

+ + + +

+
FLAG_PROGRESSIVE
+
```
public static final int FLAG_PROGRESSIVE
```
+
Use progressive entropy coding in JPEG images generated by compression and + transform operations. Progressive entropy coding will generally improve + compression relative to baseline entropy coding (the default), but it will + reduce compression and decompression performance considerably.
+
See Also:
Constant Field Values
+

diff --git a/java/org/libjpegturbo/turbojpeg/TJ.java b/java/org/libjpegturbo/turbojpeg/TJ.java index 4e97aed..045e829 100644 --- a/java/org/libjpegturbo/turbojpeg/TJ.java +++ b/java/org/libjpegturbo/turbojpeg/TJ.java @@ -348,16 +348,16 @@ public final class TJ { * The uncompressed source/destination image is stored in bottom-up (Windows, * OpenGL) order, not top-down (X11) order. */ - public static final int FLAG_BOTTOMUP = 2; + public static final int FLAG_BOTTOMUP = 2; @Deprecated - public static final int FLAG_FORCEMMX = 8; + public static final int FLAG_FORCEMMX = 8; @Deprecated - public static final int FLAG_FORCESSE = 16; + public static final int FLAG_FORCESSE = 16; @Deprecated - public static final int FLAG_FORCESSE2 = 32; + public static final int FLAG_FORCESSE2 = 32; @Deprecated - public static final int FLAG_FORCESSE3 = 128; + public static final int FLAG_FORCESSE3 = 128; /** * When decompressing an image that was compressed using chrominance @@ -366,7 +366,7 @@ public final class TJ { * creates a smooth transition between neighboring chrominance components in * order to reduce upsampling artifacts in the decompressed image. */ - public static final int FLAG_FASTUPSAMPLE = 256; + public static final int FLAG_FASTUPSAMPLE = 256; /** * Use the fastest DCT/IDCT algorithm available in the underlying codec. The * default if this flag is not specified is implementation-specific. For @@ -375,7 +375,7 @@ public final class TJ { * only a very slight effect on accuracy, but it uses the accurate algorithm * when decompressing, because this has been shown to have a larger effect. */ - public static final int FLAG_FASTDCT = 2048; + public static final int FLAG_FASTDCT = 2048; /** * Use the most accurate DCT/IDCT algorithm available in the underlying * codec. The default if this flag is not specified is @@ -385,7 +385,7 @@ public final class TJ { * but it uses the accurate algorithm when decompressing, because this has * been shown to have a larger effect. */ - public static final int FLAG_ACCURATEDCT = 4096; + public static final int FLAG_ACCURATEDCT = 4096; /** * Immediately discontinue the current compression/decompression/transform * operation if the underlying codec throws a warning (non-fatal error). The @@ -393,6 +393,13 @@ public final class TJ { * error is encountered. */ public static final int FLAG_STOPONWARNING = 8192; + /** + * Use progressive entropy coding in JPEG images generated by compression and + * transform operations. Progressive entropy coding will generally improve + * compression relative to baseline entropy coding (the default), but it will + * reduce compression and decompression performance considerably. + */ + public static final int FLAG_PROGRESSIVE = 16384; /** diff --git a/tjbench.c b/tjbench.c index 50ac852..36ea6cf 100644 --- a/tjbench.c +++ b/tjbench.c @@ -740,6 +740,8 @@ void usage(char *progname) printf(" codec\n"); printf("-accuratedct = Use the most accurate DCT/IDCT algorithms available in the\n"); printf(" underlying codec\n"); + printf("-progressive = Use progressive entropy coding in JPEG images generated by\n"); + printf(" compression and transform operations.\n"); printf("-subsamp = When testing JPEG compression, this option specifies the level\n"); printf(" of chrominance subsampling to use ( = 444, 422, 440, 420, 411, or\n"); printf(" GRAY). The default is to test Grayscale, 4:2:0, 4:2:2, and 4:4:4 in\n"); @@ -841,6 +843,11 @@ int main(int argc, char *argv[]) printf("Using most accurate DCT/IDCT algorithm\n\n"); flags|=TJFLAG_ACCURATEDCT; } + if(!strcasecmp(argv[i], "-progressive")) + { + printf("Using progressive entropy coding\n\n"); + flags|=TJFLAG_PROGRESSIVE; + } if(!strcasecmp(argv[i], "-rgb")) pf=TJPF_RGB; if(!strcasecmp(argv[i], "-rgbx")) pf=TJPF_RGBX; if(!strcasecmp(argv[i], "-bgr")) pf=TJPF_BGR; diff --git a/turbojpeg.c b/turbojpeg.c index 569f114..3b29c22 100644 --- a/turbojpeg.c +++ b/turbojpeg.c @@ -263,8 +263,10 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo, jpeg_set_colorspace(cinfo, JCS_YCCK); else jpeg_set_colorspace(cinfo, JCS_YCbCr); + if(flags&TJFLAG_PROGRESSIVE) + jpeg_simple_progression(cinfo); #ifndef NO_GETENV - if((env=getenv("TJ_PROGRESSIVE"))!=NULL && strlen(env)>0 + else if((env=getenv("TJ_PROGRESSIVE"))!=NULL && strlen(env)>0 && !strcmp(env, "1")) jpeg_simple_progression(cinfo); #endif @@ -2187,6 +2189,8 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, jpeg_copy_critical_parameters(dinfo, cinfo); dstcoefs=jtransform_adjust_parameters(dinfo, cinfo, srccoefs, &xinfo[i]); + if(flags&TJFLAG_PROGRESSIVE) + jpeg_simple_progression(cinfo); if(!(t[i].options&TJXOPT_NOOUTPUT)) { jpeg_write_coefficients(cinfo, dstcoefs); diff --git a/turbojpeg.h b/turbojpeg.h index b512ecb..4edcc68 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -390,6 +390,13 @@ enum TJCS * is encountered. */ #define TJFLAG_STOPONWARNING 8192 +/** + * Use progressive entropy coding in JPEG images generated by the compression + * and transform functions. Progressive entropy coding will generally improve + * compression relative to baseline entropy coding (the default), but it will + * reduce compression and decompression performance considerably. + */ +#define TJFLAG_PROGRESSIVE 16384 /**