diff --git a/ChangeLog.txt b/ChangeLog.txt index 0a8e8b19..99cb5052 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -55,6 +55,9 @@ based on whether libjpeg v7 or v8 emulation was enabled. fail to compile if the Windows system headers were included before jpeglib.h. This issue was caused by a conflict in the definition of the INT32 type. +[15] Implemented a more efficient version of TJBUFSIZE() which computes a +worst-case JPEG size based on the level of chrominance subsampling. + 1.1.1 ===== diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 3c6e903a..1598f0b0 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -81,7 +81,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/classes.html b/doc/html/classes.html index 5af9a2aa..c33212bf 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -80,7 +80,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions.html b/doc/html/functions.html index 867a59f4..62aab119 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 64a9c0d4..da04855b 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 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 d217944d..efcecac0 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -154,10 +154,10 @@ Functions  Create a TurboJPEG compressor instance.
DLLEXPORT int DLLCALL tjCompress2 (tjhandle handle, unsigned char *srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char **jpegBuf, unsigned long *jpegSize, int jpegSubsamp, int jpegQual, int flags)  Compress an RGB or grayscale image into a JPEG image.
-DLLEXPORT unsigned long DLLCALL TJBUFSIZE (int width, int height) - The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.
-DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV (int width, int height, int jpegSubsamp) - The size of the buffer (in bytes) required to hold a YUV planar image with the given parameters.
+DLLEXPORT unsigned long DLLCALL tjBufSize (int width, int height, int jpegSubsamp) + The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.
+DLLEXPORT unsigned long DLLCALL tjBufSizeYUV (int width, int height, int subsamp) + The size of the buffer (in bytes) required to hold a YUV planar image with the given parameters.
DLLEXPORT int DLLCALL tjEncodeYUV2 (tjhandle handle, unsigned char *srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char *dstBuf, int subsamp, int flags)  Encode an RGB or grayscale image into a YUV planar image.
DLLEXPORT tjhandle DLLCALL tjInitDecompress (void) @@ -644,49 +644,12 @@ Variables - +
- - - - - - - - - - - - - - - - -
DLLEXPORT unsigned long DLLCALL TJBUFSIZE (int width,
int height 
)
-
-
- -

The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.

-
Parameters:
- - - -
widthwidth of the image (in pixels)
heightheight of the image (in pixels)
-
-
-
Returns:
the maximum size of the buffer (in bytes) required to hold the image, or -1 if the arguments are out of bounds.
- -
-
- -
-
- - - + @@ -712,12 +675,57 @@ Variables
+

The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.

+

The number of bytes returned by this function is larger than the size of the uncompressed source image. The reason for this is that the JPEG format uses 16-bit coefficients, and it is thus possible for a very high-quality JPEG image with very high frequency content to expand rather than compress when converted to the JPEG format. Such images represent a very rare corner case, but since there is no way to predict the size of a JPEG image prior to compression, the corner case has to be handled.

+
Parameters:
+
DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV DLLEXPORT unsigned long DLLCALL tjBufSize ( int  width,
+ + + +
widthwidth of the image (in pixels)
heightheight of the image (in pixels)
jpegSubsampthe level of chrominance subsampling to be used when generating the JPEG image (see Chrominance subsampling options.)
+ + +
Returns:
the maximum size of the buffer (in bytes) required to hold the image, or -1 if the arguments are out of bounds.
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DLLEXPORT unsigned long DLLCALL tjBufSizeYUV (int width,
int height,
int subsamp 
)
+
+
+

The size of the buffer (in bytes) required to hold a YUV planar image with the given parameters.

Parameters:
- +
widthwidth of the image (in pixels)
heightheight of the image (in pixels)
jpegSubsamplevel of chrominance subsampling in the image (see Chrominance subsampling options.)
subsamplevel of chrominance subsampling in the image (see Chrominance subsampling options.)
@@ -816,7 +824,7 @@ Variables jpegBufaddress of a pointer to an image buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to:
  1. pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed,
  2. set *jpegBuf to NULL to tell TurboJPEG to allocate the buffer for you, or
    3. -
  3. pre-allocate the buffer to a "worst case" size determined by calling TJBUFSIZE(). This should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees this.)
    4. +
  4. pre-allocate the buffer to a "worst case" size determined by calling tjBufSize(). This should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees this.)
If you choose option 1, *jpegSize should be set to the size of your pre-allocated buffer. In any case, unless you have set TJFLAG_NOREALLOC, you should always check *jpegBuf upon return from this function, as it may have changed. jpegSizepointer to an unsigned long variable which holds the size of the JPEG image buffer. If *jpegBuf points to a pre-allocated buffer, then *jpegSize should be set to the size of the buffer. Upon return, *jpegSize will contain the size of the JPEG image (in bytes.) @@ -1031,7 +1039,7 @@ If you choose option 1, *jpegSize should be set to the size of your handlea handle to a TurboJPEG decompressor or transformer instance jpegBufpointer to a buffer containing the JPEG image to decompress jpegSizesize of the JPEG image (in bytes) - dstBufpointer to an image buffer which will receive the YUV image. Use TJBUFSIZEYUV to determine the appropriate size for this buffer based on the image width, height, and level of subsampling. + dstBufpointer to an image buffer which will receive the YUV image. Use tjBufSizeYUV to determine the appropriate size for this buffer based on the image width, height, and level of subsampling. flagsthe bitwise OR of one or more of the flags. @@ -1143,7 +1151,7 @@ If you choose option 1, *jpegSize should be set to the size of your pitchbytes per line of the source image. Normally, this should be width * tjPixelSize[pixelFormat] if the image is unpadded, or TJPAD(width * tjPixelSize[pixelFormat]) if each line of the image is padded to the nearest 32-bit boundary, as is the case for Windows bitmaps. You can also be clever and use this parameter to skip lines, etc. Setting this parameter to 0 is the equivalent of setting it to width * tjPixelSize[pixelFormat]. heightheight (in pixels) of the source image pixelFormatpixel format of the source image (see Pixel formats.) - dstBufpointer to an image buffer which will receive the YUV image. Use TJBUFSIZEYUV() to determine the appropriate size for this buffer based on the image width, height, and level of chrominance subsampling. + dstBufpointer to an image buffer which will receive the YUV image. Use tjBufSizeYUV() to determine the appropriate size for this buffer based on the image width, height, and level of chrominance subsampling. subsampthe level of chrominance subsampling to be used when generating the YUV image (see Chrominance subsampling options.) flagsthe bitwise OR of one or more of the flags. @@ -1358,7 +1366,7 @@ If you choose option 1, *jpegSize should be set to the size of your dstBufspointer to an array of n image buffers. dstBufs[i] will receive a JPEG image that has been transformed using the parameters in transforms[i]. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to:
  1. pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed,
  2. set dstBufs[i] to NULL to tell TurboJPEG to allocate the buffer for you, or
    3. -
  3. pre-allocate the buffer to a "worst case" size determined by calling TJBUFSIZE() with the cropped width and height. This should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees this.)
    4. +
  4. pre-allocate the buffer to a "worst case" size determined by calling tjBufSize() with the cropped width and height. This should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees this.)
If you choose option 1, dstSizes[i] should be set to the size of your pre-allocated buffer. In any case, unless you have set TJFLAG_NOREALLOC, you should always check dstBufs[i] upon return from this function, as it may have changed. dstSizespointer to an array of n unsigned long variables which will receive the actual sizes (in bytes) of each transformed JPEG image. If dstBufs[i] points to a pre-allocated buffer, then dstSizes[i] should be set to the size of the buffer. Upon return, dstSizes[i] will contain the size of the JPEG image (in bytes.) @@ -1494,7 +1502,7 @@ If you choose option 1, dstSizes[i] should be set to the size of yo
-
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/index.html b/doc/html/index.html index 9f751d43..2f24f32b 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -69,7 +69,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
-
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/modules.html b/doc/html/modules.html index 175581c3..a9dd19e8 100644 --- a/doc/html/modules.html +++ b/doc/html/modules.html @@ -72,7 +72,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html index 2b1df745..0f1762fe 100644 --- a/doc/html/structtjregion.html +++ b/doc/html/structtjregion.html @@ -165,7 +165,7 @@ Data Fields -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html index 51661e46..f0d23c66 100644 --- a/doc/html/structtjscalingfactor.html +++ b/doc/html/structtjscalingfactor.html @@ -127,7 +127,7 @@ Data Fields -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index 2c57025b..61e87876 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -144,7 +144,7 @@ Data Fields -
Generated on Tue May 24 2011 11:59:01 for TurboJPEG by  +
Generated on Mon Jul 11 2011 22:02:02 for TurboJPEG by  doxygen 1.7.4
diff --git a/java/TJUnitTest.java b/java/TJUnitTest.java index 80e6dbf8..b0c44ad8 100644 --- a/java/TJUnitTest.java +++ b/java/TJUnitTest.java @@ -682,7 +682,7 @@ public class TJUnitTest { byte[] dstBuf; if(yuv == YUVENCODE) dstBuf = new byte[TJ.bufSizeYUV(w, h, subsamp)]; - else dstBuf = new byte[TJ.bufSize(w, h)]; + else dstBuf = new byte[TJ.bufSize(w, h, subsamp)]; try { tjc = new TJCompressor(); @@ -726,7 +726,7 @@ public class TJUnitTest { if(h % 100 == 0) System.out.format("%04d x %04d\b\b\b\b\b\b\b\b\b\b\b", w, h); srcBuf = new byte[w * h * 4]; - jpegBuf = new byte[TJ.bufSize(w, h)]; + jpegBuf = new byte[TJ.bufSize(w, h, TJ.SAMP_444)]; Arrays.fill(srcBuf, (byte)0); for(i = 0; i < w * h; i++) { srcBuf[i * 4] = pixels[i % 9][0]; @@ -739,7 +739,7 @@ public class TJUnitTest { tjc.compress(jpegBuf, 0); srcBuf = new byte[h * w * 4]; - jpegBuf = new byte[TJ.bufSize(h, w)]; + jpegBuf = new byte[TJ.bufSize(h, w, TJ.SAMP_444)]; for(i = 0; i < h * w; i++) { if(i % 2 == 0) srcBuf[i * 4] = srcBuf[i * 4 + 1] = srcBuf[i * 4 + 2] = (byte)0xFF; diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html index 038f9ad3..1ed402ac 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 964f1113..dd2f4f1d 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 17936eac..abfbf156 100644 --- a/java/doc/constant-values.html +++ b/java/doc/constant-values.html @@ -2,12 +2,12 @@ - + Constant Field Values - + diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index ac6d82c1..f8ea2901 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 27fbb7f5..1733e1fc 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 af5f275d..89404025 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -2,12 +2,12 @@ - + Index - + @@ -80,10 +80,11 @@ function windowTitle()

B

-
bufSize(int, int) - +
bufSize(int, int, int) - Static method in class org.libjpegturbo.turbojpeg.TJ
Returns the maximum size of the buffer (in bytes) required to hold a JPEG - image with the given width and height. + image with the given width and height, and level of chrominance + subsampling.
bufSizeYUV(int, int, int) - Static method in class org.libjpegturbo.turbojpeg.TJ
Returns the size of the buffer (in bytes) required to hold a YUV planar diff --git a/java/doc/index.html b/java/doc/index.html index abf4dd41..64965ea7 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 86e33d66..6c07d326 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -2,12 +2,12 @@ - + TJ - + @@ -309,12 +309,14 @@ TurboJPEG utility class (cannot be instantiated) static int -bufSize(int width, - int height) +bufSize(int width, + int height, + int jpegSubsamp)
          Returns the maximum size of the buffer (in bytes) required to hold a JPEG - image with the given width and height. + image with the given width and height, and level of chrominance + subsampling. @@ -821,20 +823,24 @@ public static int getBlueOffset(int pixelFormat)
-

+

bufSize

 public static int bufSize(int width,
-                          int height)
+                          int height,
+                          int jpegSubsamp)
                    throws java.lang.Exception
Returns the maximum size of the buffer (in bytes) required to hold a JPEG - image with the given width and height. + image with the given width and height, and level of chrominance + subsampling.

-
Parameters:
width - the width (in pixels) of the JPEG image
height - the height (in pixels) of the JPEG image +
Parameters:
width - the width (in pixels) of the JPEG image
height - the height (in pixels) of the JPEG image
jpegSubsamp - the level of chrominance subsampling to be used when + generating the JPEG image (one of TJ.SAMP_*)
Returns:
the maximum size of the buffer (in bytes) required to hold a JPEG - image with the given width and height + image with the given width and height, and level of chrominance + subsampling
Throws:
java.lang.Exception
@@ -854,7 +860,7 @@ public static int bufSizeYUV(int width,

Parameters:
width - the width (in pixels) of the YUV image
height - the height (in pixels) of the YUV image
subsamp - the level of chrominance subsampling used in the YUV - image + image (one of TJ.SAMP_*)
Returns:
the size of the buffer (in bytes) required to hold a YUV planar image with the given width, height, and level of chrominance subsampling
Throws: diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html index b9a8fc43..566c8779 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html @@ -2,12 +2,12 @@ - + TJCompressor - + @@ -421,7 +421,7 @@ public void compress(byte[] dstBuf,

Parameters:
dstBuf - buffer which will receive the JPEG image. Use - TJ.bufSize(int, int) to determine the maximum size for this buffer based on + TJ.bufSize(int, int, int) to determine the maximum size for this buffer based on the image width and height.
flags - the bitwise OR of one or more of TJ.FLAG_*
Throws:
java.lang.Exception
@@ -462,7 +462,7 @@ public void compress(java.awt.image.BufferedImage srcImage,
Parameters:
srcImage - a BufferedImage instance containing RGB or grayscale pixels to be compressed
dstBuf - buffer which will receive the JPEG image. Use - TJ.bufSize(int, int) to determine the maximum size for this buffer based on + TJ.bufSize(int, int, int) to determine the maximum size for this buffer based on the image width and height.
flags - the bitwise OR of one or more of TJ.FLAG_*
Throws:
java.lang.Exception
diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html index f610afe4..4d37d71a 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 867f4188..166acfba 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 feccceac..bb64cc32 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 d3da485a..280b82ff 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html @@ -2,12 +2,12 @@ - + TJTransformer - + @@ -313,7 +313,7 @@ public void transform(byte[][] dstBufs,
Parameters:
dstBufs - an array of image buffers. dstbufs[i] will receive a JPEG image that has been transformed using the parameters in - transforms[i]. Use TJ.bufSize(int, int) to determine the + transforms[i]. Use TJ.bufSize(int, int, int) to determine the maximum size for each buffer based on the cropped width and height.
transforms - an array of TJTransform instances, each of which specifies the transform parameters and/or cropping region for the corresponding transformed output image
flags - the bitwise OR of one or more of TJ.FLAG_* diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-frame.html b/java/doc/org/libjpegturbo/turbojpeg/package-frame.html index 4338f9b8..cb1e2b89 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 733d88d1..caf1b956 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 ee04a107..58d8672f 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 8a19a88e..6ba3d6d9 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 90d6ff8e..3f08701b 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 3941b533..cd22ee01 100644 --- a/java/org/libjpegturbo/turbojpeg/TJ.java +++ b/java/org/libjpegturbo/turbojpeg/TJ.java @@ -271,16 +271,21 @@ final public class TJ { /** * Returns the maximum size of the buffer (in bytes) required to hold a JPEG - * image with the given width and height. + * image with the given width and height, and level of chrominance + * subsampling. * * @param width the width (in pixels) of the JPEG image * * @param height the height (in pixels) of the JPEG image * + * @param jpegSubsamp the level of chrominance subsampling to be used when + * generating the JPEG image (one of {@link TJ TJ.SAMP_*}) + * * @return the maximum size of the buffer (in bytes) required to hold a JPEG - * image with the given width and height + * image with the given width and height, and level of chrominance + * subsampling */ - public native static int bufSize(int width, int height) + public native static int bufSize(int width, int height, int jpegSubsamp) throws Exception; /** @@ -292,7 +297,7 @@ final public class TJ { * @param height the height (in pixels) of the YUV image * * @param subsamp the level of chrominance subsampling used in the YUV - * image + * image (one of {@link TJ TJ.SAMP_*}) * * @return the size of the buffer (in bytes) required to hold a YUV planar * image with the given width, height, and level of chrominance subsampling diff --git a/java/org/libjpegturbo/turbojpeg/TJCompressor.java b/java/org/libjpegturbo/turbojpeg/TJCompressor.java index de32227b..10291392 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJCompressor.java @@ -160,7 +160,7 @@ public class TJCompressor { public byte[] compress(int flags) throws Exception { if(srcWidth < 1 || srcHeight < 1) throw new Exception(NO_ASSOC_ERROR); - byte[] buf = new byte[TJ.bufSize(srcWidth, srcHeight)]; + byte[] buf = new byte[TJ.bufSize(srcWidth, srcHeight, subsamp)]; compress(buf, flags); return buf; } @@ -249,7 +249,7 @@ public class TJCompressor { public byte[] compress(BufferedImage srcImage, int flags) throws Exception { int width = srcImage.getWidth(); int height = srcImage.getHeight(); - byte[] buf = new byte[TJ.bufSize(width, height)]; + byte[] buf = new byte[TJ.bufSize(width, height, subsamp)]; compress(srcImage, buf, flags); return buf; } diff --git a/java/org/libjpegturbo/turbojpeg/TJTransformer.java b/java/org/libjpegturbo/turbojpeg/TJTransformer.java index 78c4c9da..6c074839 100644 --- a/java/org/libjpegturbo/turbojpeg/TJTransformer.java +++ b/java/org/libjpegturbo/turbojpeg/TJTransformer.java @@ -123,7 +123,7 @@ public class TJTransformer extends TJDecompressor { if(transforms[i].width != 0) w = transforms[i].width; if(transforms[i].height != 0) h = transforms[i].height; } - dstBufs[i] = new byte[TJ.bufSize(w, h)]; + dstBufs[i] = new byte[TJ.bufSize(w, h, jpegSubsamp)]; } TJDecompressor[] tjd = new TJDecompressor[transforms.length]; transform(dstBufs, transforms, flags); diff --git a/java/org_libjpegturbo_turbojpeg_TJ.h b/java/org_libjpegturbo_turbojpeg_TJ.h index ab68bd5b..54479bed 100644 --- a/java/org_libjpegturbo_turbojpeg_TJ.h +++ b/java/org_libjpegturbo_turbojpeg_TJ.h @@ -50,10 +50,10 @@ extern "C" { /* * Class: org_libjpegturbo_turbojpeg_TJ * Method: bufSize - * Signature: (II)I + * Signature: (III)I */ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize - (JNIEnv *, jclass, jint, jint); + (JNIEnv *, jclass, jint, jint, jint); /* * Class: org_libjpegturbo_turbojpeg_TJ @@ -66,7 +66,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV /* * Class: org_libjpegturbo_turbojpeg_TJ * Method: getScalingFactors - * Signature: ()[Lorg/libjpegturbo/turbojpeg/TJ/ScalingFactor; + * Signature: ()[Lorg/libjpegturbo/turbojpeg/TJScalingFactor; */ JNIEXPORT jobjectArray JNICALL Java_org_libjpegturbo_turbojpeg_TJ_getScalingFactors (JNIEnv *, jclass); diff --git a/tjbench.c b/tjbench.c index ed48bc46..48332ec8 100644 --- a/tjbench.c +++ b/tjbench.c @@ -83,7 +83,7 @@ int decomptest(unsigned char *srcbuf, unsigned char **jpegbuf, int row, col, i, dstbufalloc=0, retval=0; double start, elapsed; int ps=tjPixelSize[pf]; - int yuvsize=TJBUFSIZEYUV(w, h, subsamp), bufsize; + int yuvsize=tjBufSizeYUV(w, h, subsamp), bufsize; int scaledw=(yuv==YUVDECODE)? w : TJSCALED(w, sf); int scaledh=(yuv==YUVDECODE)? h : TJSCALED(h, sf); int pitch=scaledw*ps; @@ -237,7 +237,7 @@ void dotestyuv(unsigned char *srcbuf, int w, int h, int subsamp, int i, retval=0, ps=tjPixelSize[pf]; int yuvsize=0; - yuvsize=TJBUFSIZEYUV(w, h, subsamp); + yuvsize=tjBufSizeYUV(w, h, subsamp); if((dstbuf=(unsigned char *)malloc(yuvsize)) == NULL) _throwunix("allocating image buffer"); @@ -341,7 +341,8 @@ void dotest(unsigned char *srcbuf, int w, int h, int subsamp, int jpegqual, if((flags&TJFLAG_NOREALLOC)!=0) for(i=0; iGetLongField(env, obj, _fid); \ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize - (JNIEnv *env, jclass cls, jint width, jint height) + (JNIEnv *env, jclass cls, jint width, jint height, jint jpegSubsamp) { - jint retval=(jint)TJBUFSIZE(width, height); + jint retval=(jint)tjBufSize(width, height, jpegSubsamp); if(retval==-1) _throw(tjGetErrorStr()); bailout: @@ -63,7 +63,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV (JNIEnv *env, jclass cls, jint width, jint height, jint subsamp) { - jint retval=(jint)TJBUFSIZEYUV(width, height, subsamp); + jint retval=(jint)tjBufSizeYUV(width, height, subsamp); if(retval==-1) _throw(tjGetErrorStr()); bailout: @@ -108,7 +108,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3 arraySize=(pitch==0)? width*tjPixelSize[pf]*height:pitch*height; if((*env)->GetArrayLength(env, src)GetArrayLength(env, dst)<(jsize)jpegSize) _throw("Destination buffer is not large enough"); @@ -152,7 +152,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3 arraySize=(pitch==0)? width*height:pitch*height; if((*env)->GetArrayLength(env, src)GetArrayLength(env, dst)<(jsize)jpegSize) _throw("Destination buffer is not large enough"); @@ -194,7 +194,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___ if((*env)->GetArrayLength(env, src)GetArrayLength(env, dst) - <(jsize)TJBUFSIZEYUV(width, height, subsamp)) + <(jsize)tjBufSizeYUV(width, height, subsamp)) _throw("Destination buffer is not large enough"); bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0)); @@ -237,7 +237,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___ if((*env)->GetArrayLength(env, src)GetArrayLength(env, dst) - <(jsize)TJBUFSIZEYUV(width, height, subsamp)) + <(jsize)tjBufSizeYUV(width, height, subsamp)) _throw("Destination buffer is not large enough"); bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0)); @@ -449,7 +449,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegHeight", "I")); jpegHeight=(int)(*env)->GetIntField(env, obj, _fid); if((*env)->GetArrayLength(env, dst) - <(jsize)TJBUFSIZEYUV(jpegWidth, jpegHeight, jpegSubsamp)) + <(jsize)tjBufSizeYUV(jpegWidth, jpegHeight, jpegSubsamp)) _throw("Destination buffer is not large enough"); bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0)); @@ -495,7 +495,7 @@ JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transf unsigned char *jpegBuf=NULL, **dstBufs=NULL; jsize n=0; unsigned long *dstSizes=NULL; tjtransform *t=NULL; jbyteArray *jdstBufs=NULL; - int jpegWidth=0, jpegHeight=0; + int jpegWidth=0, jpegHeight=0, jpegSubsamp; jintArray jdstSizes=0; jint *dstSizesi=NULL; gethandle(); @@ -506,6 +506,8 @@ JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transf jpegWidth=(int)(*env)->GetIntField(env, obj, _fid); bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegHeight", "I")); jpegHeight=(int)(*env)->GetIntField(env, obj, _fid); + bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegSubsamp", "I")); + jpegSubsamp=(int)(*env)->GetIntField(env, obj, _fid); n=(*env)->GetArrayLength(env, dstobjs); if(n!=(*env)->GetArrayLength(env, tobjs)) @@ -552,7 +554,7 @@ JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transf if(t[i].r.w!=0) w=t[i].r.w; if(t[i].r.h!=0) h=t[i].r.h; bailif0(jdstBufs[i]=(*env)->GetObjectArrayElement(env, dstobjs, i)); - if((*env)->GetArrayLength(env, jdstBufs[i])GetArrayLength(env, jdstBufs[i])GetPrimitiveArrayCritical(env, jdstBufs[i], 0)); } diff --git a/turbojpeg-mapfile b/turbojpeg-mapfile index 0e704ec0..bd1ac715 100755 --- a/turbojpeg-mapfile +++ b/turbojpeg-mapfile @@ -26,6 +26,8 @@ TURBOJPEG_1.2 { global: tjAlloc; + tjBufSize; + tjBufSizeYUV; tjCompress2; tjDecompress2; tjEncodeYUV2; diff --git a/turbojpeg-mapfile.jni b/turbojpeg-mapfile.jni index 1465ad20..9c046ce6 100755 --- a/turbojpeg-mapfile.jni +++ b/turbojpeg-mapfile.jni @@ -26,6 +26,8 @@ TURBOJPEG_1.2 { global: tjAlloc; + tjBufSize; + tjBufSizeYUV; tjCompress2; tjDecompress2; tjEncodeYUV2; diff --git a/turbojpeg.c b/turbojpeg.c index c890bc0a..5f097a9e 100644 --- a/turbojpeg.c +++ b/turbojpeg.c @@ -217,6 +217,34 @@ static void setDecompDefaults(struct jpeg_decompress_struct *dinfo, } +static int getSubsamp(j_decompress_ptr dinfo) +{ + int retval=-1, i, k; + for(i=0; inum_components==pixelsize[i]) + { + if(dinfo->comp_info[0].h_samp_factor==tjMCUWidth[i]/8 + && dinfo->comp_info[0].v_samp_factor==tjMCUHeight[i]/8) + { + int match=0; + for(k=1; knum_components; k++) + { + if(dinfo->comp_info[k].h_samp_factor==1 + && dinfo->comp_info[k].v_samp_factor==1) + match++; + } + if(match==dinfo->num_components-1) + { + retval=i; break; + } + } + } + } + return retval; +} + + /* General API functions */ DLLEXPORT char* DLLCALL tjGetErrorStr(void) @@ -292,6 +320,26 @@ DLLEXPORT tjhandle DLLCALL tjInitCompress(void) } +DLLEXPORT unsigned long DLLCALL tjBufSize(int width, int height, + int jpegSubsamp) +{ + unsigned long retval=0; int mcuw, mcuh, chromasf; + if(width<1 || height<1 || jpegSubsamp<0 || jpegSubsamp>=NUMSUBOPT) + _throw("tjBufSize(): Invalid argument"); + + // This allows for rare corner cases in which a JPEG image can actually be + // larger than the uncompressed input (we wouldn't mention it if it hadn't + // happened before.) + mcuw=tjMCUWidth[jpegSubsamp]; + mcuh=tjMCUHeight[jpegSubsamp]; + chromasf=jpegSubsamp==TJSAMP_GRAY? 0: 4*64/(mcuw*mcuh); + retval=PAD(width, mcuw) * PAD(height, mcuh) * (2 + chromasf) + 2048; + + bailout: + return retval; +} + + DLLEXPORT unsigned long DLLCALL TJBUFSIZE(int width, int height) { unsigned long retval=0; @@ -308,13 +356,13 @@ DLLEXPORT unsigned long DLLCALL TJBUFSIZE(int width, int height) } -DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV(int width, int height, +DLLEXPORT unsigned long DLLCALL tjBufSizeYUV(int width, int height, int subsamp) { unsigned long retval=0; int pw, ph, cw, ch; if(width<1 || height<1 || subsamp<0 || subsamp>=NUMSUBOPT) - _throw("TJBUFSIZEYUV(): Invalid argument"); + _throw("tjBufSizeYUV(): Invalid argument"); pw=PAD(width, tjMCUWidth[subsamp]/8); ph=PAD(height, tjMCUHeight[subsamp]/8); cw=pw*8/tjMCUWidth[subsamp]; ch=ph*8/tjMCUHeight[subsamp]; @@ -325,6 +373,13 @@ DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV(int width, int height, } +DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV(int width, int height, + int subsamp) +{ + return tjBufSizeYUV(width, height, subsamp); +} + + DLLEXPORT int DLLCALL tjCompress2(tjhandle handle, unsigned char *srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char **jpegBuf, unsigned long *jpegSize, int jpegSubsamp, int jpegQual, int flags) @@ -358,7 +413,7 @@ DLLEXPORT int DLLCALL tjCompress2(tjhandle handle, unsigned char *srcBuf, if(flags&TJFLAG_NOREALLOC) { - alloc=0; *jpegSize=TJBUFSIZE(width, height); + alloc=0; *jpegSize=tjBufSize(width, height, jpegSubsamp); } jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc); setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual); @@ -391,7 +446,7 @@ DLLEXPORT int DLLCALL tjCompress(tjhandle handle, unsigned char *srcBuf, int retval=0; unsigned long size; if(flags&TJ_YUV) { - size=TJBUFSIZEYUV(width, height, jpegSubsamp); + size=tjBufSizeYUV(width, height, jpegSubsamp); retval=tjEncodeYUV2(handle, srcBuf, width, pitch, height, getPixelFormat(pixelSize, flags), jpegBuf, jpegSubsamp, flags); } @@ -450,7 +505,7 @@ DLLEXPORT int DLLCALL tjEncodeYUV2(tjhandle handle, unsigned char *srcBuf, else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1"); else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); - yuvsize=TJBUFSIZEYUV(width, height, subsamp); + yuvsize=tjBufSizeYUV(width, height, subsamp); jpeg_mem_dest_tj(cinfo, &dstBuf, &yuvsize, 0); setCompDefaults(cinfo, pixelFormat, subsamp, -1); @@ -589,7 +644,7 @@ DLLEXPORT int DLLCALL tjDecompressHeader2(tjhandle handle, unsigned char *jpegBuf, unsigned long jpegSize, int *width, int *height, int *jpegSubsamp) { - int i, k, retval=0; + int retval=0; getinstance(handle); if((this->init&DECOMPRESS)==0) @@ -610,28 +665,7 @@ DLLEXPORT int DLLCALL tjDecompressHeader2(tjhandle handle, *width=dinfo->image_width; *height=dinfo->image_height; - *jpegSubsamp=-1; - for(i=0; inum_components==pixelsize[i]) - { - if(dinfo->comp_info[0].h_samp_factor==tjMCUWidth[i]/8 - && dinfo->comp_info[0].v_samp_factor==tjMCUHeight[i]/8) - { - int match=0; - for(k=1; knum_components; k++) - { - if(dinfo->comp_info[k].h_samp_factor==1 - && dinfo->comp_info[k].v_samp_factor==1) - match++; - } - if(match==dinfo->num_components-1) - { - *jpegSubsamp=i; break; - } - } - } - } + *jpegSubsamp=getSubsamp(dinfo); jpeg_abort_decompress(dinfo); @@ -892,7 +926,7 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, unsigned char *jpegBuf, { jpeg_transform_info *xinfo=NULL; jvirt_barray_ptr *srccoefs, *dstcoefs; - int retval=0, i; + int retval=0, i, jpegSubsamp; getinstance(handle); if((this->init&COMPRESS)==0 || (this->init&DECOMPRESS)==0) @@ -949,6 +983,9 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, unsigned char *jpegBuf, jcopy_markers_setup(dinfo, JCOPYOPT_ALL); jpeg_read_header(dinfo, TRUE); + jpegSubsamp=getSubsamp(dinfo); + if(jpegSubsamp<0) + _throw("tjTransform(): Could not determine subsampling type for JPEG image"); for(i=0; i*jpegBuf to NULL to tell TurboJPEG to allocate the * buffer for you, or * -# pre-allocate the buffer to a "worst case" size determined by - * calling #TJBUFSIZE(). This should ensure that the buffer never has + * calling #tjBufSize(). This should ensure that the buffer never has * to be re-allocated (setting #TJFLAG_NOREALLOC guarantees this.) * . * If you choose option 1, *jpegSize should be set to the @@ -466,15 +466,26 @@ DLLEXPORT int DLLCALL tjCompress2(tjhandle handle, unsigned char *srcBuf, /** * The maximum size of the buffer (in bytes) required to hold a JPEG image with - * the given parameters. + * the given parameters. The number of bytes returned by this function is + * larger than the size of the uncompressed source image. The reason for this + * is that the JPEG format uses 16-bit coefficients, and it is thus possible + * for a very high-quality JPEG image with very high frequency content to + * expand rather than compress when converted to the JPEG format. Such images + * represent a very rare corner case, but since there is no way to predict the + * size of a JPEG image prior to compression, the corner case has to be + * handled. * * @param width width of the image (in pixels) * @param height height of the image (in pixels) + * @param jpegSubsamp the level of chrominance subsampling to be used when + * generating the JPEG image (see @ref TJSAMP + * "Chrominance subsampling options".) * * @return the maximum size of the buffer (in bytes) required to hold the * image, or -1 if the arguments are out of bounds. */ -DLLEXPORT unsigned long DLLCALL TJBUFSIZE(int width, int height); +DLLEXPORT unsigned long DLLCALL tjBufSize(int width, int height, + int jpegSubsamp); /** @@ -483,14 +494,14 @@ DLLEXPORT unsigned long DLLCALL TJBUFSIZE(int width, int height); * * @param width width of the image (in pixels) * @param height height of the image (in pixels) - * @param jpegSubsamp level of chrominance subsampling in the image (see + * @param subsamp level of chrominance subsampling in the image (see * @ref TJSAMP "Chrominance subsampling options".) * * @return the size of the buffer (in bytes) required to hold the image, or * -1 if the arguments are out of bounds. */ -DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV(int width, int height, - int jpegSubsamp); +DLLEXPORT unsigned long DLLCALL tjBufSizeYUV(int width, int height, + int subsamp); /** @@ -521,7 +532,7 @@ DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV(int width, int height, * @param pixelFormat pixel format of the source image (see @ref TJPF * "Pixel formats".) * @param dstBuf pointer to an image buffer which will receive the YUV image. - * Use #TJBUFSIZEYUV() to determine the appropriate size for this buffer + * Use #tjBufSizeYUV() to determine the appropriate size for this buffer * based on the image width, height, and level of chrominance * subsampling. * @param subsamp the level of chrominance subsampling to be used when @@ -640,7 +651,7 @@ DLLEXPORT int DLLCALL tjDecompress2(tjhandle handle, * @param jpegBuf pointer to a buffer containing the JPEG image to decompress * @param jpegSize size of the JPEG image (in bytes) * @param dstBuf pointer to an image buffer which will receive the YUV image. - * Use #TJBUFSIZEYUV to determine the appropriate size for this buffer + * Use #tjBufSizeYUV to determine the appropriate size for this buffer * based on the image width, height, and level of subsampling. * @param flags the bitwise OR of one or more of the @ref TJFLAG_BOTTOMUP * "flags". @@ -688,7 +699,7 @@ DLLEXPORT tjhandle DLLCALL tjInitTransform(void); * -# set dstBufs[i] to NULL to tell TurboJPEG to allocate the * buffer for you, or * -# pre-allocate the buffer to a "worst case" size determined by - * calling #TJBUFSIZE() with the cropped width and height. This should + * calling #tjBufSize() with the cropped width and height. This should * ensure that the buffer never has to be re-allocated (setting * #TJFLAG_NOREALLOC guarantees this.) * . @@ -781,6 +792,11 @@ DLLEXPORT char* DLLCALL tjGetErrorStr(void); #define TJ_FASTUPSAMPLE TJFLAG_FASTUPSAMPLE #define TJ_YUV 512 +DLLEXPORT unsigned long DLLCALL TJBUFSIZE(int width, int height); + +DLLEXPORT unsigned long DLLCALL TJBUFSIZEYUV(int width, int height, + int jpegSubsamp); + DLLEXPORT int DLLCALL tjCompress(tjhandle handle, unsigned char *srcBuf, int width, int pitch, int height, int pixelSize, unsigned char *dstBuf, unsigned long *compressedSize, int jpegSubsamp, int jpegQual, int flags);