From f5467110763f7a44ca8baf1c035eb39a68c913c6 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 20 Sep 2011 05:02:19 +0000 Subject: [PATCH] Implement custom filter callback in Java git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@707 632fc199-4ca6-4c93-a231-07263d6284db --- doc/html/annotated.html | 2 +- doc/html/classes.html | 2 +- doc/html/functions.html | 7 +- doc/html/functions_vars.html | 7 +- doc/html/group___turbo_j_p_e_g.html | 19 +- doc/html/index.html | 2 +- doc/html/modules.html | 2 +- doc/html/search/all_64.html | 8 +- doc/html/search/variables_64.html | 8 +- doc/html/structtjregion.html | 2 +- doc/html/structtjscalingfactor.html | 2 +- doc/html/structtjtransform.html | 38 ++- java/Makefile.am | 2 + java/TJExample.java | 19 +- java/doc/allclasses-frame.html | 6 +- java/doc/allclasses-noframe.html | 6 +- java/doc/constant-values.html | 10 +- java/doc/deprecated-list.html | 4 +- java/doc/help-doc.html | 4 +- java/doc/index-all.html | 22 +- java/doc/index.html | 2 +- java/doc/org/libjpegturbo/turbojpeg/TJ.html | 4 +- .../libjpegturbo/turbojpeg/TJCompressor.html | 8 +- .../turbojpeg/TJCustomFilter.html | 240 ++++++++++++++++++ .../turbojpeg/TJDecompressor.html | 8 +- .../turbojpeg/TJScalingFactor.html | 4 +- .../libjpegturbo/turbojpeg/TJTransform.html | 74 +++++- .../libjpegturbo/turbojpeg/TJTransformer.html | 4 +- .../libjpegturbo/turbojpeg/package-frame.html | 15 +- .../turbojpeg/package-summary.html | 18 +- .../libjpegturbo/turbojpeg/package-tree.html | 9 +- java/doc/overview-tree.html | 9 +- java/doc/serialized-form.html | 15 +- .../turbojpeg/TJCustomFilter.java | 76 ++++++ .../libjpegturbo/turbojpeg/TJTransform.java | 42 ++- tjbench.c | 4 +- turbojpeg-jni.c | 80 +++++- turbojpeg.c | 2 +- turbojpeg.h | 48 ++-- 39 files changed, 721 insertions(+), 113 deletions(-) create mode 100644 java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html create mode 100644 java/org/libjpegturbo/turbojpeg/TJCustomFilter.java diff --git a/doc/html/annotated.html b/doc/html/annotated.html index c820c275..4e2ee2bc 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 Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/classes.html b/doc/html/classes.html index 25f7b49b..c2d9cdce 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 Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions.html b/doc/html/functions.html index 51ad994a..a9a3daed 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -65,7 +65,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
Here is a list of all documented struct and union fields with links to the struct/union documentation for each field:
-
Generated on Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index d2f9092b..1601bec4 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -65,7 +65,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
-
Generated on Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 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 caf54ec4..9b50306c 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -111,6 +111,8 @@ Defines  Compute the scaled value of dimension using the given scaling factor.

Typedefs

+typedef struct tjtransform tjtransform + Lossless transform.
typedef void * tjhandle  TurboJPEG instance handle.

@@ -494,6 +496,21 @@ Variables

TurboJPEG instance handle.

+ + + +
+
+ + + + +
typedef struct tjtransform tjtransform
+
+
+ +

Lossless transform.

+

Enumeration Type Documentation

@@ -1519,7 +1536,7 @@ If you choose option 1, dstSizes[i] should be set to the size of yo -
Generated on Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/index.html b/doc/html/index.html index 58694036..41360dfa 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 Fri Sep 16 2011 19:05:45 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/modules.html b/doc/html/modules.html index b3773f47..aef313da 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 Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/search/all_64.html b/doc/html/search/all_64.html index 5db4361c..2e53b02e 100644 --- a/doc/html/search/all_64.html +++ b/doc/html/search/all_64.html @@ -7,9 +7,15 @@
Loading...
+
+
+ data + tjtransform +
+
- denom + denom tjscalingfactor
diff --git a/doc/html/search/variables_64.html b/doc/html/search/variables_64.html index 5db4361c..2e53b02e 100644 --- a/doc/html/search/variables_64.html +++ b/doc/html/search/variables_64.html @@ -7,9 +7,15 @@
Loading...
+
+
+ data + tjtransform +
+
- denom + denom tjscalingfactor
diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html index b0f1103e..f56d3822 100644 --- a/doc/html/structtjregion.html +++ b/doc/html/structtjregion.html @@ -165,7 +165,7 @@ Data Fields
-
Generated on Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html index ac633505..4456e59c 100644 --- a/doc/html/structtjscalingfactor.html +++ b/doc/html/structtjscalingfactor.html @@ -127,7 +127,7 @@ Data Fields
-
Generated on Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index 348dfdc1..e38ebfc8 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -77,18 +77,20 @@ Data Fields  One of the transform operations.
int options  The bitwise OR of one of more of the transform options.
-int(* customFilter )(short *coeffs, tjregion arrayRegion, tjregion planeRegion, int componentIndex, int transformIndex) - A callback function that can be used to modify the DCT coefficients after they are losslessly transformed but before they are transcoded to a new JPEG file.
+void * data + Arbitrary data that can be accessed within the body of the callback function.
+int(* customFilter )(short *coeffs, tjregion arrayRegion, tjregion planeRegion, int componentIndex, int transformIndex, struct tjtransform *transform) + A callback function that can be used to modify the DCT coefficients after they are losslessly transformed but before they are transcoded to a new JPEG file.

Detailed Description

Lossless transform.

Field Documentation

- +
- +
int(* tjtransform::customFilter)(short *coeffs, tjregion arrayRegion, tjregion planeRegion, int componentIndex, int transformIndex)int(* tjtransform::customFilter)(short *coeffs, tjregion arrayRegion, tjregion planeRegion, int componentIndex, int transformIndex, struct tjtransform *transform)
@@ -98,16 +100,32 @@ Data Fields

This allows for custom filters or other transformations to be applied in the frequency domain.

Parameters:
- - - - - + + + + + +
coeffspointer to an array of DCT coefficients. (NOTE: this pointer is not guaranteed to be valid once the callback returns, so applications wishing to hand off the DCT coefficients to another function or library should make a copy of them within the body of the callback.)
arrayRegionregion structure containing the width and height of the DCT coefficient array as well as its offset relative to the component plane. TurboJPEG implementations may choose to split each component plane into multiple DCT coefficient arrays and call the callback function once for each array.
planeRegionregion structure containing the width and height of the component plane to which this DCT coefficient array belongs
componentIndexthe component plane to which this DCT coefficient array belongs (Y, Cb, and Cr are, respectively, 0, 1, and 2 in typical JPEG images.)
transformIndexthe transformed image to which this DCT coefficient array belongs
coeffspointer to an array of transformed DCT coefficients. (NOTE: this pointer is not guaranteed to be valid once the callback returns, so applications wishing to hand off the DCT coefficients to another function or library should make a copy of them within the body of the callback.)
arrayRegiontjregion structure containing the width and height of coeffs as well as its offset relative to the component plane. TurboJPEG implementations may choose to split each component plane into multiple DCT coefficient arrays and call the callback function once for each array.
planeRegiontjregion structure containing the width and height of the component plane to which coeffs belongs
componentIDID number of the component plane to which coeffs belongs (Y, Cb, and Cr have, respectively, ID's of 0, 1, and 2 in typical JPEG images.)
transformIDID number of the transformed image to which coeffs belongs. This is the same as the index of the transform in the transforms array that was passed to tjTransform().
transforma pointer to a tjtransform structure that specifies the parameters and/or cropping region for this transform
Returns:
0 if the callback was successful, or -1 if an error occurred.
+
+ + +
+
+ + + + +
void* tjtransform::data
+
+
+ +

Arbitrary data that can be accessed within the body of the callback function.

+
@@ -173,7 +191,7 @@ Data Fields -
Generated on Fri Sep 16 2011 19:05:46 for TurboJPEG by  +
Generated on Tue Sep 20 2011 00:00:45 for TurboJPEG by  doxygen 1.7.4
diff --git a/java/Makefile.am b/java/Makefile.am index 82e9c138..4a1b34ef 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -2,6 +2,7 @@ JAVAROOT = . JAVASOURCES = org/libjpegturbo/turbojpeg/TJ.java \ org/libjpegturbo/turbojpeg/TJCompressor.java \ + org/libjpegturbo/turbojpeg/TJCustomFilter.java \ org/libjpegturbo/turbojpeg/TJDecompressor.java \ org/libjpegturbo/turbojpeg/TJLoader.java \ org/libjpegturbo/turbojpeg/TJScalingFactor.java \ @@ -21,6 +22,7 @@ dist_noinst_JAVA = ${JAVASOURCES} JAVA_CLASSES = org/libjpegturbo/turbojpeg/TJ.class \ org/libjpegturbo/turbojpeg/TJCompressor.class \ + org/libjpegturbo/turbojpeg/TJCustomFilter.class \ org/libjpegturbo/turbojpeg/TJDecompressor.class \ org/libjpegturbo/turbojpeg/TJLoader.class \ org/libjpegturbo/turbojpeg/TJScalingFactor.class \ diff --git a/java/TJExample.java b/java/TJExample.java index a326c71c..36c1a8f7 100644 --- a/java/TJExample.java +++ b/java/TJExample.java @@ -32,12 +32,14 @@ */ import java.io.*; +import java.awt.*; import java.awt.image.*; +import java.nio.*; import javax.imageio.*; import javax.swing.*; import org.libjpegturbo.turbojpeg.*; -public class TJExample { +public class TJExample implements TJCustomFilter { public static final String classname = new TJExample().getClass().getName(); @@ -165,7 +167,9 @@ public class TJExample { xform.op = TJTransform.OP_ROT180; if(argv[i].equalsIgnoreCase("-rot270")) xform.op = TJTransform.OP_ROT270; - if(argv[i].length() > 2 + if(argv[i].equalsIgnoreCase("-custom")) + xform.cf = new TJExample(); + else if(argv[i].length() > 2 && argv[i].substring(0, 2).equalsIgnoreCase("-c")) { if(i >= argv.length - 1) usage(); String[] cropArg = argv[++i].split(","); @@ -211,7 +215,8 @@ public class TJExample { fis.close(); TJDecompressor tjd; - if(xform.op != TJTransform.OP_NONE || xform.options != 0) { + if(xform.op != TJTransform.OP_NONE || xform.options != 0 + || xform.cf != null) { TJTransformer tjt = new TJTransformer(inputBuf); TJTransform t[] = new TJTransform[1]; t[0] = xform; @@ -303,5 +308,13 @@ public class TJExample { } } + public void customFilter(ShortBuffer coeffBuffer, Rectangle bufferRegion, + Rectangle planeRegion, int componentIndex, int transformIndex, + TJTransform transform) throws Exception { + for(int i=0; i - + All Classes - + @@ -25,6 +25,8 @@ All Classes
TJCompressor
+TJCustomFilter +
TJDecompressor
TJScalingFactor diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html index dd2f4f1d..148fac66 100644 --- a/java/doc/allclasses-noframe.html +++ b/java/doc/allclasses-noframe.html @@ -2,12 +2,12 @@ - + All Classes - + @@ -25,6 +25,8 @@ All Classes
TJCompressor
+TJCustomFilter +
TJDecompressor
TJScalingFactor diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html index abfbf156..8a6d8d9e 100644 --- a/java/doc/constant-values.html +++ b/java/doc/constant-values.html @@ -2,12 +2,12 @@ - + Constant Field Values - + @@ -299,6 +299,12 @@ org.libjpegturbo.* 8 + +public static final int +OPT_NOOUTPUT +16 + + public static final int OPT_PERFECT diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index f8ea2901..0e1178da 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 1733e1fc..4c4b064a 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 89404025..0b45436b 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -2,12 +2,12 @@ - + Index - + @@ -94,6 +94,9 @@ Static method in class org.libjpegturbo.turbojpeg.

C

+
cf - +Variable in class org.libjpegturbo.turbojpeg.TJTransform +
Custom filter instance
close() - Method in class org.libjpegturbo.turbojpeg.TJCompressor
Free the native structures associated with this compressor instance. @@ -116,6 +119,11 @@ Method in class org.libjpegturbo.turbojpeg.TJCompressor
Compress the uncompressed source image stored in srcImage and return a buffer containing a JPEG image. +
customFilter(ShortBuffer, Rectangle, Rectangle, int, int, TJTransform) - +Method in interface org.libjpegturbo.turbojpeg.TJCustomFilter +
A callback function that can be used to modify the DCT coefficients after + they are losslessly transformed but before they are transcoded to a new + JPEG file.

@@ -376,6 +384,10 @@ Static variable in class org.libjpegturbo.turbojpeg.TJTransform
This option will discard the color data in the input image and produce a grayscale output image. +
OPT_NOOUTPUT - +Static variable in class org.libjpegturbo.turbojpeg.TJTransform +
This option will prevent TJTransformer.transform() from outputting a JPEG image for this + particular transform.
OPT_PERFECT - Static variable in class org.libjpegturbo.turbojpeg.TJTransform
This option will cause TJTransformer.transform() to throw an exception if the transform is not @@ -463,7 +475,7 @@ Constructor for class org.libjpegturbo.turbojpeg.TJDecompressor - Class in org.libjpegturbo.turbojpeg
TurboJPEG decompressor
TJDecompressor() - +
TJCustomFilter - Interface in org.libjpegturbo.turbojpeg
Custom filter callback interface
TJDecompressor - Class in org.libjpegturbo.turbojpeg
TurboJPEG decompressor
TJDecompressor() - Constructor for class org.libjpegturbo.turbojpeg.TJDecompressor
Create a TurboJPEG decompresssor instance.
TJDecompressor(byte[]) - @@ -481,10 +493,10 @@ Constructor for class org.libjpegturbo.turbojpeg.TJTransform - Class in org.libjpegturbo.turbojpeg
Lossless transform parameters
TJTransform() - Constructor for class org.libjpegturbo.turbojpeg.TJTransform
Create a new lossless transform instance. -
TJTransform(int, int, int, int, int, int) - +
TJTransform(int, int, int, int, int, int, TJCustomFilter) - Constructor for class org.libjpegturbo.turbojpeg.TJTransform
Create a new lossless transform instance with the given parameters. -
TJTransform(Rectangle, int, int) - +
TJTransform(Rectangle, int, int, TJCustomFilter) - Constructor for class org.libjpegturbo.turbojpeg.TJTransform
Create a new lossless transform instance with the given parameters.
TJTransformer - Class in org.libjpegturbo.turbojpeg
TurboJPEG lossless transformer
TJTransformer() - diff --git a/java/doc/index.html b/java/doc/index.html index 64965ea7..a96eb27b 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 6c07d326..1119f02e 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -2,12 +2,12 @@ - + TJ - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html index 566c8779..9c3479a8 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html @@ -2,12 +2,12 @@ - + TJCompressor - + @@ -54,7 +54,7 @@ function windowTitle()  PREV CLASS  - NEXT CLASS + NEXT CLASS FRAMES    NO FRAMES   @@ -662,7 +662,7 @@ protected void finalize()  PREV CLASS  - NEXT CLASS + NEXT CLASS FRAMES    NO FRAMES   diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html new file mode 100644 index 00000000..d88fcc61 --- /dev/null +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html @@ -0,0 +1,240 @@ + + + + + + +TJCustomFilter + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
Package   Class  Tree  Deprecated  Index  Help 
+		 + +
+ PREV CLASS  + NEXT CLASS + FRAMES   + NO FRAMES   +  + + + +
+ SUMMARY: NESTED | FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD
+ + + +
+ +

+ +org.libjpegturbo.turbojpeg +
+Interface TJCustomFilter

+
+
+
public interface TJCustomFilter
+ + +

+Custom filter callback interface +

+ +

+

+ +

+ + + + + + + + + + + + +
+Method Summary
+ voidcustomFilter(java.nio.ShortBuffer coeffBuffer, + java.awt.Rectangle bufferRegion, + java.awt.Rectangle planeRegion, + int componentID, + int transformID, + TJTransform transform) + +
+          A callback function that can be used to modify the DCT coefficients after + they are losslessly transformed but before they are transcoded to a new + JPEG file.
+  +

+ + + + + + + + +
+Method Detail
+ +

+customFilter

+
+void customFilter(java.nio.ShortBuffer coeffBuffer,
+                  java.awt.Rectangle bufferRegion,
+                  java.awt.Rectangle planeRegion,
+                  int componentID,
+                  int transformID,
+                  TJTransform transform)
+                  throws java.lang.Exception
+
+
A callback function that can be used to modify the DCT coefficients after + they are losslessly transformed but before they are transcoded to a new + JPEG file. This allows for custom filters or other transformations to be + applied in the frequency domain. +

+

+
Parameters:
coeffBuffer - a buffer containing transformed DCT coefficients. + (NOTE: this buffer is not guaranteed to be valid once the callback + returns, so applications wishing to hand off the DCT coefficients to + another function or library should make a copy of them within the body of + the callback.)
bufferRegion - rectangle containing the width and height of + coeffBuffer as well as its offset relative to the component + plane. TurboJPEG implementations may choose to split each component plane + into multiple DCT coefficient buffers and call the callback function once + for each buffer.
planeRegion - rectangle containing the width and height of the + component plane to which coeffBuffer belongs
componentID - ID number of the component plane to which + coeffBufferbelongs (Y, Cb, and Cr have, respectively, ID's of + 0, 1, and 2 in typical JPEG images.)
transformID - ID number of the transformed image to which + coeffBuffer belongs. This is the same as the index of the + transform in the transforms array that was passed to TJTransformer.transform().
transform - a TJTransform instance that specifies the + parameters and/or cropping region for this transform +
Throws: +
java.lang.Exception
+
+
+ +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
Package   Class  Tree  Deprecated  Index  Help 
+		 + +
+ PREV CLASS  + NEXT CLASS + FRAMES   + NO FRAMES   +  + + + +
+ SUMMARY: NESTED | FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD
+ + + +
+ + + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html index 4d37d71a..d8ede5e8 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html @@ -2,12 +2,12 @@ - + TJDecompressor - + @@ -53,7 +53,7 @@ function windowTitle() - PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -913,7 +913,7 @@ protected void finalize() - PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html b/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html index 166acfba..5d9682ab 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 bb64cc32..e10ace58 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html @@ -2,12 +2,12 @@ - + TJTransform - + @@ -143,6 +143,14 @@ Lossless transform parameters + TJCustomFilter +cf + +
+          Custom filter instance + + + static int NUMOP @@ -242,6 +250,15 @@ Lossless transform parameters static int +OPT_NOOUTPUT + +
+          This option will prevent TJTransformer.transform() from outputting a JPEG image for this + particular transform. + + + +static int OPT_PERFECT
@@ -300,20 +317,22 @@ Lossless transform parameters           Create a new lossless transform instance. -TJTransform(int x, +TJTransform(int x, int y, int w, int h, int op, - int options) + int options, + TJCustomFilter cf)
          Create a new lossless transform instance with the given parameters. -TJTransform(java.awt.Rectangle r, +TJTransform(java.awt.Rectangle r, int op, - int options) + int options, + TJCustomFilter cf)
          Create a new lossless transform instance with the given parameters. @@ -569,6 +588,21 @@ public static final int OPT_GRAY
+

+OPT_NOOUTPUT

+
+public static final int OPT_NOOUTPUT
+
+
This option will prevent TJTransformer.transform() from outputting a JPEG image for this + particular transform. This can be used in conjunction with a custom + filter to capture the transformed DCT coefficients without transcoding + them. +

+

+
See Also:
Constant Field Values
+
+
+

op

@@ -591,6 +625,18 @@ public int options
+
+ +

+cf

+
+public TJCustomFilter cf
+
+
Custom filter instance +

+

+
+
@@ -612,7 +658,7 @@ public TJTransform()
-

+

TJTransform

 public TJTransform(int x,
@@ -620,7 +666,8 @@ public TJTransform(int x,
                    int w,
                    int h,
                    int op,
-                   int options)
+                   int options,
+                   TJCustomFilter cf)
             throws java.lang.Exception
Create a new lossless transform instance with the given parameters. @@ -631,27 +678,28 @@ public TJTransform(int x, divisible by the MCU block height (see TJ.getMCUHeight(int))
w - the width of the cropping region. Setting this to 0 is the equivalent of setting it to the width of the source JPEG image - x.
h - the height of the cropping region. Setting this to 0 is the equivalent of setting it to the height of the source JPEG image - y.
op - one of the transform operations (OP_*)
options - the bitwise OR of one or more of the transform options - (OPT_*) + (OPT_*)
cf - an instance of an object that implements the TJCustomFilter interface, or null if no custom filter is needed
Throws:
java.lang.Exception
-

+

TJTransform

 public TJTransform(java.awt.Rectangle r,
                    int op,
-                   int options)
+                   int options,
+                   TJCustomFilter cf)
             throws java.lang.Exception
Create a new lossless transform instance with the given parameters.

Parameters:
r - a Rectangle instance which specifies the cropping - region. See TJTransform(int, int, int, int, int, int) for more + region. See TJTransform(int, int, int, int, int, int, TJCustomFilter) for more detail.
op - one of the transform operations (OP_*)
options - the bitwise OR of one or more of the transform options - (OPT_*) + (OPT_*)
cf - an instance of an object that implements the TJCustomFilter interface, or null if no custom filter is needed
Throws:
java.lang.Exception
diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html index 280b82ff..c61c8f27 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 cb1e2b89..0fd25125 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 - + @@ -17,6 +17,17 @@ org.libjpegturbo.turbojpeg org.libjpegturbo.turbojpeg + + + + +
+Interfaces  + +
+TJCustomFilter
+ +
diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-summary.html b/java/doc/org/libjpegturbo/turbojpeg/package-summary.html index caf1b956..52b963b5 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 - + @@ -81,6 +81,20 @@ function windowTitle() Package org.libjpegturbo.turbojpeg + + + + + + + + +
+Interface Summary
TJCustomFilterCustom filter callback interface
+  + +

+
diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-tree.html b/java/doc/org/libjpegturbo/turbojpeg/package-tree.html index 58d8672f..ecb85962 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 - + @@ -99,6 +99,11 @@ Class Hierarchy
  • org.libjpegturbo.turbojpeg.TJTransformer
  • org.libjpegturbo.turbojpeg.TJScalingFactor +

    +Interface Hierarchy +

    +
    diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html index 6ba3d6d9..6f1e7847 100644 --- a/java/doc/overview-tree.html +++ b/java/doc/overview-tree.html @@ -2,12 +2,12 @@ - + Class Hierarchy - + @@ -101,6 +101,11 @@ Class Hierarchy
  • org.libjpegturbo.turbojpeg.TJTransformer
  • org.libjpegturbo.turbojpeg.TJScalingFactor +

    +Interface Hierarchy +

    +
    diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html index 3f08701b..c1a0b754 100644 --- a/java/doc/serialized-form.html +++ b/java/doc/serialized-form.html @@ -2,12 +2,12 @@ - + Serialized Form - + @@ -132,6 +132,17 @@ int options
    +
    +

    +cf

    +
    +TJCustomFilter cf
    +
    +
    Custom filter instance +

    +

    +
    +

    diff --git a/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java b/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java new file mode 100644 index 00000000..711225b7 --- /dev/null +++ b/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java @@ -0,0 +1,76 @@ +/* + * Copyright (C)2011 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: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * - Neither the name of the libjpeg-turbo Project nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS", + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package org.libjpegturbo.turbojpeg; + +import java.awt.*; +import java.nio.*; + +/** + * Custom filter callback interface + */ +public interface TJCustomFilter { + + /** + * A callback function that can be used to modify the DCT coefficients after + * they are losslessly transformed but before they are transcoded to a new + * JPEG file. This allows for custom filters or other transformations to be + * applied in the frequency domain. + * + * @param coeffBuffer a buffer containing transformed DCT coefficients. + * (NOTE: this buffer is not guaranteed to be valid once the callback + * returns, so applications wishing to hand off the DCT coefficients to + * another function or library should make a copy of them within the body of + * the callback.) + * + * @param bufferRegion rectangle containing the width and height of + * coeffBuffer as well as its offset relative to the component + * plane. TurboJPEG implementations may choose to split each component plane + * into multiple DCT coefficient buffers and call the callback function once + * for each buffer. + * + * @param planeRegion rectangle containing the width and height of the + * component plane to which coeffBuffer belongs + * + * @param componentID ID number of the component plane to which + * coeffBufferbelongs (Y, Cb, and Cr have, respectively, ID's of + * 0, 1, and 2 in typical JPEG images.) + * + * @param transformID ID number of the transformed image to which + * coeffBuffer belongs. This is the same as the index of the + * transform in the transforms array that was passed to {@link + * TJTransformer#transform TJTransformer.transform()}. + * + * @param transform a {@link TJTransform} instance that specifies the + * parameters and/or cropping region for this transform + */ + public void customFilter(ShortBuffer coeffBuffer, Rectangle bufferRegion, + Rectangle planeRegion, int componentID, int transformID, + TJTransform transform) + throws Exception; +} diff --git a/java/org/libjpegturbo/turbojpeg/TJTransform.java b/java/org/libjpegturbo/turbojpeg/TJTransform.java index 3f4eb380..b9fbad56 100644 --- a/java/org/libjpegturbo/turbojpeg/TJTransform.java +++ b/java/org/libjpegturbo/turbojpeg/TJTransform.java @@ -37,7 +37,6 @@ public class TJTransform extends Rectangle { private static final long serialVersionUID = -127367705761430371L; - /** * The number of lossless transform operations */ @@ -104,21 +103,29 @@ public class TJTransform extends Rectangle { * partial MCU blocks that cannot be transformed will be left in place, which * will create odd-looking strips on the right or bottom edge of the image. */ - final public static int OPT_PERFECT = 1; + final public static int OPT_PERFECT = 1; /** * This option will discard any partial MCU blocks that cannot be * transformed. */ - final public static int OPT_TRIM = 2; + final public static int OPT_TRIM = 2; /** * This option will enable lossless cropping. */ - final public static int OPT_CROP = 4; + final public static int OPT_CROP = 4; /** * This option will discard the color data in the input image and produce * a grayscale output image. */ - final public static int OPT_GRAY = 8; + final public static int OPT_GRAY = 8; + /** + * This option will prevent {@link TJTransformer#transform + * TJTransformer.transform()} from outputting a JPEG image for this + * particular transform. This can be used in conjunction with a custom + * filter to capture the transformed DCT coefficients without transcoding + * them. + */ + final public static int OPT_NOOUTPUT = 16; /** @@ -146,28 +153,36 @@ public class TJTransform extends Rectangle { * * @param options the bitwise OR of one or more of the transform options * (OPT_*) + * + * @param cf an instance of an object that implements the {@link + * TJCustomFilter} interface, or null if no custom filter is needed */ - public TJTransform(int x, int y, int w, int h, int op, int options) - throws Exception { + public TJTransform(int x, int y, int w, int h, int op, int options, + TJCustomFilter cf) throws Exception { super(x, y, w, h); - this.op = op; this.options = options; + this.op = op; this.options = options; this.cf = cf; } /** * Create a new lossless transform instance with the given parameters. * * @param r a Rectangle instance which specifies the cropping - * region. See {@link #TJTransform(int, int, int, int, int, int)} for more + * region. See {@link + * #TJTransform(int, int, int, int, int, int, TJCustomFilter)} for more * detail. * * @param op one of the transform operations (OP_*) * * @param options the bitwise OR of one or more of the transform options * (OPT_*) + * + * @param cf an instance of an object that implements the {@link + * TJCustomFilter} interface, or null if no custom filter is needed */ - public TJTransform(Rectangle r, int op, int options) throws Exception { + public TJTransform(Rectangle r, int op, int options, + TJCustomFilter cf) throws Exception { super(r); - this.op = op; this.options = options; + this.op = op; this.options = options; this.cf = cf; } /** @@ -179,4 +194,9 @@ public class TJTransform extends Rectangle { * Transform options (bitwise OR of one or more of OPT_*) */ public int options = 0; + + /** + * Custom filter instance + */ + public TJCustomFilter cf = null; } diff --git a/tjbench.c b/tjbench.c index 081f7085..27fc8560 100644 --- a/tjbench.c +++ b/tjbench.c @@ -59,7 +59,7 @@ const char *subNameLong[TJ_NUMSAMP]= const char *subName[NUMSUBOPT]={"444", "422", "420", "GRAY", "440"}; tjscalingfactor *scalingfactors=NULL, sf={1, 1}; int nsf=0; int xformop=TJXOP_NONE, xformopt=0; -int (*customFilter)(short *, tjregion, tjregion, int, int); +int (*customFilter)(short *, tjregion, tjregion, int, int, tjtransform *); double benchtime=5.0; @@ -76,7 +76,7 @@ char *sigfig(double val, int figs, char *buf, int len) /* Custom DCT filter which produces a negative of the image */ int dummyDCTFilter(short *coeffs, tjregion arrayRegion, tjregion planeRegion, - int componentIndex, int transformIndex) + int componentIndex, int transformIndex, tjtransform *transform) { int i; for(i=0; idata; + JNIEnv *env=params->env; + jobject tobj=params->tobj, cfobj=params->cfobj; + jobject arrayRegionObj, planeRegionObj, bufobj, borobj; + jclass cls; jmethodID mid; jfieldID fid; + + bailif0(bufobj=(*env)->NewDirectByteBuffer(env, coeffs, + sizeof(short)*arrayRegion.w*arrayRegion.h)); + bailif0(cls=(*env)->FindClass(env, "java/nio/ByteOrder")); + bailif0(mid=(*env)->GetStaticMethodID(env, cls, "nativeOrder", + "()Ljava/nio/ByteOrder;")); + bailif0(borobj=(*env)->CallStaticObjectMethod(env, cls, mid)); + bailif0(cls=(*env)->GetObjectClass(env, bufobj)); + bailif0(mid=(*env)->GetMethodID(env, cls, "order", + "(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;")); + (*env)->CallObjectMethod(env, bufobj, mid, borobj); + bailif0(mid=(*env)->GetMethodID(env, cls, "asShortBuffer", + "()Ljava/nio/ShortBuffer;")); + bailif0(bufobj=(*env)->CallObjectMethod(env, bufobj, mid)); + + bailif0(cls=(*env)->FindClass(env, "java/awt/Rectangle")); + bailif0(arrayRegionObj=(*env)->AllocObject(env, cls)); + bailif0(fid=(*env)->GetFieldID(env, cls, "x", "I")); + (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.x); + bailif0(fid=(*env)->GetFieldID(env, cls, "y", "I")); + (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.y); + bailif0(fid=(*env)->GetFieldID(env, cls, "width", "I")); + (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.w); + bailif0(fid=(*env)->GetFieldID(env, cls, "height", "I")); + (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.h); + + bailif0(planeRegionObj=(*env)->AllocObject(env, cls)); + bailif0(fid=(*env)->GetFieldID(env, cls, "x", "I")); + (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.x); + bailif0(fid=(*env)->GetFieldID(env, cls, "y", "I")); + (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.y); + bailif0(fid=(*env)->GetFieldID(env, cls, "width", "I")); + (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.w); + bailif0(fid=(*env)->GetFieldID(env, cls, "height", "I")); + (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.h); + + bailif0(cls=(*env)->GetObjectClass(env, cfobj)); + bailif0(mid=(*env)->GetMethodID(env, cls, "customFilter", + "(Ljava/nio/ShortBuffer;Ljava/awt/Rectangle;Ljava/awt/Rectangle;IILorg/libjpegturbo/turbojpeg/TJTransform;)V")); + (*env)->CallVoidMethod(env, cfobj, mid, bufobj, arrayRegionObj, + planeRegionObj, componentIndex, transformIndex, tobj); + + return 0; + + bailout: + return -1; +} + JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transform (JNIEnv *env, jobject obj, jbyteArray jsrcBuf, jint jpegSize, jobjectArray dstobjs, jobjectArray tobjs, jint flags) @@ -497,6 +561,7 @@ JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transf jbyteArray *jdstBufs=NULL; int jpegWidth=0, jpegHeight=0, jpegSubsamp; jintArray jdstSizes=0; jint *dstSizesi=NULL; + JNICustomFilterParams *params=NULL; gethandle(); @@ -521,15 +586,19 @@ JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transf _throw("Memory allocation failure"); if((t=(tjtransform *)malloc(sizeof(tjtransform)*n))==NULL) _throw("Memory allocation failure"); + if((params=(JNICustomFilterParams *)malloc(sizeof(JNICustomFilterParams)*n)) + ==NULL) + _throw("Memory allocation failure"); for(i=0; iGetObjectArrayElement(env, tobjs, i)); bailif0(_cls=(*env)->GetObjectClass(env, tobj)); @@ -545,6 +614,15 @@ JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transf t[i].r.w=(*env)->GetIntField(env, tobj, _fid); bailif0(_fid=(*env)->GetFieldID(env, _cls, "height", "I")); t[i].r.h=(*env)->GetIntField(env, tobj, _fid); + + t[i].customFilter=JNICustomFilter; + bailif0(_fid=(*env)->GetFieldID(env, _cls, "cf", + "Lorg/libjpegturbo/turbojpeg/TJCustomFilter;")); + bailif0(cfobj=(*env)->GetObjectField(env, tobj, _fid)); + params[i].env=env; + params[i].tobj=tobj; + params[i].cfobj=cfobj; + t[i].data=(void *)¶ms[i]; } bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, jsrcBuf, 0)); diff --git a/turbojpeg.c b/turbojpeg.c index 60d6ee95..9fc60cec 100644 --- a/turbojpeg.c +++ b/turbojpeg.c @@ -1069,7 +1069,7 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, unsigned char *jpegBuf, for(y=0; yv_samp_factor; y++) { if(t[i].customFilter(barray[y][0], arrayRegion, planeRegion, - ci, i)==-1) + ci, i, &t[i])==-1) _throw("tjTransform(): Error in custom filter"); arrayRegion.y+=DCTSIZE; } diff --git a/turbojpeg.h b/turbojpeg.h index f0c542c0..70dcfc93 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -369,7 +369,7 @@ typedef struct /** * Lossless transform */ -typedef struct +typedef struct tjtransform { /** * Cropping region @@ -383,34 +383,44 @@ typedef struct * The bitwise OR of one of more of the @ref TJXOPT_CROP "transform options" */ int options; + /** + * Arbitrary data that can be accessed within the body of the callback + * function + */ + void *data; /** * A callback function that can be used to modify the DCT coefficients * after they are losslessly transformed but before they are transcoded to a * new JPEG file. This allows for custom filters or other transformations to * be applied in the frequency domain. * - * @param coeffs pointer to an array of DCT coefficients. (NOTE: this - * pointer is not guaranteed to be valid once the callback returns, so - * applications wishing to hand off the DCT coefficients to another - * function or library should make a copy of them within the body of - * the callback.) - * @param arrayRegion region structure containing the width and height of the - * DCT coefficient array as well as its offset relative to the - * component plane. TurboJPEG implementations may choose to split - * each component plane into multiple DCT coefficient arrays and call - * the callback function once for each array. - * @param planeRegion region structure containing the width and height of the - * component plane to which this DCT coefficient array belongs - * @param componentIndex the component plane to which this DCT coefficient - * array belongs (Y, Cb, and Cr are, respectively, 0, 1, and 2 in - * typical JPEG images.) - * @param transformIndex the transformed image to which this DCT coefficient - * array belongs + * @param coeffs pointer to an array of transformed DCT coefficients. (NOTE: + * this pointer is not guaranteed to be valid once the callback + * returns, so applications wishing to hand off the DCT coefficients + * to another function or library should make a copy of them within + * the body of the callback.) + * @param arrayRegion #tjregion structure containing the width and height of + * coeffs as well as its offset relative to the component + * plane. TurboJPEG implementations may choose to split each + * component plane into multiple DCT coefficient arrays and call the + * callback function once for each array. + * @param planeRegion #tjregion structure containing the width and height of + * the component plane to which coeffs belongs + * @param componentID ID number of the component plane to which + * coeffs belongs (Y, Cb, and Cr have, respectively, ID's of + * 0, 1, and 2 in typical JPEG images.) + * @param transformID ID number of the transformed image to which + * coeffs belongs. This is the same as the index of the + * transform in the transforms array that was passed to + * #tjTransform(). + * @param transform a pointer to a #tjtransform structure that specifies the + * parameters and/or cropping region for this transform * * @return 0 if the callback was successful, or -1 if an error occurred. */ int (*customFilter)(short *coeffs, tjregion arrayRegion, - tjregion planeRegion, int componentIndex, int transformIndex); + tjregion planeRegion, int componentIndex, int transformIndex, + struct tjtransform *transform); } tjtransform; /**