diff --git a/ChangeLog.txt b/ChangeLog.txt index b1398f96..ad181b1e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -59,6 +59,9 @@ divisible by 16 bytes. 4.3 on OS X platforms would cause NASM to return numerous errors of the form "'%define' expects a macro identifier". +[9] Added flags to the TurboJPEG API that allow the caller to force the use of +either the fast or the accurate DCT/IDCT algorithms in the underlying codec. + 1.2.0 ===== diff --git a/doc/html/annotated.html b/doc/html/annotated.html index b7d3b54a..aed62136 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -81,7 +81,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/classes.html b/doc/html/classes.html index e3c582fd..480db102 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -80,7 +80,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions.html b/doc/html/functions.html index a0e9d852..1271078f 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index f808a68c..6698b1f2 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/group___turbo_j_p_e_g.html b/doc/html/group___turbo_j_p_e_g.html index 0c483179..bd493b96 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -82,17 +82,21 @@ Defines #define TJFLAG_BOTTOMUP  The uncompressed source/destination image is stored in bottom-up (Windows, OpenGL) order, not top-down (X11) order.
#define TJFLAG_FORCEMMX - Turn off CPU auto-detection and force TurboJPEG to use MMX code (IPP and 32-bit libjpeg-turbo versions only.)
+ Turn off CPU auto-detection and force TurboJPEG to use MMX code (if the underlying codec supports it.)
#define TJFLAG_FORCESSE - Turn off CPU auto-detection and force TurboJPEG to use SSE code (32-bit IPP and 32-bit libjpeg-turbo versions only)
+ Turn off CPU auto-detection and force TurboJPEG to use SSE code (if the underlying codec supports it.)
#define TJFLAG_FORCESSE2 - Turn off CPU auto-detection and force TurboJPEG to use SSE2 code (32-bit IPP and 32-bit libjpeg-turbo versions only)
+ Turn off CPU auto-detection and force TurboJPEG to use SSE2 code (if the underlying codec supports it.)
#define TJFLAG_FORCESSE3 - Turn off CPU auto-detection and force TurboJPEG to use SSE3 code (64-bit IPP version only)
+ Turn off CPU auto-detection and force TurboJPEG to use SSE3 code (if the underlying codec supports it.)
#define TJFLAG_FASTUPSAMPLE - Use fast, inaccurate chrominance upsampling routines in the JPEG decompressor (libjpeg and libjpeg-turbo versions only)
+ When decompressing, use the fastest chrominance upsampling algorithm available in the underlying codec.
#define TJFLAG_NOREALLOC  Disable buffer (re)allocation.
+#define TJFLAG_FASTDCT + Use the fastest DCT/IDCT algorithm available in the underlying codec.
+#define TJFLAG_ACCURATEDCT + Use the most accurate DCT/IDCT algorithm available in the underlying codec.
#define TJ_NUMXOP  Number of transform operations.
#define TJXOPT_PERFECT @@ -253,6 +257,22 @@ Variables

Number of transform operations.

+ + + +
+
+ + + + +
#define TJFLAG_ACCURATEDCT
+
+
+ +

Use the most accurate DCT/IDCT algorithm available in the underlying codec.

+

The default if this flag is not specified is implementation-specific. The libjpeg implementation, for example, uses the fast algorithm by default when compressing, because this has been shown to have 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.

+
@@ -268,6 +288,22 @@ Variables

The uncompressed source/destination image is stored in bottom-up (Windows, OpenGL) order, not top-down (X11) order.

+ + + +
+
+ + + + +
#define TJFLAG_FASTDCT
+
+
+ +

Use the fastest DCT/IDCT algorithm available in the underlying codec.

+

The default if this flag is not specified is implementation-specific. The libjpeg implementation, for example, uses the fast algorithm by default when compressing, because this has been shown to have 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.

+
@@ -281,7 +317,8 @@ Variables
-

Use fast, inaccurate chrominance upsampling routines in the JPEG decompressor (libjpeg and libjpeg-turbo versions only)

+

When decompressing, use the fastest chrominance upsampling algorithm available in the underlying codec.

+

The default is to use smooth upsampling, which creates a smooth transition between neighboring chrominance components in order to reduce upsampling artifacts in the decompressed image.

@@ -296,7 +333,7 @@ Variables
-

Turn off CPU auto-detection and force TurboJPEG to use MMX code (IPP and 32-bit libjpeg-turbo versions only.)

+

Turn off CPU auto-detection and force TurboJPEG to use MMX code (if the underlying codec supports it.)

@@ -311,7 +348,7 @@ Variables
-

Turn off CPU auto-detection and force TurboJPEG to use SSE code (32-bit IPP and 32-bit libjpeg-turbo versions only)

+

Turn off CPU auto-detection and force TurboJPEG to use SSE code (if the underlying codec supports it.)

@@ -326,7 +363,7 @@ Variables
-

Turn off CPU auto-detection and force TurboJPEG to use SSE2 code (32-bit IPP and 32-bit libjpeg-turbo versions only)

+

Turn off CPU auto-detection and force TurboJPEG to use SSE2 code (if the underlying codec supports it.)

@@ -341,7 +378,7 @@ Variables
-

Turn off CPU auto-detection and force TurboJPEG to use SSE3 code (64-bit IPP version only)

+

Turn off CPU auto-detection and force TurboJPEG to use SSE3 code (if the underlying codec supports it.)

@@ -1557,7 +1594,7 @@ If you choose option 1, dstSizes[i] should be set to the size of yo -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/index.html b/doc/html/index.html index be0e810f..46f5beca 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -69,7 +69,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/modules.html b/doc/html/modules.html index 5277997f..7ce0d104 100644 --- a/doc/html/modules.html +++ b/doc/html/modules.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -72,7 +72,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html index fd293fa1..a8b0c676 100644 --- a/doc/html/structtjregion.html +++ b/doc/html/structtjregion.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -165,7 +165,7 @@ Data Fields -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html index 33f7c05d..ceee28f7 100644 --- a/doc/html/structtjscalingfactor.html +++ b/doc/html/structtjscalingfactor.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -127,7 +127,7 @@ Data Fields -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index 39f9e471..9e879f87 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2
+
TurboJPEG 1.2.1
@@ -191,7 +191,7 @@ Data Fields -
Generated on Sun Dec 18 2011 20:09:47 for TurboJPEG by  +
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  doxygen 1.7.4
diff --git a/doxygen.config b/doxygen.config index 5fb34b34..5a0b5a71 100644 --- a/doxygen.config +++ b/doxygen.config @@ -1,5 +1,5 @@ PROJECT_NAME = TurboJPEG -PROJECT_NUMBER = 1.2 +PROJECT_NUMBER = 1.2.1 OUTPUT_DIRECTORY = doc/ USE_WINDOWS_ENCODING = NO OPTIMIZE_OUTPUT_FOR_C = YES diff --git a/java/TJExample.java b/java/TJExample.java index 36c1a8f7..e7268928 100644 --- a/java/TJExample.java +++ b/java/TJExample.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2012 D. R. Commander. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -81,6 +81,12 @@ public class TJExample implements TJCustomFilter { System.out.println(" for 4:2:0.)\n"); System.out.println("-display = Display output image (Output file need not be specified in this"); System.out.println(" case.)\n"); + System.out.println("-fastupsample = Use the fastest chrominance upsampling algorithm available in"); + System.out.println(" the underlying codec\n"); + System.out.println("-fastdct = Use the fastest DCT/IDCT algorithms available in the underlying"); + System.out.println(" codec\n"); + System.out.println("-accuratedct = Use the most accurate DCT/IDCT algorithms available in the"); + System.out.println(" underlying codec\n"); System.exit(1); } @@ -92,6 +98,7 @@ public class TJExample implements TJCustomFilter { BufferedImage img = null; byte[] bmpBuf = null; TJTransform xform = new TJTransform(); + int flags = 0; try { @@ -187,6 +194,18 @@ public class TJExample implements TJCustomFilter { } if(argv[i].substring(0, 2).equalsIgnoreCase("-d")) display = true; + if(argv[i].equalsIgnoreCase("-fastupsample")) { + System.out.println("Using fast upsampling code"); + flags |= TJ.FLAG_FASTUPSAMPLE; + } + if(argv[i].equalsIgnoreCase("-fastdct")) { + System.out.println("Using fastest DCT/IDCT algorithm"); + flags |= TJ.FLAG_FASTDCT; + } + if(argv[i].equalsIgnoreCase("-accuratedct")) { + System.out.println("Using most accurate DCT/IDCT algorithm"); + flags |= TJ.FLAG_ACCURATEDCT; + } } } String[] inFileTokens = argv[0].split("\\."); @@ -247,8 +266,9 @@ public class TJExample implements TJCustomFilter { height = scaleFactor.getScaled(height); if(!outFormat.equalsIgnoreCase("jpg")) - img = tjd.decompress(width, height, BufferedImage.TYPE_INT_RGB, 0); - else bmpBuf = tjd.decompress(width, 0, height, TJ.PF_BGRX, 0); + img = tjd.decompress(width, height, BufferedImage.TYPE_INT_RGB, + flags); + else bmpBuf = tjd.decompress(width, 0, height, TJ.PF_BGRX, flags); tjd.close(); } else { @@ -282,10 +302,10 @@ public class TJExample implements TJCustomFilter { tjc.setSubsamp(outSubsamp); tjc.setJPEGQuality(outQual); if(img != null) - jpegBuf = tjc.compress(img, 0); + jpegBuf = tjc.compress(img, flags); else { tjc.setSourceImage(bmpBuf, width, 0, height, TJ.PF_BGRX); - jpegBuf = tjc.compress(0); + jpegBuf = tjc.compress(flags); } jpegSize = tjc.getCompressedSize(); tjc.close(); diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html index 73d5fb90..336473c8 100644 --- a/java/doc/allclasses-frame.html +++ b/java/doc/allclasses-frame.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html index 8392bfdc..ad7cd9e8 100644 --- a/java/doc/allclasses-noframe.html +++ b/java/doc/allclasses-noframe.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html index ca1f208f..8cf0ae7b 100644 --- a/java/doc/constant-values.html +++ b/java/doc/constant-values.html @@ -2,12 +2,12 @@ - + Constant Field Values - + @@ -101,12 +101,24 @@ org.libjpegturbo.* org.libjpegturbo.turbojpeg.TJ + +public static final int +FLAG_ACCURATEDCT +4096 + + public static final int FLAG_BOTTOMUP 2 + +public static final int +FLAG_FASTDCT +2048 + + public static final int FLAG_FASTUPSAMPLE diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index de71e8cd..b7d3689e 100644 --- a/java/doc/deprecated-list.html +++ b/java/doc/deprecated-list.html @@ -2,12 +2,12 @@ - + Deprecated List - + diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html index 5beef370..fc2ff59b 100644 --- a/java/doc/help-doc.html +++ b/java/doc/help-doc.html @@ -2,12 +2,12 @@ - + API Help - + diff --git a/java/doc/index-all.html b/java/doc/index-all.html index 8ee0112d..69d41044 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -2,12 +2,12 @@ - + Index - + @@ -199,30 +199,37 @@ Method in class org.libjpegturbo.turbojpeg.finalize() - Method in class org.libjpegturbo.turbojpeg.TJDecompressor
  +
FLAG_ACCURATEDCT - +Static variable in class org.libjpegturbo.turbojpeg.TJ +
Use the most accurate DCT/IDCT algorithm available in the underlying + codec.
FLAG_BOTTOMUP - Static variable in class org.libjpegturbo.turbojpeg.TJ
The uncompressed source/destination image is stored in bottom-up (Windows, OpenGL) order, not top-down (X11) order. +
FLAG_FASTDCT - +Static variable in class org.libjpegturbo.turbojpeg.TJ +
Use the fastest DCT/IDCT algorithm available in the underlying codec.
FLAG_FASTUPSAMPLE - Static variable in class org.libjpegturbo.turbojpeg.TJ -
Use fast, inaccurate chrominance upsampling routines in the JPEG - decompressor (libjpeg and libjpeg-turbo versions only.) +
When decompressing, use the fastest chrominance upsampling algorithm + available in the underlying codec.
FLAG_FORCEMMX - Static variable in class org.libjpegturbo.turbojpeg.TJ
Turn off CPU auto-detection and force TurboJPEG to use MMX code - (IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.)
FLAG_FORCESSE - Static variable in class org.libjpegturbo.turbojpeg.TJ
Turn off CPU auto-detection and force TurboJPEG to use SSE code - (32-bit IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.)
FLAG_FORCESSE2 - Static variable in class org.libjpegturbo.turbojpeg.TJ
Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - (32-bit IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.)
FLAG_FORCESSE3 - Static variable in class org.libjpegturbo.turbojpeg.TJ
Turn off CPU auto-detection and force TurboJPEG to use SSE3 code -(64-bit IPP version only.) + (if the underlying codec supports it.)

diff --git a/java/doc/index.html b/java/doc/index.html index 9b36a3f2..f9581452 100644 --- a/java/doc/index.html +++ b/java/doc/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJ.html b/java/doc/org/libjpegturbo/turbojpeg/TJ.html index ac949a83..c031b1ab 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -2,12 +2,12 @@ - + TJ - + @@ -117,6 +117,15 @@ TurboJPEG utility class (cannot be instantiated) static int +FLAG_ACCURATEDCT + +
+          Use the most accurate DCT/IDCT algorithm available in the underlying + codec. + + + +static int FLAG_BOTTOMUP
@@ -126,11 +135,19 @@ TurboJPEG utility class (cannot be instantiated) static int +FLAG_FASTDCT + +
+          Use the fastest DCT/IDCT algorithm available in the underlying codec. + + + +static int FLAG_FASTUPSAMPLE
-          Use fast, inaccurate chrominance upsampling routines in the JPEG - decompressor (libjpeg and libjpeg-turbo versions only.) +          When decompressing, use the fastest chrominance upsampling algorithm + available in the underlying codec. @@ -139,7 +156,7 @@ TurboJPEG utility class (cannot be instantiated)
          Turn off CPU auto-detection and force TurboJPEG to use MMX code - (IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.) @@ -148,7 +165,7 @@ TurboJPEG utility class (cannot be instantiated)
          Turn off CPU auto-detection and force TurboJPEG to use SSE code - (32-bit IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.) @@ -157,7 +174,7 @@ TurboJPEG utility class (cannot be instantiated)
          Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - (32-bit IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.) @@ -166,7 +183,7 @@ TurboJPEG utility class (cannot be instantiated)
          Turn off CPU auto-detection and force TurboJPEG to use SSE3 code -(64-bit IPP version only.) + (if the underlying codec supports it.) @@ -711,7 +728,7 @@ FLAG_FORCEMMX

public static final int FLAG_FORCEMMX
Turn off CPU auto-detection and force TurboJPEG to use MMX code - (IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.)

See Also:
Constant Field Values
@@ -724,7 +741,7 @@ FLAG_FORCESSE public static final int FLAG_FORCESSE
Turn off CPU auto-detection and force TurboJPEG to use SSE code - (32-bit IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.)

See Also:
Constant Field Values
@@ -737,7 +754,7 @@ FLAG_FORCESSE2 public static final int FLAG_FORCESSE2
Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - (32-bit IPP and 32-bit libjpeg-turbo versions only.) + (if the underlying codec supports it.)

See Also:
Constant Field Values
@@ -750,7 +767,7 @@ FLAG_FORCESSE3 public static final int FLAG_FORCESSE3
Turn off CPU auto-detection and force TurboJPEG to use SSE3 code -(64-bit IPP version only.) + (if the underlying codec supports it.)

See Also:
Constant Field Values
@@ -762,12 +779,50 @@ FLAG_FASTUPSAMPLE 
 public static final int FLAG_FASTUPSAMPLE
-
Use fast, inaccurate chrominance upsampling routines in the JPEG - decompressor (libjpeg and libjpeg-turbo versions only.) +
When decompressing, use the fastest chrominance upsampling algorithm + available in the underlying codec. The default is to use smooth + upsampling, which creates a smooth transition between neighboring + chrominance components in order to reduce upsampling artifacts in the + decompressed image.

See Also:
Constant Field Values
+
+ +

+FLAG_FASTDCT

+
+public static final int FLAG_FASTDCT
+
+
Use the fastest DCT/IDCT algorithm available in the underlying codec. The + default if this flag is not specified is implementation-specific. The + libjpeg implementation, for example, uses the fast algorithm by default + when compressing, because this has been shown to have 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. +

+

+
See Also:
Constant Field Values
+
+
+ +

+FLAG_ACCURATEDCT

+
+public static final int FLAG_ACCURATEDCT
+
+
Use the most accurate DCT/IDCT algorithm available in the underlying + codec. The default if this flag is not specified is + implementation-specific. The libjpeg implementation, for example, uses + the fast algorithm by default when compressing, because this has been + shown to have 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. +

+

+
See Also:
Constant Field Values
+
diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html index e21a9544..d7b6c22c 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html @@ -2,12 +2,12 @@ - + TJCompressor - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html index 49911aba..7ae47673 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html @@ -2,12 +2,12 @@ - + TJCustomFilter - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html index de5dcb9f..cd5b9eb8 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html @@ -2,12 +2,12 @@ - + TJDecompressor - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html b/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html index 68e64b84..38e4c78d 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html @@ -2,12 +2,12 @@ - + TJScalingFactor - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html index ff4a5395..c521d532 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html @@ -2,12 +2,12 @@ - + TJTransform - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html index 929b4127..11f1d4e7 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html @@ -2,12 +2,12 @@ - + TJTransformer - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-frame.html b/java/doc/org/libjpegturbo/turbojpeg/package-frame.html index f4b8348d..b340c9d4 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-frame.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-frame.html @@ -2,12 +2,12 @@ - + org.libjpegturbo.turbojpeg - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-summary.html b/java/doc/org/libjpegturbo/turbojpeg/package-summary.html index acca4fd3..89d2e04f 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-summary.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-summary.html @@ -2,12 +2,12 @@ - + org.libjpegturbo.turbojpeg - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-tree.html b/java/doc/org/libjpegturbo/turbojpeg/package-tree.html index 41b9c16c..da7e7437 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-tree.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-tree.html @@ -2,12 +2,12 @@ - + org.libjpegturbo.turbojpeg Class Hierarchy - + diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html index 07caa974..b161e739 100644 --- a/java/doc/overview-tree.html +++ b/java/doc/overview-tree.html @@ -2,12 +2,12 @@ - + Class Hierarchy - + diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html index b5fdd4d4..b626f001 100644 --- a/java/doc/serialized-form.html +++ b/java/doc/serialized-form.html @@ -2,12 +2,12 @@ - + Serialized Form - + diff --git a/java/org/libjpegturbo/turbojpeg/TJ.java b/java/org/libjpegturbo/turbojpeg/TJ.java index 5e0c0b7c..78a72f67 100644 --- a/java/org/libjpegturbo/turbojpeg/TJ.java +++ b/java/org/libjpegturbo/turbojpeg/TJ.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2012 D. R. Commander. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -272,29 +272,51 @@ final public class TJ { final public static int FLAG_BOTTOMUP = 2; /** * Turn off CPU auto-detection and force TurboJPEG to use MMX code - * (IPP and 32-bit libjpeg-turbo versions only.) + * (if the underlying codec supports it.) */ final public static int FLAG_FORCEMMX = 8; /** * Turn off CPU auto-detection and force TurboJPEG to use SSE code - * (32-bit IPP and 32-bit libjpeg-turbo versions only.) + * (if the underlying codec supports it.) */ final public static int FLAG_FORCESSE = 16; /** * Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - * (32-bit IPP and 32-bit libjpeg-turbo versions only.) + * (if the underlying codec supports it.) */ final public static int FLAG_FORCESSE2 = 32; /** * Turn off CPU auto-detection and force TurboJPEG to use SSE3 code - *(64-bit IPP version only.) + * (if the underlying codec supports it.) */ final public static int FLAG_FORCESSE3 = 128; /** - * Use fast, inaccurate chrominance upsampling routines in the JPEG - * decompressor (libjpeg and libjpeg-turbo versions only.) + * When decompressing, use the fastest chrominance upsampling algorithm + * available in the underlying codec. The default is to use smooth + * upsampling, which creates a smooth transition between neighboring + * chrominance components in order to reduce upsampling artifacts in the + * decompressed image. */ final public static 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. The + * libjpeg implementation, for example, uses the fast algorithm by default + * when compressing, because this has been shown to have 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. + */ + final public static 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 + * implementation-specific. The libjpeg implementation, for example, uses + * the fast algorithm by default when compressing, because this has been + * shown to have 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. + */ + final public static int FLAG_ACCURATEDCT = 4096; /** diff --git a/tjbench.c b/tjbench.c index e529ffce..87b462f4 100644 --- a/tjbench.c +++ b/tjbench.c @@ -667,7 +667,7 @@ void usage(char *progname) { int i; printf("USAGE: %s\n", progname); - printf(" <%% Quality> [options]\n\n"); + printf(" [options]\n\n"); printf(" %s\n", progname); printf(" [options]\n\n"); printf("Options:\n\n"); @@ -680,8 +680,12 @@ void usage(char *progname) printf(" Force MMX, SSE, SSE2, or SSE3 code paths in the underlying codec\n"); printf("-rgb, -bgr, -rgbx, -bgrx, -xbgr, -xrgb =\n"); printf(" Test the specified color conversion path in the codec (default: BGR)\n"); - printf("-fastupsample = Use fast, inaccurate upsampling code to perform 4:2:2 and 4:2:0\n"); - printf(" YUV decoding\n"); + printf("-fastupsample = Use the fastest chrominance upsampling algorithm available in\n"); + printf(" the underlying codec\n"); + printf("-fastdct = Use the fastest DCT/IDCT algorithms available in the underlying\n"); + printf(" codec\n"); + printf("-accuratedct = Use the most accurate DCT/IDCT algorithms available in the\n"); + printf(" underlying codec\n"); printf("-quiet = Output results in tabular rather than verbose format\n"); printf("-yuvencode = Encode RGB input as planar YUV rather than compressing as JPEG\n"); printf("-yuvdecode = Decode JPEG image to planar YUV rather than RGB\n"); @@ -796,6 +800,16 @@ int main(int argc, char *argv[]) printf("Using fast upsampling code\n\n"); flags|=TJFLAG_FASTUPSAMPLE; } + if(!strcasecmp(argv[i], "-fastdct")) + { + printf("Using fastest DCT/IDCT algorithm\n\n"); + flags|=TJFLAG_FASTDCT; + } + if(!strcasecmp(argv[i], "-accuratedct")) + { + printf("Using most accurate DCT/IDCT algorithm\n\n"); + flags|=TJFLAG_ACCURATEDCT; + } 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/tjbenchtest.in b/tjbenchtest.in index 390b044b..72b93f8e 100755 --- a/tjbenchtest.in +++ b/tjbenchtest.in @@ -39,56 +39,73 @@ for image in $IMAGES; do cp $IMGDIR/$image $OUTDIR basename=`basename $image .${EXT}` - $EXEDIR/cjpeg -quality 95 -dct fast -grayscale $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_GRAY_cjpeg.jpg - $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x2 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_420_cjpeg.jpg - $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x1 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_422_cjpeg.jpg - $EXEDIR/cjpeg -quality 95 -dct fast -sample 1x1 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_444_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -grayscale $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_GRAY_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x2 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_420_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x1 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_422_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -sample 1x1 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_444_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -grayscale $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_GRAY_accurate_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -sample 2x2 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_420_accurate_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -sample 2x1 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_422_accurate_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -sample 1x1 $IMGDIR/${basename}.${EXT} >$OUTDIR/${basename}_444_accurate_cjpeg.jpg for samp in GRAY 420 422 444; do - $EXEDIR/djpeg -rgb $BMPARG $OUTDIR/${basename}_${samp}_cjpeg.jpg >$OUTDIR/${basename}_${samp}_djpeg.${EXT} + $EXEDIR/djpeg -rgb $BMPARG $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_default_djpeg.${EXT} + $EXEDIR/djpeg -dct fast -rgb $BMPARG $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_fast_djpeg.${EXT} + $EXEDIR/djpeg -dct int -rgb $BMPARG $OUTDIR/${basename}_${samp}_accurate_cjpeg.jpg >$OUTDIR/${basename}_${samp}_accurate_djpeg.${EXT} done for samp in 420 422; do - $EXEDIR/djpeg -nosmooth $BMPARG $OUTDIR/${basename}_${samp}_cjpeg.jpg >$OUTDIR/${basename}_${samp}_djpeg_nosmooth.${EXT} + $EXEDIR/djpeg -nosmooth $BMPARG $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_default_nosmooth_djpeg.${EXT} + $EXEDIR/djpeg -dct fast -nosmooth $BMPARG $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_fast_nosmooth_djpeg.${EXT} + $EXEDIR/djpeg -dct int -nosmooth $BMPARG $OUTDIR/${basename}_${samp}_accurate_cjpeg.jpg >$OUTDIR/${basename}_${samp}_accurate_nosmooth_djpeg.${EXT} done # Compression - runme $EXEDIR/tjbench $OUTDIR/$image 95 -rgb -quiet -benchtime 0.01 - for s in GRAY 420 422 444; do - runme cmp $OUTDIR/${basename}_${s}_Q95.jpg $OUTDIR/${basename}_${s}_cjpeg.jpg - done - - # Tiled compression & decompression - runme $EXEDIR/tjbench $OUTDIR/$image 95 -rgb -tile -quiet -benchtime 0.01 - for samp in GRAY 444; do - for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ - $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do - runme cmp $i $OUTDIR/${basename}_${samp}_djpeg.${EXT} - rm $i - done - done - runme $EXEDIR/tjbench $OUTDIR/$image 95 -rgb -tile -quiet -benchtime 0.01 -fastupsample - for samp in 420 422; do - for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ - $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do - runme cmp $i $OUTDIR/${basename}_${samp}_djpeg_nosmooth.${EXT} - rm $i + for dct in accurate fast; do + runme $EXEDIR/tjbench $OUTDIR/$image 95 -rgb -quiet -benchtime 0.01 -${dct}dct + for samp in GRAY 420 422 444; do + runme cmp $OUTDIR/${basename}_${samp}_Q95.jpg $OUTDIR/${basename}_${samp}_${dct}_cjpeg.jpg done done - # Tiled decompression - for samp in GRAY 444; do - runme $EXEDIR/tjbench $OUTDIR/${basename}_${samp}_Q95.jpg $BMPARG -tile -quiet -benchtime 0.01 - for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ - $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do - runme cmp $i $OUTDIR/${basename}_${samp}_djpeg.${EXT} - rm $i + for dct in fast accurate default; do + dctarg=-${dct}dct + if [ "${dct}" = "default" ]; then + dctarg= + fi + + # Tiled compression & decompression + runme $EXEDIR/tjbench $OUTDIR/$image 95 -rgb -tile -quiet -benchtime 0.01 ${dctarg} + for samp in GRAY 444; do + for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ + $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do + runme cmp $i $OUTDIR/${basename}_${samp}_${dct}_djpeg.${EXT} + rm $i + done done - done - for samp in 420 422; do - runme $EXEDIR/tjbench $OUTDIR/${basename}_${samp}_Q95.jpg $BMPARG -tile -quiet -benchtime 0.01 -fastupsample - for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ - $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do - runme cmp $i $OUTDIR/${basename}_${samp}_djpeg_nosmooth.${EXT} - rm $i + runme $EXEDIR/tjbench $OUTDIR/$image 95 -rgb -tile -quiet -benchtime 0.01 -fastupsample ${dctarg} + for samp in 420 422; do + for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ + $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do + runme cmp $i $OUTDIR/${basename}_${samp}_${dct}_nosmooth_djpeg.${EXT} + rm $i + done + done + + # Tiled decompression + for samp in GRAY 444; do + runme $EXEDIR/tjbench $OUTDIR/${basename}_${samp}_Q95.jpg $BMPARG -tile -quiet -benchtime 0.01 ${dctarg} + for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ + $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do + runme cmp $i $OUTDIR/${basename}_${samp}_${dct}_djpeg.${EXT} + rm $i + done + done + for samp in 420 422; do + runme $EXEDIR/tjbench $OUTDIR/${basename}_${samp}_Q95.jpg $BMPARG -tile -quiet -benchtime 0.01 -fastupsample ${dctarg} + for i in $OUTDIR/${basename}_${samp}_Q95_[0-9]*[0-9]x[0-9]*[0-9].${EXT} \ + $OUTDIR/${basename}_${samp}_Q95_full.${EXT}; do + runme cmp $i $OUTDIR/${basename}_${samp}_${dct}_nosmooth_djpeg.${EXT} + rm $i + done done done @@ -96,7 +113,7 @@ for image in $IMAGES; do for scale in 2_1 15_8 7_4 13_8 3_2 11_8 5_4 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8; do scalearg=`echo $scale | sed s@_@/@g` for samp in GRAY 420 422 444; do - $EXEDIR/djpeg -rgb -scale ${scalearg} $BMPARG $OUTDIR/${basename}_${samp}_cjpeg.jpg >$OUTDIR/${basename}_${samp}_${scale}_djpeg.${EXT} + $EXEDIR/djpeg -rgb -scale ${scalearg} $BMPARG $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_${scale}_djpeg.${EXT} runme $EXEDIR/tjbench $OUTDIR/${basename}_${samp}_Q95.jpg $BMPARG -scale ${scalearg} -quiet -benchtime 0.01 runme cmp $OUTDIR/${basename}_${samp}_Q95_${scale}.${EXT} $OUTDIR/${basename}_${samp}_${scale}_djpeg.${EXT} rm $OUTDIR/${basename}_${samp}_Q95_${scale}.${EXT} diff --git a/tjexampletest.in b/tjexampletest.in index fb7b4c58..40b342ed 100755 --- a/tjexampletest.in +++ b/tjexampletest.in @@ -36,33 +36,59 @@ for image in $IMAGES; do cp $IMGDIR/$image $OUTDIR basename=`basename $image .bmp` - $EXEDIR/cjpeg -quality 95 -dct fast -grayscale $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_GRAY_cjpeg.jpg - $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x2 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_420_cjpeg.jpg - $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x1 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_422_cjpeg.jpg - $EXEDIR/cjpeg -quality 95 -dct fast -sample 1x1 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_444_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -grayscale $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_GRAY_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x2 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_420_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x1 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_422_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct fast -sample 1x1 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_444_fast_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -grayscale $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_GRAY_accurate_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -sample 2x2 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_420_accurate_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -sample 2x1 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_422_accurate_cjpeg.jpg + $EXEDIR/cjpeg -quality 95 -dct int -sample 1x1 $IMGDIR/${basename}.bmp >$OUTDIR/${basename}_444_accurate_cjpeg.jpg for samp in GRAY 420 422 444; do - $EXEDIR/djpeg -rgb -bmp $OUTDIR/${basename}_${samp}_cjpeg.jpg >$OUTDIR/${basename}_${samp}_djpeg.bmp + $EXEDIR/djpeg -rgb -bmp $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_default_djpeg.bmp + $EXEDIR/djpeg -dct fast -rgb -bmp $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_fast_djpeg.bmp + $EXEDIR/djpeg -dct int -rgb -bmp $OUTDIR/${basename}_${samp}_accurate_cjpeg.jpg >$OUTDIR/${basename}_${samp}_accurate_djpeg.bmp + done + for samp in 420 422; do + $EXEDIR/djpeg -nosmooth -bmp $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_default_nosmooth_djpeg.bmp + $EXEDIR/djpeg -dct fast -nosmooth -bmp $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_fast_nosmooth_djpeg.bmp + $EXEDIR/djpeg -dct int -nosmooth -bmp $OUTDIR/${basename}_${samp}_accurate_cjpeg.jpg >$OUTDIR/${basename}_${samp}_accurate_nosmooth_djpeg.bmp done # Compression - for samp in GRAY 420 422 444; do - runme $JAVA TJExample $OUTDIR/$image $OUTDIR/${basename}_${samp}.jpg -q 95 -samp ${samp} - runme cmp $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}_cjpeg.jpg + for dct in fast accurate; do + for samp in GRAY 420 422 444; do + runme $JAVA TJExample $OUTDIR/$image $OUTDIR/${basename}_${samp}_${dct}.jpg -q 95 -samp ${samp} -${dct}dct + runme cmp $OUTDIR/${basename}_${samp}_${dct}.jpg $OUTDIR/${basename}_${samp}_${dct}_cjpeg.jpg + done done # Decompression - for samp in 420 GRAY 420 422 444; do - runme $JAVA TJExample $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}.bmp - runme cmp -i 54:54 $OUTDIR/${basename}_${samp}.bmp $OUTDIR/${basename}_${samp}_djpeg.bmp - rm $OUTDIR/${basename}_${samp}.bmp + for dct in fast accurate default; do + srcdct=${dct} + dctarg=-${dct}dct + if [ "${dct}" = "default" ]; then + srcdct=fast + dctarg= + fi + for samp in GRAY 420 422 444; do + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_${srcdct}.jpg $OUTDIR/${basename}_${samp}_${dct}.bmp ${dctarg} + runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${dct}.bmp $OUTDIR/${basename}_${samp}_${dct}_djpeg.bmp + rm $OUTDIR/${basename}_${samp}_${dct}.bmp + done + for samp in 420 422; do + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_${srcdct}.jpg $OUTDIR/${basename}_${samp}_${dct}_nosmooth.bmp -fastupsample ${dctarg} + runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${dct}_nosmooth.bmp $OUTDIR/${basename}_${samp}_${dct}_nosmooth_djpeg.bmp + rm $OUTDIR/${basename}_${samp}_${dct}_nosmooth.bmp + done done # Scaled decompression for scale in 2_1 15_8 7_4 13_8 3_2 11_8 5_4 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8; do scalearg=`echo $scale | sed s@_@/@g` for samp in GRAY 420 422 444; do - $EXEDIR/djpeg -rgb -bmp -scale ${scalearg} $OUTDIR/${basename}_${samp}_cjpeg.jpg >$OUTDIR/${basename}_${samp}_${scale}_djpeg.bmp - runme $JAVA TJExample $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}_${scale}.bmp -scale ${scalearg} + $EXEDIR/djpeg -rgb -bmp -scale ${scalearg} $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg >$OUTDIR/${basename}_${samp}_${scale}_djpeg.bmp + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${scale}.bmp -scale ${scalearg} runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${scale}.bmp $OUTDIR/${basename}_${samp}_${scale}_djpeg.bmp rm $OUTDIR/${basename}_${samp}_${scale}.bmp done @@ -70,20 +96,26 @@ for image in $IMAGES; do # Transforms for samp in GRAY 420 422 444; do - $EXEDIR/jpegtran -crop 70x60+16+16 -flip horizontal -trim $OUTDIR/${basename}_${samp}.jpg >$OUTDIR/${basename}_${samp}_hflip_jpegtran.jpg - $EXEDIR/jpegtran -crop 70x60+16+16 -flip vertical -trim $OUTDIR/${basename}_${samp}.jpg >$OUTDIR/${basename}_${samp}_vflip_jpegtran.jpg - $EXEDIR/jpegtran -crop 70x60+16+16 -transpose -trim $OUTDIR/${basename}_${samp}.jpg >$OUTDIR/${basename}_${samp}_transpose_jpegtran.jpg - $EXEDIR/jpegtran -crop 70x60+16+16 -transverse -trim $OUTDIR/${basename}_${samp}.jpg >$OUTDIR/${basename}_${samp}_transverse_jpegtran.jpg - $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 90 -trim $OUTDIR/${basename}_${samp}.jpg >$OUTDIR/${basename}_${samp}_rot90_jpegtran.jpg - $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 180 -trim $OUTDIR/${basename}_${samp}.jpg >$OUTDIR/${basename}_${samp}_rot180_jpegtran.jpg - $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 270 -trim $OUTDIR/${basename}_${samp}.jpg >$OUTDIR/${basename}_${samp}_rot270_jpegtran.jpg + $EXEDIR/jpegtran -crop 70x60+16+16 -flip horizontal -trim $OUTDIR/${basename}_${samp}_fast.jpg >$OUTDIR/${basename}_${samp}_hflip_jpegtran.jpg + $EXEDIR/jpegtran -crop 70x60+16+16 -flip vertical -trim $OUTDIR/${basename}_${samp}_fast.jpg >$OUTDIR/${basename}_${samp}_vflip_jpegtran.jpg + $EXEDIR/jpegtran -crop 70x60+16+16 -transpose -trim $OUTDIR/${basename}_${samp}_fast.jpg >$OUTDIR/${basename}_${samp}_transpose_jpegtran.jpg + $EXEDIR/jpegtran -crop 70x60+16+16 -transverse -trim $OUTDIR/${basename}_${samp}_fast.jpg >$OUTDIR/${basename}_${samp}_transverse_jpegtran.jpg + $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 90 -trim $OUTDIR/${basename}_${samp}_fast.jpg >$OUTDIR/${basename}_${samp}_rot90_jpegtran.jpg + $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 180 -trim $OUTDIR/${basename}_${samp}_fast.jpg >$OUTDIR/${basename}_${samp}_rot180_jpegtran.jpg + $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 270 -trim $OUTDIR/${basename}_${samp}_fast.jpg >$OUTDIR/${basename}_${samp}_rot270_jpegtran.jpg done for xform in hflip vflip transpose transverse rot90 rot180 rot270; do for samp in GRAY 420 422 444; do - runme $JAVA TJExample $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}_${xform}.jpg -$xform -crop 16,16,70x60 + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.jpg -$xform -crop 16,16,70x60 runme cmp $OUTDIR/${basename}_${samp}_${xform}.jpg $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg $EXEDIR/djpeg -rgb -bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg >$OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp - runme $JAVA TJExample $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -crop 16,16,70x60 + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -crop 16,16,70x60 + runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}.bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp + rm $OUTDIR/${basename}_${samp}_${xform}.bmp + done + for samp in 420 422; do + $EXEDIR/djpeg -nosmooth -rgb -bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg >$OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -crop 16,16,70x60 -fastupsample runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}.bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp rm $OUTDIR/${basename}_${samp}_${xform}.bmp done @@ -92,9 +124,9 @@ for image in $IMAGES; do # Grayscale transform for xform in hflip vflip transpose transverse rot90 rot180 rot270; do for samp in GRAY 444 422 420; do - runme $JAVA TJExample $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}_${xform}.jpg -$xform -grayscale -crop 16,16,70x60 + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.jpg -$xform -grayscale -crop 16,16,70x60 runme cmp $OUTDIR/${basename}_${samp}_${xform}.jpg $OUTDIR/${basename}_GRAY_${xform}_jpegtran.jpg - runme $JAVA TJExample $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -grayscale -crop 16,16,70x60 + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -grayscale -crop 16,16,70x60 runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}.bmp $OUTDIR/${basename}_GRAY_${xform}_jpegtran.bmp rm $OUTDIR/${basename}_${samp}_${xform}.bmp done @@ -106,7 +138,7 @@ for image in $IMAGES; do for scale in 2_1 15_8 7_4 13_8 3_2 11_8 5_4 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8; do scalearg=`echo $scale | sed s@_@/@g` $EXEDIR/djpeg -rgb -bmp -scale ${scalearg} $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg >$OUTDIR/${basename}_${samp}_${xform}_${scale}_jpegtran.bmp - runme $JAVA TJExample $OUTDIR/${basename}_${samp}.jpg $OUTDIR/${basename}_${samp}_${xform}_${scale}.bmp -$xform -scale ${scalearg} -crop 16,16,70x60 + runme $JAVA TJExample $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}_${scale}.bmp -$xform -scale ${scalearg} -crop 16,16,70x60 runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}_${scale}.bmp $OUTDIR/${basename}_${samp}_${xform}_${scale}_jpegtran.bmp rm $OUTDIR/${basename}_${samp}_${xform}_${scale}.bmp done diff --git a/turbojpeg.c b/turbojpeg.c index c875fd93..4576a871 100644 --- a/turbojpeg.c +++ b/turbojpeg.c @@ -145,7 +145,7 @@ static int getPixelFormat(int pixelSize, int flags) } static int setCompDefaults(struct jpeg_compress_struct *cinfo, - int pixelFormat, int subsamp, int jpegQual) + int pixelFormat, int subsamp, int jpegQual, int flags) { int retval=0; @@ -191,7 +191,7 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo, if(jpegQual>=0) { jpeg_set_quality(cinfo, jpegQual, TRUE); - if(jpegQual>=96) cinfo->dct_method=JDCT_ISLOW; + if(jpegQual>=96 || flags&TJFLAG_ACCURATEDCT) cinfo->dct_method=JDCT_ISLOW; else cinfo->dct_method=JDCT_FASTEST; } if(subsamp==TJSAMP_GRAY) @@ -210,7 +210,7 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo, } static int setDecompDefaults(struct jpeg_decompress_struct *dinfo, - int pixelFormat) + int pixelFormat, int flags) { int retval=0; @@ -258,6 +258,8 @@ static int setDecompDefaults(struct jpeg_decompress_struct *dinfo, _throw("Unsupported pixel format"); } + if(flags&TJFLAG_FASTDCT) dinfo->dct_method=JDCT_FASTEST; + bailout: return retval; } @@ -618,7 +620,7 @@ DLLEXPORT int DLLCALL tjCompress2(tjhandle handle, unsigned char *srcBuf, alloc=0; *jpegSize=tjBufSize(width, height, jpegSubsamp); } jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc); - if(setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual)==-1) + if(setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual, flags)==-1) return -1; jpeg_start_compress(cinfo, TRUE); @@ -726,7 +728,7 @@ DLLEXPORT int DLLCALL tjEncodeYUV2(tjhandle handle, unsigned char *srcBuf, yuvsize=tjBufSizeYUV(width, height, subsamp); jpeg_mem_dest_tj(cinfo, &dstBuf, &yuvsize, 0); - if(setCompDefaults(cinfo, pixelFormat, subsamp, -1)==-1) return -1; + if(setCompDefaults(cinfo, pixelFormat, subsamp, -1, flags)==-1) return -1; jpeg_start_compress(cinfo, TRUE); pw=PAD(width, cinfo->max_h_samp_factor); @@ -955,7 +957,7 @@ DLLEXPORT int DLLCALL tjDecompress2(tjhandle handle, unsigned char *jpegBuf, jpeg_mem_src_tj(dinfo, jpegBuf, jpegSize); jpeg_read_header(dinfo, TRUE); - if(setDecompDefaults(dinfo, pixelFormat)==-1) + if(setDecompDefaults(dinfo, pixelFormat, flags)==-1) { retval=-1; goto bailout; } diff --git a/turbojpeg.h b/turbojpeg.h index 343788a0..7610221b 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -1,5 +1,5 @@ /* - * Copyright (C)2009-2011 D. R. Commander. All Rights Reserved. + * Copyright (C)2009-2012 D. R. Commander. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -226,28 +226,30 @@ static const int tjPixelSize[TJ_NUMPF] = {3, 3, 4, 4, 4, 4, 1, 4, 4, 4, 4}; */ #define TJFLAG_BOTTOMUP 2 /** - * Turn off CPU auto-detection and force TurboJPEG to use MMX code (IPP and - * 32-bit libjpeg-turbo versions only.) + * Turn off CPU auto-detection and force TurboJPEG to use MMX code (if the + * underlying codec supports it.) */ #define TJFLAG_FORCEMMX 8 /** - * Turn off CPU auto-detection and force TurboJPEG to use SSE code (32-bit IPP - * and 32-bit libjpeg-turbo versions only) + * Turn off CPU auto-detection and force TurboJPEG to use SSE code (if the + * underlying codec supports it.) */ #define TJFLAG_FORCESSE 16 /** - * Turn off CPU auto-detection and force TurboJPEG to use SSE2 code (32-bit IPP - * and 32-bit libjpeg-turbo versions only) + * Turn off CPU auto-detection and force TurboJPEG to use SSE2 code (if the + * underlying codec supports it.) */ #define TJFLAG_FORCESSE2 32 /** - * Turn off CPU auto-detection and force TurboJPEG to use SSE3 code (64-bit IPP - * version only) + * Turn off CPU auto-detection and force TurboJPEG to use SSE3 code (if the + * underlying codec supports it.) */ #define TJFLAG_FORCESSE3 128 /** - * Use fast, inaccurate chrominance upsampling routines in the JPEG - * decompressor (libjpeg and libjpeg-turbo versions only) + * When decompressing, use the fastest chrominance upsampling algorithm + * available in the underlying codec. The default is to use smooth upsampling, + * which creates a smooth transition between neighboring chrominance components + * in order to reduce upsampling artifacts in the decompressed image. */ #define TJFLAG_FASTUPSAMPLE 256 /** @@ -258,6 +260,24 @@ static const int tjPixelSize[TJ_NUMPF] = {3, 3, 4, 4, 4, 4, 1, 4, 4, 4, 4}; * versions of TurboJPEG. */ #define TJFLAG_NOREALLOC 1024 +/** + * Use the fastest DCT/IDCT algorithm available in the underlying codec. The + * default if this flag is not specified is implementation-specific. The + * libjpeg implementation, for example, uses the fast algorithm by default when + * compressing, because this has been shown to have 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. + */ +#define TJFLAG_FASTDCT 2048 +/** + * Use the most accurate DCT/IDCT algorithm available in the underlying codec. + * The default if this flag is not specified is implementation-specific. The + * libjpeg implementation, for example, uses the fast algorithm by default when + * compressing, because this has been shown to have 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. + */ +#define TJFLAG_ACCURATEDCT 4096 /**