Add note regarding the fact that 4:4:0 lacks full SIMD support; Add an option for...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1009 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/doc/html/annotated.html b/doc/html/annotated.html
index 4c81fad9080c7c9b173604c48967a4ca7f73f329..71f3746c228fb415bcad71dc1f4e9d49004a023a 100644 (file)
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -95,7 +95,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/classes.html b/doc/html/classes.html
index 4494e967a0df75af4cb8f6714e27491bac4f174c..4d0fc0b665ef603dffe9414b40a27755a7c4d1ac 100644 (file)
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -97,7 +97,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/functions.html b/doc/html/functions.html
index 8b8af0a1817bd36f315ccdd46641d095be818ac7..015c72831ebe81fe4afbae9abefbebcb59e89942 100644 (file)
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html
index b2a8b83a25123307195c7ed20751598147d233c0..dd0ce39ba6537731627133ceafb2b8f3ddf1b039 100644 (file)
--- a/doc/html/functions_vars.html
+++ b/doc/html/functions_vars.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/group___turbo_j_p_e_g.html b/doc/html/group___turbo_j_p_e_g.html
index 9c460bc013e79e311871f12c97b5d20f74c3aa4a..854f74df46a8a53e483efeaa4f986e519ea47e17 100644 (file)
--- a/doc/html/group___turbo_j_p_e_g.html
+++ b/doc/html/group___turbo_j_p_e_g.html
@@ -704,7 +704,7 @@ Variables</h2></td></tr>
 </td></tr>
 <tr><td class="fieldname"><em><a class="anchor" id="gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974"></a>TJSAMP_440</em>&nbsp;</td><td class="fielddoc">
 <p>4:4:0 chrominance subsampling. </p>
-<p>The JPEG or YUV image will contain one chrominance component for every 1x2 block of pixels in the source image. </p>
+<p>The JPEG or YUV image will contain one chrominance component for every 1x2 block of pixels in the source image. Note that 4:4:0 subsampling is not fully accelerated in the libjpeg-turbo implementation of TurboJPEG. </p>
 </td></tr>
 </table>
 
@@ -1694,7 +1694,7 @@ If you choose option 1, <code>dstSizes[i]</code> should be set to the size of yo
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/index.html b/doc/html/index.html
index 4e1be5b5d77a9e73bc9feb5f2dd37baa43371aa7..f20845224fb0fb7bc3213460c2b22c6f3174c231 100644 (file)
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -81,7 +81,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/modules.html b/doc/html/modules.html
index 0cdd27a4d7e35efb975d8f210d9e5e5dbeffaf12..8cc38e5b358d8e1affe4a7f254ed73af09bad859 100644 (file)
--- a/doc/html/modules.html
+++ b/doc/html/modules.html
@@ -86,7 +86,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html
index dfb3e4a783d62b50003328f98c1cc14cd6503f11..6637fbb12d87ec45aeb5d0ca21bdeaaaf3967bb2 100644 (file)
--- a/doc/html/structtjregion.html
+++ b/doc/html/structtjregion.html
@@ -177,7 +177,7 @@ Data Fields</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html
index fba58ff6bdbd21454eed23b59d9b3b756eade413..d44d336477567eec7cd0b4a54fac5c02e982040a 100644 (file)
--- a/doc/html/structtjscalingfactor.html
+++ b/doc/html/structtjscalingfactor.html
@@ -139,7 +139,7 @@ Data Fields</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html
index d28a1af29f8a90a95b9932806e7b245c2bbdd827..9cf6562241ae38785a438f130382e784d4919e85 100644 (file)
--- a/doc/html/structtjtransform.html
+++ b/doc/html/structtjtransform.html
@@ -203,7 +203,7 @@ Data Fields</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Sun Aug 18 2013 03:40:14 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Sun Aug 18 2013 04:14:41 for TurboJPEG by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>

diff --git a/tjbench.c b/tjbench.c
index 87b462f4c332d4de5ba7de4d626a49310357040e..105a4ccec43fe1d415ebcc877337d296cf7dbe18 100644 (file)
--- a/tjbench.c
+++ b/tjbench.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2009-2012 D. R. Commander.  All Rights Reserved.
+ * Copyright (C)2009-2013 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:
@@ -686,6 +686,7 @@ void usage(char *progname)
        printf("     codec\n");
        printf("-accuratedct = Use the most accurate DCT/IDCT algorithms available in the\n");
        printf("     underlying codec\n");
+       printf("-440 = Test 4:4:0 chrominance subsampling instead of 4:2:2\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");
@@ -719,7 +720,7 @@ int main(int argc, char *argv[])
 {
        unsigned char *srcbuf=NULL;  int w, h, i, j;
        int minqual=-1, maxqual=-1;  char *temp;
-       int minarg=2;  int retval=0;
+       int minarg=2, retval=0, do440=0;
 
        if((scalingfactors=tjGetScalingFactors(&nsf))==NULL || nsf==0)
                _throwtj("executing tjGetScalingFactors()");
@@ -810,6 +811,7 @@ int main(int argc, char *argv[])
                                printf("Using most accurate DCT/IDCT algorithm\n\n");
                                flags|=TJFLAG_ACCURATEDCT;
                        }
+                       if(!strcmp(argv[i], "-440")) do440=1;
                        if(!strcasecmp(argv[i], "-rgb")) pf=TJPF_RGB;
                        if(!strcasecmp(argv[i], "-rgbx")) pf=TJPF_RGBX;
                        if(!strcasecmp(argv[i], "-bgr")) pf=TJPF_BGR;
@@ -902,7 +904,7 @@ int main(int argc, char *argv[])
                dotest(srcbuf, w, h, TJ_420, i, argv[1]);
        printf("\n");
        for(i=maxqual; i>=minqual; i--)
-               dotest(srcbuf, w, h, TJ_422, i, argv[1]);
+               dotest(srcbuf, w, h, do440? TJSAMP_440:TJ_422, i, argv[1]);
        printf("\n");
        for(i=maxqual; i>=minqual; i--)
                dotest(srcbuf, w, h, TJ_444, i, argv[1]);

diff --git a/turbojpeg.h b/turbojpeg.h
index c7a29a030f1c8417a6e38f42772a7c1cf8f21dab..3cd4a31e93287bc9b2b8d07d7e8cb1955a3faa2e 100644 (file)
--- a/turbojpeg.h
+++ b/turbojpeg.h
@@ -85,6 +85,8 @@ enum TJSAMP
   /**
    * 4:4:0 chrominance subsampling.  The JPEG or YUV image will contain one
    * chrominance component for every 1x2 block of pixels in the source image.
+   * Note that 4:4:0 subsampling is not fully accelerated in the libjpeg-turbo
+   * implementation of TurboJPEG.
    */
   TJSAMP_440
 };