Permalink
Browse files

Import JPEG XR reference software 1.8 (September 2009) from http://ww…

  • Loading branch information...
1 parent 14a011d commit 1a925289e6f5140e7b1f6f83ffc42ea8b1bec845 @mloskot committed Mar 24, 2012
View
9 README
@@ -1,10 +1,9 @@
-Information technology -- JPEG XR image coding system -- Part 5: Reference software
+T.832 : Information technology - JPEG XR image coding system - Image coding specification
-This is source code of the JPEG XR Reference Software from 29n10430att.zip
-available at http://www.itscj.ipsj.or.jp/sc29/open/29view/29n10430c.htm
+JPEG XR reference software 1.8 (September 2009)
-Pointed by Microsoft team in discussion on Windows Imaging Component (WIC) forum:
-http://social.msdn.microsoft.com/Forums/en-US/windowswic/thread/dfdd2455-f2fc-4f51-b528-affade3374a1
+This is source code downloaded from http://www.itu.int/rec/T-REC-T.835/en
+Pointed in answer at http://stackoverflow.com/a/9689275/151641
Git: https://github.com/mloskot/jxr-refsoft
View
Binary file not shown.
View
Binary file not shown.
View
@@ -3,7 +3,7 @@
*
* This software module was originally contributed by Microsoft
* Corporation in the course of development of the
-* ITU-T "T.JXR" | ISO/IEC 29199-2 ("JPEG XR") format standard for
+* ITU-T T.832 | ISO/IEC 29199-2 ("JPEG XR") format standard for
* reference purposes and its performance may not have been optimized.
*
* This software module is an implementation of one or more
@@ -13,7 +13,7 @@
* copyright license to copy, distribute, and make derivative works
* of this software module or modifications thereof for use in
* products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2.
+* specified by ITU-T T.832 | ISO/IEC 29199-2.
*
* ITU/ISO/IEC give users the same free license to this software
* module or modifications thereof for research purposes and further
@@ -24,48 +24,17 @@
* liability for use of this software module or modifications thereof.
*
* Copyright is not released for products that do not conform to
-* to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
-******** Section to be removed when the standard is published ************
-*
-* Assurance that the contributed software module can be used
-* (1) in the ITU-T "T.JXR" | ISO/IEC 29199 ("JPEG XR") standard once the
-* standard has been adopted; and
-* (2) to develop the JPEG XR standard:
-*
-* Microsoft Corporation and any subsequent contributors to the development
-* of this software grant ITU/ISO/IEC all rights necessary to include
-* the originally developed software module or modifications thereof in the
-* JPEG XR standard and to permit ITU/ISO/IEC to offer such a royalty-free,
-* worldwide, non-exclusive copyright license to copy, distribute, and make
-* derivative works of this software module or modifications thereof for
-* use in products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2, and to the extent that
-* such originally developed software module or portions of it are included
-* in an ITU/ISO/IEC standard. To the extent that the original contributors
-* may own patent rights that would be required to make, use, or sell the
-* originally developed software module or portions thereof included in the
-* ITU/ISO/IEC standard in a conforming product, the contributors will
-* assure ITU/ISO/IEC that they are willing to negotiate licenses under
-* reasonable and non-discriminatory terms and conditions with
-* applicants throughout the world and in accordance with their patent
-* rights declarations made to ITU/ISO/IEC (if any).
-*
-* Microsoft, any subsequent contributors, and ITU/ISO/IEC additionally
-* gives You a free license to this software module or modifications
-* thereof for the sole purpose of developing the JPEG XR standard.
-*
-******** end of section to be removed when the standard is published *****
-*
* Microsoft Corporation retains full right to modify and use the code
* for its own purpose, to assign or donate the code to a third party,
* and to inhibit third parties from using the code for products that
-* do not conform to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* do not conform to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
* This copyright notice must be included in all copies or derivative
* works.
*
-* Copyright (c) ITU-T/ISO/IEC 2008.
+* Copyright (c) ITU-T/ISO/IEC 2008, 2009.
***********************************************************************/
View
@@ -1,3 +1,35 @@
+ITU-T Rec. T.835 (ex T.JXR-5) | ISO/IEC 29199-5
+
+"Information technology � JPEG XR image coding system � Reference software"
+
+==============
+ READ-ME FILE
+==============
+
+*********************************************************************
+* *
+* NOTE: the software in folder my_getopt-1.5 is used solely for *
+* facilitating handling of the command line interface paramenters, *
+* and it is not part of the algorithimic implementation of JPEG-XR. *
+* *
+*********************************************************************
+
+JPEG XR reference software 1.8 (September 2009)
+-------------------------------------------------------------------
+
+This version constitutes changes to the encoder only. Two bugs were fixed:
+1. Fix a crashing bug for tiling.
+2. Fix a bug in the overlap operators. Overlap code was using row indices relative to the tile instead of relative to the image.
+
+No changes were made to the usage text.
+
+JPEG XR reference software 1.7 (July 2009)
+-------------------------------------------------------------------
+
+This version constitutes a change to the encoder only. A bug related to using a detailed quantization information file
+without specifying tile sizes (or without tiling) was fixed.
+
+No changes were made to the usage text.
JPEG XR reference software 1.6 (29 May 2009)
-------------------------------------------------------------------
@@ -443,3 +475,4 @@ body is one each of these channel items:
LP { <n>... }
HP { <n>... }
+--END
View
@@ -9,7 +9,7 @@
*
* This software module was originally contributed by Microsoft
* Corporation in the course of development of the
-* ITU-T "T.JXR" | ISO/IEC 29199-2 ("JPEG XR") format standard for
+* ITU-T T.832 | ISO/IEC 29199-2 ("JPEG XR") format standard for
* reference purposes and its performance may not have been optimized.
*
* This software module is an implementation of one or more
@@ -19,7 +19,7 @@
* copyright license to copy, distribute, and make derivative works
* of this software module or modifications thereof for use in
* products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2.
+* specified by ITU-T T.832 | ISO/IEC 29199-2.
*
* ITU/ISO/IEC give users the same free license to this software
* module or modifications thereof for research purposes and further
@@ -30,50 +30,19 @@
* liability for use of this software module or modifications thereof.
*
* Copyright is not released for products that do not conform to
-* to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
-******** Section to be removed when the standard is published ************
-*
-* Assurance that the contributed software module can be used
-* (1) in the ITU-T "T.JXR" | ISO/IEC 29199 ("JPEG XR") standard once the
-* standard has been adopted; and
-* (2) to develop the JPEG XR standard:
-*
-* Microsoft Corporation and any subsequent contributors to the development
-* of this software grant ITU/ISO/IEC all rights necessary to include
-* the originally developed software module or modifications thereof in the
-* JPEG XR standard and to permit ITU/ISO/IEC to offer such a royalty-free,
-* worldwide, non-exclusive copyright license to copy, distribute, and make
-* derivative works of this software module or modifications thereof for
-* use in products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2, and to the extent that
-* such originally developed software module or portions of it are included
-* in an ITU/ISO/IEC standard. To the extent that the original contributors
-* may own patent rights that would be required to make, use, or sell the
-* originally developed software module or portions thereof included in the
-* ITU/ISO/IEC standard in a conforming product, the contributors will
-* assure ITU/ISO/IEC that they are willing to negotiate licenses under
-* reasonable and non-discriminatory terms and conditions with
-* applicants throughout the world and in accordance with their patent
-* rights declarations made to ITU/ISO/IEC (if any).
-*
-* Microsoft, any subsequent contributors, and ITU/ISO/IEC additionally
-* gives You a free license to this software module or modifications
-* thereof for the sole purpose of developing the JPEG XR standard.
-*
-******** end of section to be removed when the standard is published *****
-*
* Microsoft Corporation retains full right to modify and use the code
* for its own purpose, to assign or donate the code to a third party,
* and to inhibit third parties from using the code for products that
-* do not conform to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* do not conform to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
* This copyright notice must be included in all copies or derivative
* works.
*
-* Copyright (c) ITU-T/ISO/IEC 2008.
+* Copyright (c) ITU-T/ISO/IEC 2008, 2009.
***********************************************************************/
#ifdef _MSC_VER
View
@@ -3,7 +3,7 @@
*
* This software module was originally contributed by Microsoft
* Corporation in the course of development of the
-* ITU-T "T.JXR" | ISO/IEC 29199-2 ("JPEG XR") format standard for
+* ITU-T T.832 | ISO/IEC 29199-2 ("JPEG XR") format standard for
* reference purposes and its performance may not have been optimized.
*
* This software module is an implementation of one or more
@@ -13,7 +13,7 @@
* copyright license to copy, distribute, and make derivative works
* of this software module or modifications thereof for use in
* products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2.
+* specified by ITU-T T.832 | ISO/IEC 29199-2.
*
* ITU/ISO/IEC give users the same free license to this software
* module or modifications thereof for research purposes and further
@@ -24,50 +24,19 @@
* liability for use of this software module or modifications thereof.
*
* Copyright is not released for products that do not conform to
-* to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
-******** Section to be removed when the standard is published ************
-*
-* Assurance that the contributed software module can be used
-* (1) in the ITU-T "T.JXR" | ISO/IEC 29199 ("JPEG XR") standard once the
-* standard has been adopted; and
-* (2) to develop the JPEG XR standard:
-*
-* Microsoft Corporation and any subsequent contributors to the development
-* of this software grant ITU/ISO/IEC all rights necessary to include
-* the originally developed software module or modifications thereof in the
-* JPEG XR standard and to permit ITU/ISO/IEC to offer such a royalty-free,
-* worldwide, non-exclusive copyright license to copy, distribute, and make
-* derivative works of this software module or modifications thereof for
-* use in products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2, and to the extent that
-* such originally developed software module or portions of it are included
-* in an ITU/ISO/IEC standard. To the extent that the original contributors
-* may own patent rights that would be required to make, use, or sell the
-* originally developed software module or portions thereof included in the
-* ITU/ISO/IEC standard in a conforming product, the contributors will
-* assure ITU/ISO/IEC that they are willing to negotiate licenses under
-* reasonable and non-discriminatory terms and conditions with
-* applicants throughout the world and in accordance with their patent
-* rights declarations made to ITU/ISO/IEC (if any).
-*
-* Microsoft, any subsequent contributors, and ITU/ISO/IEC additionally
-* gives You a free license to this software module or modifications
-* thereof for the sole purpose of developing the JPEG XR standard.
-*
-******** end of section to be removed when the standard is published *****
-*
* Microsoft Corporation retains full right to modify and use the code
* for its own purpose, to assign or donate the code to a third party,
* and to inhibit third parties from using the code for products that
-* do not conform to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* do not conform to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
* This copyright notice must be included in all copies or derivative
* works.
*
-* Copyright (c) ITU-T/ISO/IEC 2008.
+* Copyright (c) ITU-T/ISO/IEC 2008, 2009.
***********************************************************************/
#ifdef _MSC_VER
@@ -922,9 +891,22 @@ void jxr_set_NUM_VER_TILES_MINUS1(jxr_image_t image, unsigned num)
void jxr_set_TILE_WIDTH_IN_MB(jxr_image_t image, unsigned* list)
{
+ unsigned idx, total_width = 0;
+
assert(list != 0);
image->tile_column_width = list;
image->tile_column_position = image->tile_column_width + image->tile_columns;
+
+ if (image->tile_column_width[0] == 0) {
+ total_width = 0;
+ for ( idx = 0 ; idx < image->tile_columns - 1 ; idx++ ) {
+ image->tile_column_width[idx] = (image->extended_width >> 4) / image->tile_columns;
+ image->tile_column_position[idx] = total_width;
+ total_width += image->tile_column_width[idx];
+ }
+ image->tile_column_width[image->tile_columns - 1] = (image->extended_width >> 4) - total_width;
+ image->tile_column_position[image->tile_columns - 1] = total_width;
+ }
}
void jxr_set_NUM_HOR_TILES_MINUS1(jxr_image_t image, unsigned num)
@@ -938,9 +920,22 @@ void jxr_set_NUM_HOR_TILES_MINUS1(jxr_image_t image, unsigned num)
void jxr_set_TILE_HEIGHT_IN_MB(jxr_image_t image, unsigned* list)
{
+ unsigned idx, total_height = 0;
+
assert(list != 0);
image->tile_row_height = list;
image->tile_row_position = image->tile_row_height + image->tile_rows;
+
+ if (image->tile_row_height[0] == 0) {
+ total_height = 0;
+ for ( idx = 0 ; idx < image->tile_rows - 1 ; idx++ ) {
+ image->tile_row_height[idx] = (image->extended_height >> 4) / image->tile_rows;
+ image->tile_row_position[idx] = total_height;
+ total_height += image->tile_row_height[idx];
+ }
+ image->tile_row_height[image->tile_rows - 1] = (image->extended_height >> 4) - total_height;
+ image->tile_row_position[image->tile_rows - 1] = total_height;
+ }
}
void jxr_set_TILING_FLAG(jxr_image_t image, int flag)
View
@@ -4,7 +4,7 @@
*
* This software module was originally contributed by Microsoft
* Corporation in the course of development of the
-* ITU-T "T.JXR" | ISO/IEC 29199-2 ("JPEG XR") format standard for
+* ITU-T T.832 | ISO/IEC 29199-2 ("JPEG XR") format standard for
* reference purposes and its performance may not have been optimized.
*
* This software module is an implementation of one or more
@@ -14,7 +14,7 @@
* copyright license to copy, distribute, and make derivative works
* of this software module or modifications thereof for use in
* products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2.
+* specified by ITU-T T.832 | ISO/IEC 29199-2.
*
* ITU/ISO/IEC give users the same free license to this software
* module or modifications thereof for research purposes and further
@@ -25,50 +25,19 @@
* liability for use of this software module or modifications thereof.
*
* Copyright is not released for products that do not conform to
-* to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
-******** Section to be removed when the standard is published ************
-*
-* Assurance that the contributed software module can be used
-* (1) in the ITU-T "T.JXR" | ISO/IEC 29199 ("JPEG XR") standard once the
-* standard has been adopted; and
-* (2) to develop the JPEG XR standard:
-*
-* Microsoft Corporation and any subsequent contributors to the development
-* of this software grant ITU/ISO/IEC all rights necessary to include
-* the originally developed software module or modifications thereof in the
-* JPEG XR standard and to permit ITU/ISO/IEC to offer such a royalty-free,
-* worldwide, non-exclusive copyright license to copy, distribute, and make
-* derivative works of this software module or modifications thereof for
-* use in products claiming conformance to the JPEG XR standard as
-* specified by ITU-T "T.JXR" | ISO/IEC 29199-2, and to the extent that
-* such originally developed software module or portions of it are included
-* in an ITU/ISO/IEC standard. To the extent that the original contributors
-* may own patent rights that would be required to make, use, or sell the
-* originally developed software module or portions thereof included in the
-* ITU/ISO/IEC standard in a conforming product, the contributors will
-* assure ITU/ISO/IEC that they are willing to negotiate licenses under
-* reasonable and non-discriminatory terms and conditions with
-* applicants throughout the world and in accordance with their patent
-* rights declarations made to ITU/ISO/IEC (if any).
-*
-* Microsoft, any subsequent contributors, and ITU/ISO/IEC additionally
-* gives You a free license to this software module or modifications
-* thereof for the sole purpose of developing the JPEG XR standard.
-*
-******** end of section to be removed when the standard is published *****
-*
* Microsoft Corporation retains full right to modify and use the code
* for its own purpose, to assign or donate the code to a third party,
* and to inhibit third parties from using the code for products that
-* do not conform to the JPEG XR standard as specified by ITU-T "T.JXR" |
+* do not conform to the JPEG XR standard as specified by ITU-T T.832 |
* ISO/IEC 29199-2.
*
* This copyright notice must be included in all copies or derivative
* works.
*
-* Copyright (c) ITU-T/ISO/IEC 2008.
+* Copyright (c) ITU-T/ISO/IEC 2008, 2009.
***********************************************************************/
#ifdef _MSC_VER
Oops, something went wrong.

0 comments on commit 1a92528

Please sign in to comment.