summaryrefslogtreecommitdiff
path: root/branches
diff options
context:
space:
mode:
authordcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2011-02-22 00:31:27 +0000
committerdcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2011-02-22 00:31:27 +0000
commit8cef517359f5e06e476855dabb124fdac08452c3 (patch)
tree6a44f5e1fdebb5a9d079dda45b50f05036274fb0 /branches
parent84fd7d5e476b2843e5a20c7a78821432d91032ef (diff)
"TurboJPEG/OSS"="TurboJPEG", since the TurboJPEG header is used with other codecs besides libjpeg-turbo
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@420 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'branches')
-rw-r--r--branches/1.1.x/turbojpeg.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/branches/1.1.x/turbojpeg.h b/branches/1.1.x/turbojpeg.h
index d3ba499..47e5aa6 100644
--- a/branches/1.1.x/turbojpeg.h
+++ b/branches/1.1.x/turbojpeg.h
@@ -52,10 +52,10 @@ enum {TJ_444=0, TJ_422, TJ_420, TJ_GRAYSCALE};
(64-bit IPP version only) */
#define TJ_FASTUPSAMPLE 256
/* Use fast, inaccurate 4:2:2 and 4:2:0 YUV upsampling routines
- (libjpeg version only) */
+ (libjpeg and libjpeg-turbo versions only) */
#define TJ_YUV 512
- /* If passed to tjCompress(), this causes TurboJPEG/OSS to use the
- accelerated color conversion routines in libjpeg-turbo to produce a planar
+ /* If passed to tjCompress(), this causes TurboJPEG to use the accelerated
+ color conversion routines in the underlying codec to produce a planar
YUV image that is suitable for X Video. Specifically, if the chrominance
components are subsampled along the horizontal dimension, then the width
of the luminance plane is padded to 2 in the output image (same goes for
@@ -66,13 +66,13 @@ enum {TJ_444=0, TJ_422, TJ_420, TJ_GRAYSCALE};
TJ_420, which produces an image compatible with the I420 (AKA "YUV420P")
format.
- If passed to tjDecompress(), this tells TurboJPEG/OSS to perform JPEG
+ If passed to tjDecompress(), this tells TurboJPEG to perform JPEG
decompression but to leave out the color conversion step, so a planar YUV
image is generated instead of an RGB image. The padding of the planes in
this image is the same as in the above case. Note that, if the width or
height of the output image is not a multiple of 8 (or a multiple of 16
along any dimension in which chrominance subsampling is used), then an
- intermediate buffer copy will be performed within TurboJPEG/OSS.
+ intermediate buffer copy will be performed within TurboJPEG.
*/
typedef void* tjhandle;