[trunk] Start FolderReorgProposal task

Update issue 177

19 files changed, 9019 insertions, 0 deletions

diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
new file mode 100644
index 00000000..44514c54
--- /dev/null
+++ b/src/bin/mj2/CMakeLists.txt
@@ -0,0 +1,94 @@
+# Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
+
+set(common_SRCS ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c)
+
+# While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files.
+set(OPJ_SRCS
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/bio.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cio.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/dwt.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/event.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/image.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k_lib.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jp2.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jpt.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mct.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mqc.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/openjpeg.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/pi.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/raw.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t1.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cidx_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/phix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/ppix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/thix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
+)
+
+set(MJ2_SRCS mj2.c mj2_convert.c)
+
+if(WIN32)
+  add_definitions(-DOPJ_STATIC)
+endif()
+
+# Headers file are located here:
+include_directories(
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common
+  ${LCMS_INCLUDE_DIRNAME}
+  )
+
+add_executable(frames_to_mj2
+  frames_to_mj2.c
+  ${common_SRCS}
+  ${OPJ_SRCS}
+  ${MJ2_SRCS}
+  )
+target_link_libraries(frames_to_mj2 ${LCMS_LIBNAME})
+
+if(UNIX)
+  target_link_libraries(frames_to_mj2 m)
+endif()
+
+add_executable(mj2_to_frames
+    mj2_to_frames.c
+    ${common_SRCS}
+    ${OPJ_SRCS}
+    ${MJ2_SRCS}
+    ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
+    )
+target_link_libraries(mj2_to_frames ${LCMS_LIBNAME})
+
+if(UNIX)
+  target_link_libraries(mj2_to_frames m)
+endif()
+
+add_executable(extract_j2k_from_mj2
+    extract_j2k_from_mj2.c
+    ${OPJ_SRCS}
+    ${MJ2_SRCS}
+    )
+target_link_libraries(extract_j2k_from_mj2 ${LCMS_LIBNAME})
+
+if(UNIX)
+  target_link_libraries(extract_j2k_from_mj2 m)
+endif()
+
+add_executable(wrap_j2k_in_mj2
+    wrap_j2k_in_mj2.c
+    ${OPJ_SRCS}
+    ${MJ2_SRCS}
+    )
+target_link_libraries(wrap_j2k_in_mj2 ${LCMS_LIBNAME})
+
+if(UNIX)
+  target_link_libraries(wrap_j2k_in_mj2 m)
+endif()
+
+install(TARGETS frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
+	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
diff --git a/src/bin/mj2/Makefile.am b/src/bin/mj2/Makefile.am
new file mode 100644
index 00000000..cff65660
--- /dev/null
+++ b/src/bin/mj2/Makefile.am
@@ -0,0 +1,111 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+OPJ_SRC = \
+../../libopenjpeg/bio.c \
+../../libopenjpeg/cio.c \
+../../libopenjpeg/dwt.c \
+../../libopenjpeg/event.c \
+../../libopenjpeg/image.c \
+../../libopenjpeg/j2k.c \
+../../libopenjpeg/j2k_lib.c \
+../../libopenjpeg/jp2.c \
+../../libopenjpeg/jpt.c \
+../../libopenjpeg/mct.c \
+../../libopenjpeg/mqc.c \
+../../libopenjpeg/openjpeg.c \
+../../libopenjpeg/pi.c \
+../../libopenjpeg/raw.c \
+../../libopenjpeg/t1.c \
+../../libopenjpeg/t2.c \
+../../libopenjpeg/tcd.c \
+../../libopenjpeg/tgt.c \
+../../libopenjpeg/cidx_manager.c \
+../../libopenjpeg/phix_manager.c \
+../../libopenjpeg/ppix_manager.c \
+../../libopenjpeg/thix_manager.c \
+../../libopenjpeg/tpix_manager.c \
+../../libopenjpeg/function_list.c
+
+bin_PROGRAMS = \
+frames_to_mj2 \
+mj2_to_frames \
+extract_j2k_from_mj2 \
+wrap_j2k_in_mj2
+
+frames_to_mj2_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-DOPJ_STATIC
+frames_to_mj2_CFLAGS = 
+frames_to_mj2_LDADD = -lm
+frames_to_mj2_SOURCES = \
+$(OPJ_SRC) \
+../common/opj_getopt.c \
+mj2_convert.c \
+mj2.c \
+frames_to_mj2.c \
+mj2.h \
+mj2_convert.h
+
+mj2_to_frames_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+@LCMS2_CFLAGS@ \
+@LCMS1_CFLAGS@ \
+-DOPJ_STATIC
+mj2_to_frames_CFLAGS = 
+mj2_to_frames_LDADD = @LCMS2_LIBS@ @LCMS1_LIBS@ -lm
+mj2_to_frames_SOURCES = \
+$(OPJ_SRC) \
+../common/color.c \
+../common/opj_getopt.c \
+mj2_convert.c \
+mj2.c \
+mj2_to_frames.c \
+mj2.h \
+mj2_convert.h
+
+extract_j2k_from_mj2_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-DOPJ_STATIC
+extract_j2k_from_mj2_CFLAGS = 
+extract_j2k_from_mj2_LDADD = -lm
+extract_j2k_from_mj2_SOURCES = \
+$(OPJ_SRC) \
+mj2.c \
+extract_j2k_from_mj2.c \
+mj2.h
+
+wrap_j2k_in_mj2_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-DOPJ_STATIC
+wrap_j2k_in_mj2_CFLAGS = 
+wrap_j2k_in_mj2_LDADD = -lm
+wrap_j2k_in_mj2_SOURCES = \
+$(OPJ_SRC) \
+mj2.c \
+wrap_j2k_in_mj2.c \
+mj2.h
+
+EXTRA_DIST = \
+CMakeLists.txt
+
+install-data-hook:
+	@echo -e " (B)\t$(bindir)/frames_to_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (B)\t$(bindir)/mj2_to_frames$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (B)\t$(bindir)/extract_j2k_from_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (B)\t$(bindir)/wrap_j2k_in_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
diff --git a/src/bin/mj2/extract_j2k_from_mj2.c b/src/bin/mj2/extract_j2k_from_mj2.c
new file mode 100644
index 00000000..f694d531
--- /dev/null
+++ b/src/bin/mj2/extract_j2k_from_mj2.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * 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 OWNER 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "openjpeg.h"
+#include "cio.h"
+#include "j2k.h"
+#include "jp2.h"
+#include "mj2.h"
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting a FILE* client object
+*/
+void info_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+int main(int argc, char *argv[]) {
+	opj_dinfo_t* dinfo; 
+	opj_event_mgr_t event_mgr;		/* event manager */
+  int tnum;
+  unsigned int snum;
+  opj_mj2_t *movie;
+  mj2_tk_t *track;
+  mj2_sample_t *sample;
+  unsigned char* frame_codestream;
+  FILE *file, *outfile;
+  char outfilename[50];
+	mj2_dparameters_t parameters;
+
+  if (argc != 3) {
+    printf("Usage: %s mj2filename output_location\n",argv[0]); 
+    printf("Example: %s foreman.mj2 output/foreman\n",argv[0]);
+    return 1;
+  }
+  
+  file = fopen(argv[1], "rb");
+  
+  if (!file) {
+    fprintf(stderr, "failed to open %s for reading\n", argv[1]);
+    return 1;
+  }
+
+	/*
+	configure the event callbacks (not required)
+	setting of each callback is optionnal
+	*/
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = info_callback;
+
+	/* get a MJ2 decompressor handle */
+	dinfo = mj2_create_decompress();
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);		
+
+	/* setup the decoder decoding parameters using user parameters */
+	memset(&parameters, 0, sizeof(mj2_dparameters_t));
+	movie = (opj_mj2_t*) dinfo->mj2_handle;
+	mj2_setup_decoder(movie, &parameters);
+
+  if (mj2_read_struct(file, movie)) /* Creating the movie structure*/
+    return 1;
+
+  /* Decode first video track */
+  tnum = 0;
+  while (movie->tk[tnum].track_type != 0)
+    tnum ++;
+
+  track = &movie->tk[tnum];
+
+  fprintf(stdout,"Extracting %d frames from file...\n",track->num_samples);
+
+  for (snum=0; snum < track->num_samples; snum++)
+  {
+    sample = &track->sample[snum];
+    frame_codestream = (unsigned char*) malloc (sample->sample_size-8); /* Skipping JP2C marker*/
+    fseek(file,sample->offset+8,SEEK_SET);
+    fread(frame_codestream,sample->sample_size-8,1, file);  /* Assuming that jp and ftyp markers size do*/
+
+    sprintf(outfilename,"%s_%05d.j2k",argv[2],snum);
+    outfile = fopen(outfilename, "wb");
+    if (!outfile) {
+      fprintf(stderr, "failed to open %s for writing\n",outfilename);
+      return 1;
+    }
+    fwrite(frame_codestream,sample->sample_size-8,1,outfile);
+    fclose(outfile);
+    free(frame_codestream);
+    }
+  fclose(file);
+  fprintf(stdout, "%d frames correctly extracted\n", snum);
+	
+	/* free remaining structures */
+	if(dinfo) {
+		mj2_destroy_decompress((opj_mj2_t*)dinfo->mj2_handle);
+	}
+	
+  return 0;
+}
diff --git a/src/bin/mj2/frames_to_mj2.c b/src/bin/mj2/frames_to_mj2.c
new file mode 100644
index 00000000..dff34ab7
--- /dev/null
+++ b/src/bin/mj2/frames_to_mj2.c
@@ -0,0 +1,843 @@
+/*
+* Copyright (c) 2003-2004, Francois-Olivier Devaux
+* Copyright (c) 2002-2004,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. 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.
+*
+* 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 OWNER 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.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "openjpeg.h"
+#include "j2k_lib.h"
+#include "cio.h"
+#include "j2k.h"
+#include "jp2.h"
+#include "mj2.h"
+#include "mj2_convert.h"
+#include "opj_getopt.h"
+
+/**
+Size of memory first allocated for MOOV box
+*/
+#define TEMP_BUF 10000 
+
+#define ENUMCS_GRAY 16
+#define ENUMCS_SRGB 17
+#define ENUMCS_SYCC 18
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting a FILE* client object
+*/
+void info_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+void help_display()
+{
+  fprintf(stdout,"HELP for frames_to_mj2\n----\n\n");
+  fprintf(stdout,"- the -h option displays this help information on screen\n\n");
+  
+  
+  fprintf(stdout,"List of parameters for the MJ2 encoder:\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"REMARKS:\n");
+  fprintf(stdout,"---------\n");
+  fprintf(stdout,"\n");
+  fprintf
+    (stdout,"The markers written to the main_header are : SOC SIZ COD QCD COM.\n");
+  fprintf
+    (stdout,"COD and QCD never appear in the tile_header.\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"By default:\n");
+  fprintf(stdout,"------------\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout," * Lossless\n");
+  fprintf(stdout," * 1 tile\n");
+  fprintf(stdout," * Size of precinct : 2^15 x 2^15 (means 1 precinct)\n");
+  fprintf(stdout," * Size of code-block : 64 x 64\n");
+  fprintf(stdout," * Number of resolutions: 6\n");
+  fprintf(stdout," * No SOP marker in the codestream\n");
+  fprintf(stdout," * No EPH marker in the codestream\n");
+  fprintf(stdout," * No sub-sampling in x or y direction\n");
+  fprintf(stdout," * No mode switch activated\n");
+  fprintf(stdout," * Progression order: LRCP\n");
+  fprintf(stdout," * No index file\n");
+  fprintf(stdout," * No ROI upshifted\n");
+  fprintf(stdout," * No offset of the origin of the image\n");
+  fprintf(stdout," * No offset of the origin of the tiles\n");
+  fprintf(stdout," * Reversible DWT 5-3\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"Parameters:\n");
+  fprintf(stdout,"------------\n");
+  fprintf(stdout,"\n");
+  fprintf
+    (stdout,"Required Parameters (except with -h):\n");
+  fprintf
+    (stdout,"-i : source file      (-i source.yuv) \n");
+  fprintf
+    (stdout,"-o : destination file (-o dest.mj2) \n");
+  fprintf
+    (stdout,"Optional Parameters:\n");
+  fprintf(stdout,"-h : display the help information \n");
+  fprintf(stdout,"-r : different compression ratios for successive layers (-r 20,10,5)\n");
+  fprintf(stdout,"     - The rate specified for each quality level is the desired \n");
+  fprintf(stdout,"       compression factor.\n");
+  fprintf(stdout,"       Example: -r 20,10,1 means quality 1: compress 20x, \n");
+  fprintf(stdout,"       quality 2: compress 10x and quality 3: compress lossless\n");
+  fprintf(stdout,"       (options -r and -q cannot be used together)\n");
+  
+  fprintf(stdout,"-q : different psnr for successive layers (-q 30,40,50) \n");
+  fprintf(stdout,"        (options -r and -q cannot be used together)\n");
+  
+  fprintf(stdout,"-n : number of resolutions (-n 3) \n");
+  fprintf(stdout,"-b : size of code block (-b 32,32) \n");
+  fprintf(stdout,"-c : size of precinct (-c 128,128) \n");
+  fprintf(stdout,"-t : size of tile (-t 512,512) \n");
+  fprintf
+    (stdout,"-p : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] \n");
+  fprintf
+    (stdout,"-s : subsampling factor (-s 2,2) [-s X,Y] \n");
+  fprintf(stdout,"     Remark: subsampling bigger than 2 can produce error\n");
+  fprintf
+    (stdout,"-S : write SOP marker before each packet \n");
+  fprintf
+    (stdout,"-E : write EPH marker after each header packet \n");
+  fprintf
+    (stdout,"-M : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)\n");
+  fprintf
+    (stdout,"             8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] \n");
+  fprintf
+    (stdout,"             Indicate multiple modes by adding their values. \n");
+  fprintf
+    (stdout,"             Example: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
+  fprintf
+    (stdout,"-R : c=%%d,U=%%d : quantization indices upshifted \n");
+  fprintf
+    (stdout,"             for component c=%%d [%%d = 0,1,2]\n");
+  fprintf
+    (stdout,"             with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI:c=0,U=25) \n");
+  fprintf
+    (stdout,"-d : offset of the origin of the image (-d 150,300) \n");
+  fprintf
+    (stdout,"-T : offset of the origin of the tiles (-T 100,75) \n");
+  fprintf(stdout,"-I : use the irreversible DWT 9-7 (-I) \n");
+  fprintf(stdout,"-W : image width, height and the dx and dy subsampling \n");
+  fprintf(stdout,"        of the Cb and Cr components for YUV files \n");
+  fprintf(stdout,"        (default is '352,288,2,2' for CIF format's 352x288 and 4:2:0)\n");
+  fprintf(stdout,"-F : video frame rate (set to 25 by default)\n");
+  fprintf(stdout,"-D : depth, precision in bits [8 .. 16]; default:8\n");
+  fprintf(stdout,"-C : comment\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"IMPORTANT:\n");
+  fprintf(stdout,"-----------\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"The index file has the structure below:\n");
+  fprintf(stdout,"---------------------------------------\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"Image_height Image_width\n");
+  fprintf(stdout,"progression order\n");
+  fprintf(stdout,"Tiles_size_X Tiles_size_Y\n");
+  fprintf(stdout,"Components_nb\n");
+  fprintf(stdout,"Layers_nb\n");
+  fprintf(stdout,"decomposition_levels\n");
+  fprintf(stdout,"[Precincts_size_X_res_Nr Precincts_size_Y_res_Nr]...\n");
+  fprintf(stdout,"   [Precincts_size_X_res_0 Precincts_size_Y_res_0]\n");
+  fprintf(stdout,"Main_header_end_position\n");
+  fprintf(stdout,"Codestream_size\n");
+  fprintf(stdout,"Tile_0 start_pos end_Theader end_pos TotalDisto NumPix MaxMSE\n");
+  fprintf(stdout,"Tile_1   ''           ''        ''        ''       ''    ''\n");
+  fprintf(stdout,"...\n");
+  fprintf(stdout,"Tile_Nt   ''           ''        ''        ''       ''    ''\n");
+  fprintf(stdout,"Tpacket_0 Tile layer res. comp. prec. start_pos end_pos disto\n");
+  fprintf(stdout,"...\n");
+  fprintf(stdout,"Tpacket_Np ''   ''    ''   ''    ''       ''       ''     ''\n");
+  
+  fprintf(stdout,"MaxDisto\n");
+  
+  fprintf(stdout,"TotalDisto\n\n");
+}
+
+OPJ_PROG_ORDER give_progression(char progression[5])
+{
+  if (progression[0] == 'L' && progression[1] == 'R'
+    && progression[2] == 'C' && progression[3] == 'P') {
+    return LRCP;
+  } else {
+    if (progression[0] == 'R' && progression[1] == 'L'
+      && progression[2] == 'C' && progression[3] == 'P') {
+      return RLCP;
+    } else {
+      if (progression[0] == 'R' && progression[1] == 'P'
+				&& progression[2] == 'C' && progression[3] == 'L') {
+				return RPCL;
+      } else {
+				if (progression[0] == 'P' && progression[1] == 'C'
+					&& progression[2] == 'R' && progression[3] == 'L') {
+					return PCRL;
+				} else {
+					if (progression[0] == 'C' && progression[1] == 'P'
+						&& progression[2] == 'R' && progression[3] == 'L') {
+						return CPRL;
+					} else {
+						return PROG_UNKNOWN;
+					}
+				}
+      }
+    }
+  }
+}
+
+
+
+
+int main(int argc, char **argv)
+{
+	mj2_cparameters_t mj2_parameters;	/* MJ2 compression parameters */
+	opj_cparameters_t *j2k_parameters;	/* J2K compression parameters */
+	opj_event_mgr_t event_mgr;		/* event manager */
+	opj_cio_t *cio;
+	int value;
+	opj_mj2_t *movie;
+	opj_image_t *img;
+	int i, j;
+	char *s, S1, S2, S3;
+	unsigned char *buf;
+	int x1, y1,  len;
+	long mdat_initpos, offset;
+	FILE *mj2file;
+	int sampleno;  
+	opj_cinfo_t* cinfo;
+	opj_bool bSuccess;
+	int numframes;
+	int prec = 8;/* DEFAULT */
+	double total_time = 0;	
+
+	memset(&mj2_parameters, 0, sizeof(mj2_cparameters_t));
+  /* default value */
+  /* ------------- */
+	mj2_parameters.w = 352;			// CIF default value
+	mj2_parameters.h = 288;			// CIF default value
+	mj2_parameters.CbCr_subsampling_dx = 2;	// CIF default value
+	mj2_parameters.CbCr_subsampling_dy = 2;	// CIF default value
+	mj2_parameters.frame_rate = 25;
+	mj2_parameters.prec = 8; /* DEFAULT */
+	mj2_parameters.enumcs = ENUMCS_SYCC; /* FIXME: ENUMCS_YUV420 */
+	mj2_parameters.meth = 1; /* enumerated color space */
+
+/*
+	configure the event callbacks (not required)
+	setting of each callback is optionnal
+*/
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = NULL;
+    
+	/* set J2K encoding parameters to default values */
+	opj_set_default_encoder_parameters(&mj2_parameters.j2k_parameters);
+	j2k_parameters = &mj2_parameters.j2k_parameters;
+
+	/* Create comment for codestream */
+	if(j2k_parameters->cp_comment == NULL) {
+    const char comment[] = "Created by OpenJPEG version ";
+		const size_t clen = strlen(comment);
+    const char *version = opj_version();
+		j2k_parameters->cp_comment = (char*)malloc(clen+strlen(version)+1);
+		sprintf(j2k_parameters->cp_comment,"%s%s", comment, version);
+	}
+
+  while (1) {
+    int c = opj_getopt(argc, argv,
+      "i:o:r:q:f:t:n:c:b:p:s:d:P:S:E:M:R:T:C:I:W:F:D:h");
+    if (c == -1)
+      break;
+    switch (c) {
+    case 'i':			/* IN fill */
+			{
+				char *infile = opj_optarg;
+				s = opj_optarg;
+				while (*s) {
+					s++;
+				}
+				s--;
+				S3 = *s;
+				s--;
+				S2 = *s;
+				s--;
+				S1 = *s;
+				
+				if ((S1 == 'y' && S2 == 'u' && S3 == 'v')
+					|| (S1 == 'Y' && S2 == 'U' && S3 == 'V')) {
+					mj2_parameters.decod_format = YUV_DFMT;				
+				}
+				else {
+					fprintf(stderr,
+						"!! Unrecognized format for infile : %c%c%c [accept only *.yuv] !!\n\n",
+						S1, S2, S3);
+					return 1;
+				}
+				strncpy(mj2_parameters.infile, infile, sizeof(mj2_parameters.infile)-1);
+			}
+      break;
+      /* ----------------------------------------------------- */
+    case 'o':			/* OUT fill */
+			{
+				char *outfile = opj_optarg;
+				while (*outfile) {
+					outfile++;
+				}
+				outfile--;
+				S3 = *outfile;
+				outfile--;
+				S2 = *outfile;
+				outfile--;
+				S1 = *outfile;
+				
+				outfile = opj_optarg;
+				
+				if ((S1 == 'm' && S2 == 'j' && S3 == '2')
+					|| (S1 == 'M' && S2 == 'J' && S3 == '2'))
+					mj2_parameters.cod_format = MJ2_CFMT;
+				else {
+					fprintf(stderr,
+						"Unknown output format image *.%c%c%c [only *.mj2]!! \n",
+						S1, S2, S3);
+					return 1;
+				}
+				strncpy(mj2_parameters.outfile, outfile, sizeof(mj2_parameters.outfile)-1);      
+      }
+      break;
+      /* ----------------------------------------------------- */
+    case 'r':			/* rates rates/distorsion */
+			{
+				float rate;
+				s = opj_optarg;
+				while (sscanf(s, "%f", &rate) == 1) {
+					j2k_parameters->tcp_rates[j2k_parameters->tcp_numlayers] = rate * 2;
+					j2k_parameters->tcp_numlayers++;
+					while (*s && *s != ',') {
+						s++;
+					}
+					if (!*s)
+						break;
+					s++;
+				}
+				j2k_parameters->cp_disto_alloc = 1;
+			}
+      break;
+      /* ----------------------------------------------------- */
+    case 'q':			/* add fixed_quality */
+      s = opj_optarg;
+			while (sscanf(s, "%f", &j2k_parameters->tcp_distoratio[j2k_parameters->tcp_numlayers]) == 1) {
+				j2k_parameters->tcp_numlayers++;
+				while (*s && *s != ',') {
+					s++;
+				}
+				if (!*s)
+					break;
+				s++;
+			}
+			j2k_parameters->cp_fixed_quality = 1;
+      break;
+      /* dda */
+      /* ----------------------------------------------------- */
+    case 'f':			/* mod fixed_quality (before : -q) */
+			{
+				int *row = NULL, *col = NULL;
+				int numlayers = 0, numresolution = 0, matrix_width = 0;
+				
+				s = opj_optarg;
+				sscanf(s, "%d", &numlayers);
+				s++;
+				if (numlayers > 9)
+					s++;
+				
+				j2k_parameters->tcp_numlayers = numlayers;
+				numresolution = j2k_parameters->numresolution;
+				matrix_width = numresolution * 3;
+				j2k_parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int));
+				s = s + 2;
+				
+				for (i = 0; i < numlayers; i++) {
+					row = &j2k_parameters->cp_matrice[i * matrix_width];
+					col = row;
+					j2k_parameters->tcp_rates[i] = 1;
+					sscanf(s, "%d,", &col[0]);
+					s += 2;
+					if (col[0] > 9)
+						s++;
+					col[1] = 0;
+					col[2] = 0;
+					for (j = 1; j < numresolution; j++) {
+						col += 3;
+						sscanf(s, "%d,%d,%d", &col[0], &col[1], &col[2]);
+						s += 6;
+						if (col[0] > 9)
+							s++;
+						if (col[1] > 9)
+							s++;
+						if (col[2] > 9)
+							s++;
+					}
+					if (i < numlayers - 1)
+						s++;
+				}
+				j2k_parameters->cp_fixed_alloc = 1;
+			}
+			break;
+      /* ----------------------------------------------------- */
+    case 't':			/* tiles */
+      sscanf(opj_optarg, "%d,%d", &j2k_parameters->cp_tdx, &j2k_parameters->cp_tdy);
+			j2k_parameters->tile_size_on = OPJ_TRUE;
+      break;
+      /* ----------------------------------------------------- */
+    case 'n':			/* resolution */
+      sscanf(opj_optarg, "%d", &j2k_parameters->numresolution);
+      break;
+      /* ----------------------------------------------------- */
+    case 'c':			/* precinct dimension */
+			{
+				char sep;
+				int res_spec = 0;
+
+				char *s = opj_optarg;
+				do {
+					sep = 0;
+					sscanf(s, "[%d,%d]%c", &j2k_parameters->prcw_init[res_spec],
+                                 &j2k_parameters->prch_init[res_spec], &sep);
+					j2k_parameters->csty |= 0x01;
+					res_spec++;
+					s = strpbrk(s, "]") + 2;
+				}
+				while (sep == ',');
+				j2k_parameters->res_spec = res_spec;
+			}
+			break;
+
+      /* ----------------------------------------------------- */
+    case 'b':			/* code-block dimension */
+			{
+				int cblockw_init = 0, cblockh_init = 0;
+				sscanf(opj_optarg, "%d,%d", &cblockw_init, &cblockh_init);
+				if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
+					|| cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
+					fprintf(stderr,
+						"!! Size of code_block error (option -b) !!\n\nRestriction :\n"
+            "    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
+					return 1;
+				}
+				j2k_parameters->cblockw_init = cblockw_init;
+				j2k_parameters->cblockh_init = cblockh_init;
+			}
+			break;
+      /* ----------------------------------------------------- */
+    case 'p':			/* progression order */
+			{
+				char progression[5];
+				
+				strncpy(progression, opj_optarg, 5);
+				j2k_parameters->prog_order = give_progression(progression);
+				if (j2k_parameters->prog_order == -1) {
+					fprintf(stderr, "Unrecognized progression order "
+            "[LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
+					return 1;
+				}
+			}
+			break;
+      /* ----------------------------------------------------- */
+    case 's':			/* subsampling factor */
+      {
+				if (sscanf(opj_optarg, "%d,%d", &j2k_parameters->subsampling_dx,
+                                    &j2k_parameters->subsampling_dy) != 2) {
+					fprintf(stderr,	"'-s' sub-sampling argument error !  [-s dx,dy]\n");
+					return 1;
+				}
+			}
+			break;
+      /* ----------------------------------------------------- */
+    case 'd':			/* coordonnate of the reference grid */
+      {
+				if (sscanf(opj_optarg, "%d,%d", &j2k_parameters->image_offset_x0,
+                                    &j2k_parameters->image_offset_y0) != 2) {
+					fprintf(stderr,	"-d 'coordonnate of the reference grid' argument "
+            "error !! [-d x0,y0]\n");
+					return 1;
+				}
+			}
+			break;
+      /* ----------------------------------------------------- */
+    case 'h':			/* Display an help description */
+      help_display();
+      return 0;
+      break;
+      /* ----------------------------------------------------- */
+    case 'P':			/* POC */
+      {
+				int numpocs = 0;		/* number of progression order change (POC) default 0 */
+				opj_poc_t *POC = NULL;	/* POC : used in case of Progression order change */
+
+				char *s = opj_optarg;
+				POC = j2k_parameters->POC;
+
+				while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%4s", &POC[numpocs].tile,
+					&POC[numpocs].resno0, &POC[numpocs].compno0,
+					&POC[numpocs].layno1, &POC[numpocs].resno1,
+					&POC[numpocs].compno1, POC[numpocs].progorder) == 7) {
+					POC[numpocs].prg1 = give_progression(POC[numpocs].progorder);
+					numpocs++;
+					while (*s && *s != '/') {
+						s++;
+					}
+					if (!*s) {
+						break;
+					}
+					s++;
+				}
+				j2k_parameters->numpocs = numpocs;
+			}
+			break;
+      /* ------------------------------------------------------ */
+    case 'S':			/* SOP marker */
+      j2k_parameters->csty |= 0x02;
+      break;
+      /* ------------------------------------------------------ */
+    case 'E':			/* EPH marker */
+      j2k_parameters->csty |= 0x04;
+      break;
+      /* ------------------------------------------------------ */
+    case 'M':			/* Mode switch pas tous au point !! */
+      if (sscanf(opj_optarg, "%d", &value) == 1) {
+				for (i = 0; i <= 5; i++) {
+					int cache = value & (1 << i);
+					if (cache)
+						j2k_parameters->mode |= (1 << i);
+				}
+      }
+      break;
+      /* ------------------------------------------------------ */
+    case 'R':			/* ROI */
+      {
+				if (sscanf(opj_optarg, "OI:c=%d,U=%d", &j2k_parameters->roi_compno,
+                                           &j2k_parameters->roi_shift) != 2) {
+					fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n");
+					return 1;
+				}
+			}
+			break;
+      /* ------------------------------------------------------ */
+    case 'T':			/* Tile offset */
+			{
+				if (sscanf(opj_optarg, "%d,%d", &j2k_parameters->cp_tx0, &j2k_parameters->cp_ty0) != 2) {
+					fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]");
+					return 1;
+				}
+			}
+			break;
+      /* ------------------------------------------------------ */
+    case 'C':			/* Add a comment */
+			{
+				j2k_parameters->cp_comment = (char*)malloc(strlen(opj_optarg) + 1);
+				if(j2k_parameters->cp_comment) {
+					strcpy(j2k_parameters->cp_comment, opj_optarg);
+				}
+			}
+			break;
+      /* ------------------------------------------------------ */
+    case 'I':			/* reversible or not */
+			{
+				j2k_parameters->irreversible = 1;
+			}
+			break;
+      /* ------------------------------------------------------ */
+    case 'W':			/* Width and Height and Cb and Cr subsampling in case of YUV format files */
+      if (sscanf
+				(opj_optarg, "%d,%d,%d,%d", &mj2_parameters.w, &mj2_parameters.h, &mj2_parameters.CbCr_subsampling_dx,
+				&mj2_parameters.CbCr_subsampling_dy) != 4) {
+				fprintf(stderr, "-W argument error");
+				return 1;
+      }
+      break;
+      /* ------------------------------------------------------ */
+    case 'F':			/* Video frame rate */
+      if (sscanf(opj_optarg, "%d", &mj2_parameters.frame_rate) != 1) {
+				fprintf(stderr, "-F argument error");
+				return 1;
+      }
+      break;
+      /* ------------------------------------------------------ */
+	case 'D': /* Depth: the precision */
+		if(sscanf(opj_optarg, "%d", &prec) != 1) prec = 0;
+		break;
+
+    default:
+      return 1;
+    }
+  }
+    
+  /* Error messages */
+  /* -------------- */
+	if (!mj2_parameters.cod_format || !mj2_parameters.decod_format) {
+    fprintf(stderr,
+      "Usage: %s -i yuv-file -o mj2-file (+ options)\n",argv[0]);
+    return 1;
+  }
+    if(prec < 1 || prec > 16)
+  {
+	fprintf(stderr, "Error: Depth %d must be in the range 8 .. 16\n",prec);
+	return 1;	
+  }
+	if ((j2k_parameters->cp_disto_alloc || j2k_parameters->cp_fixed_alloc || j2k_parameters->cp_fixed_quality)
+		&& (!(j2k_parameters->cp_disto_alloc ^ j2k_parameters->cp_fixed_alloc ^ j2k_parameters->cp_fixed_quality))) {
+		fprintf(stderr, "Error: options -r -q and -f cannot be used together !!\n");
+		return 1;
+	}				/* mod fixed_quality */
+
+	/* if no rate entered, lossless by default */
+	if (j2k_parameters->tcp_numlayers == 0) {
+		j2k_parameters->tcp_rates[0] = 0;	/* MOD antonin : losslessbug */
+		j2k_parameters->tcp_numlayers++;
+		j2k_parameters->cp_disto_alloc = 1;
+	}
+
+	if((j2k_parameters->cp_tx0 > j2k_parameters->image_offset_x0) || (j2k_parameters->cp_ty0 > j2k_parameters->image_offset_y0)) {
+		fprintf(stderr,
+			"Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
+			j2k_parameters->cp_tx0, j2k_parameters->image_offset_x0, j2k_parameters->cp_ty0, j2k_parameters->image_offset_y0);
+		return 1;
+	}
+
+	for (i = 0; i < j2k_parameters->numpocs; i++) {
+		if (j2k_parameters->POC[i].prg == -1) {
+			fprintf(stderr,
+				"Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
+				i + 1);
+		}
+	}
+  
+  if (j2k_parameters->cp_tdx > mj2_parameters.Dim[0] || j2k_parameters->cp_tdy > mj2_parameters.Dim[1]) {
+    fprintf(stderr,
+      "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
+      j2k_parameters->cp_tdx, mj2_parameters.Dim[0], j2k_parameters->cp_tdy, mj2_parameters.Dim[1]);
+    return 1;
+  }
+    
+  /* to respect profile - 0 */
+  /* ---------------------- */
+  
+  x1 = !mj2_parameters.Dim[0] ? (mj2_parameters.w - 1) * j2k_parameters->subsampling_dx 
+		+ 1 : mj2_parameters.Dim[0] + (mj2_parameters.w - 1) * j2k_parameters->subsampling_dx + 1;
+  y1 = !mj2_parameters.Dim[1] ? (mj2_parameters.h - 1) * j2k_parameters->subsampling_dy 
+		+ 1 : mj2_parameters.Dim[1] + (mj2_parameters.h - 1) * j2k_parameters->subsampling_dy + 1;   
+	mj2_parameters.numcomps = 3; /* YUV files only have 3 components */ 
+
+	mj2_parameters.prec = prec;
+
+	j2k_parameters->tcp_mct = 0;
+    
+	mj2file = fopen(mj2_parameters.outfile, "wb");
+  
+	if (!mj2file) {
+    fprintf(stderr, "failed to open %s for writing\n", argv[2]);
+    return 1;
+	}
+    
+	/* get a MJ2 decompressor handle */
+	cinfo = mj2_create_compress();
+	movie = (opj_mj2_t*)cinfo->mj2_handle;
+	
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
+
+	/* setup encoder parameters */
+	mj2_setup_encoder(movie, &mj2_parameters);   
+  
+	movie->tk[0].num_samples = 
+	 yuv_num_frames(&movie->tk[0],mj2_parameters.infile);
+
+	if (movie->tk[0].num_samples == 0) {
+		return 1;
+	}
+
+  // One sample per chunk
+	movie->tk[0].chunk = (mj2_chunk_t*) 
+	 malloc(movie->tk[0].num_samples * sizeof(mj2_chunk_t));     
+	movie->tk[0].sample = (mj2_sample_t*) 
+	 malloc(movie->tk[0].num_samples * sizeof(mj2_sample_t));
+  
+	if (mj2_init_stdmovie(movie)) {
+    fprintf(stderr, "Error with movie initialization");
+    return 1;
+	}    
+  
+// Writing JP, FTYP and MDAT boxes 
+// Assuming that the JP and FTYP boxes won't be longer than 300 bytes:
+	buf = (unsigned char*) 
+	 malloc (300 * sizeof(unsigned char));
+
+	cio = opj_cio_open((opj_common_ptr)movie->cinfo, buf, 300);
+
+	mj2_write_jp(cio);
+	mj2_write_ftyp(movie, cio);
+
+	mdat_initpos = cio_tell(cio);
+	cio_skip(cio, 4);
+
+	cio_write(cio, MJ2_MDAT, 4);	
+
+	fwrite(buf,cio_tell(cio),1,mj2file);
+
+	offset = cio_tell(cio);
+	opj_cio_close(cio);
+	free(buf);
+
+	for(i = 0; i < movie->num_stk + movie->num_htk + movie->num_vtk; i++) 
+   {
+    if(movie->tk[i].track_type != 0) 
+  {
+	fprintf(stderr, "Unable to write sound or hint tracks\n");
+  }
+	else 
+  {
+	mj2_tk_t *tk;
+	int buflen = 0;
+  
+	tk = &movie->tk[i];     
+	tk->num_chunks = tk->num_samples;
+	numframes = tk->num_samples;
+	tk->depth = prec; 
+
+	fprintf(stderr, "Video Track number %d\n", i);
+
+	img = mj2_image_create(tk, j2k_parameters);          
+
+	buflen = 2 * (tk->w * tk->h * 8);
+	buf = (unsigned char *) malloc(buflen*sizeof(unsigned char));	
+
+	for(sampleno = 0; sampleno < numframes; sampleno++) 
+ {
+	double init_time = opj_clock();
+	double elapsed_time;
+
+		if(yuvtoimage(tk, img, sampleno, j2k_parameters, 
+			mj2_parameters.infile))
+	   {
+		fprintf(stderr, "Error with frame number %d in YUV file\n", sampleno);
+		return 1;
+	   }
+
+/* setup the encoder parameters using the current image and user parameters */
+	opj_setup_encoder(cinfo, j2k_parameters, img);
+
+	cio = opj_cio_open((opj_common_ptr)movie->cinfo, buf, buflen);
+								
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_JP2C, 4);	// JP2C
+
+/* encode the image */
+	bSuccess = opj_encode(cinfo, cio, img, NULL);
+
+	if (!bSuccess) {
+	opj_cio_close(cio);
+	fprintf(stderr, "failed to encode image\n");
+	return 1;
+	}
+
+	len = cio_tell(cio) - 8;
+	cio_seek(cio, 0);
+	cio_write(cio, len+8,4);
+	opj_cio_close(cio);
+
+	tk->sample[sampleno].sample_size = len+8;				
+	tk->sample[sampleno].offset = offset;
+	tk->chunk[sampleno].offset = offset;	// There is one sample per chunk 
+	fwrite(buf, 1, len+8, mj2file);				
+	offset += len+8;				
+
+	elapsed_time = opj_clock()-init_time;
+	fprintf(stderr, "Frame number %d/%d encoded in %.2f mseconds\n", 
+		sampleno + 1, numframes, elapsed_time*1000);
+	total_time += elapsed_time;
+ }	/* for(sampleno */
+
+	free(buf);
+	opj_image_destroy(img);
+  }
+   }/* for(i */
+  
+	fseek(mj2file, mdat_initpos, SEEK_SET);
+	
+	buf = (unsigned char*) malloc(4*sizeof(unsigned char));
+
+// Init a cio to write box length variable in a little endian way 
+	cio = opj_cio_open(NULL, buf, 4);
+	cio_write(cio, offset - mdat_initpos, 4);
+	fwrite(buf, 4, 1, mj2file);
+	fseek(mj2file,0,SEEK_END);
+	free(buf);
+
+// Writing MOOV box 
+	buf = (unsigned char*) 
+	 malloc ((TEMP_BUF+numframes*20) * sizeof(unsigned char));
+	cio = opj_cio_open(movie->cinfo, buf, (TEMP_BUF+numframes*20));
+	mj2_write_moov(movie, cio);
+	fwrite(buf,cio_tell(cio),1,mj2file);
+	free(buf);
+
+	fprintf(stdout,"Total encoding time: %.2f s for %d frames (%.1f fps)\n",
+	 total_time, numframes, (float)numframes/total_time);
+
+  // Ending program 
+  
+	fclose(mj2file);
+/* free remaining compression structures */
+	mj2_destroy_compress(movie);
+	free(cinfo);
+
+	if(j2k_parameters->cp_comment) free(j2k_parameters->cp_comment);
+	if(j2k_parameters->cp_matrice) free(j2k_parameters->cp_matrice);
+	opj_cio_close(cio);
+
+	return 0;
+}
diff --git a/src/bin/mj2/meta_out.c b/src/bin/mj2/meta_out.c
new file mode 100644
index 00000000..b6795045
--- /dev/null
+++ b/src/bin/mj2/meta_out.c
@@ -0,0 +1,2181 @@
+/* meta_out.c */
+/* Dump MJ2, JP2 metadata (partial so far) to xml file */
+/* Callable from mj2_to_metadata */
+/* Contributed to Open JPEG by Glenn Pearson, contract software developer, U.S. National Library of Medicine.
+
+The base code in this file was developed by the author as part of a video archiving
+project for the U.S. National Library of Medicine, Bethesda, MD. 
+It is the policy of NLM (and U.S. government) to not assert copyright.
+
+A non-exclusive copy of this code has been contributed to the Open JPEG project.
+Except for copyright, inclusion of the code within Open JPEG for distribution and use
+can be bound by the Open JPEG open-source license and disclaimer, expressed elsewhere.
+*/
+
+#include <windows.h> /* for time functions */
+
+#include "opj_includes.h"
+#include "mj2.h"
+
+#include <time.h>
+#include "meta_out.h"
+
+static BOOL notes = TRUE;
+static BOOL sampletables = FALSE;
+static BOOL raw = TRUE;
+static BOOL derived = TRUE;
+
+opj_tcp_t *j2k_default_tcp;
+
+/* Forwards */
+int xml_write_overall_header(FILE *file, FILE *xmlout, opj_mj2_t * movie, unsigned int sampleframe, opj_event_mgr_t *event_mgr);
+int xml_write_moov(FILE *file, FILE *xmlout, opj_mj2_t * movie, unsigned int sampleframe, opj_event_mgr_t *event_mgr);
+
+void uint_to_chars(unsigned int value, char* buf);
+
+void xml_write_trak(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum, unsigned int sampleframe, opj_event_mgr_t *event_mgr);
+void xml_write_tkhd(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum);
+void xml_write_udta(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum);
+void xml_write_mdia(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum);
+void xml_write_stbl(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum);
+
+void UnixTimeToFileTime(time_t t, LPFILETIME pft);
+void UnixTimeToSystemTime(time_t t, LPSYSTEMTIME pst);
+void xml_time_out(FILE* xmlout, time_t t);
+
+void int16_to_3packedchars(short int value, char* buf);
+
+void xml_write_moov_udta(FILE* xmlout, opj_mj2_t * movie);
+void xml_write_free_and_skip(FILE* xmlout, opj_mj2_t * movie);
+void xml_write_uuid(FILE* xmlout, opj_mj2_t * movie);
+
+int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int snum, opj_event_mgr_t *event_mgr);
+
+void xml_out_frame_siz(FILE* xmlout, opj_image_t *img, opj_cp_t *cp);
+void xml_out_frame_cod(FILE* xmlout, opj_tcp_t *tcp);
+void xml_out_frame_coc(FILE* xmlout, opj_tcp_t *tcp, int numcomps); /* opj_image_t *img); */
+BOOL same_component_style(opj_tccp_t *tccp1, opj_tccp_t *tccp2);
+void xml_out_frame_qcd(FILE* xmlout, opj_tcp_t *tcp);
+void xml_out_frame_qcc(FILE* xmlout, opj_tcp_t *tcp, int numcomps); /* opj_image_t *img); */
+BOOL same_component_quantization(opj_tccp_t *tccp1, opj_tccp_t *tccp2);
+void xml_out_frame_rgn(FILE* xmlout, opj_tcp_t *tcp, int numcomps);/* opj_image_t *img);*/
+void xml_out_frame_poc(FILE* xmlout, opj_tcp_t *tcp);
+void xml_out_frame_ppm(FILE* xmlout, opj_cp_t *cp);
+void xml_out_frame_ppt(FILE* xmlout, opj_tcp_t *tcp);
+void xml_out_frame_tlm(FILE* xmlout); /* j2k_default_tcp is passed globally */ /* NO-OP.  TLM NOT SAVED IN DATA STRUCTURE */
+void xml_out_frame_plm(FILE* xmlout); /* j2k_default_tcp is passed globally */ /* NO-OP.  PLM NOT SAVED IN DATA STRUCTURE.  opt in main; can be used in conjunction with PLT */
+void xml_out_frame_plt(FILE* xmlout, opj_tcp_t *tcp); /* NO-OP.  PLM NOT SAVED IN DATA STRUCTURE.  opt in main; can be used in conjunction with PLT */
+void xml_out_frame_crg(FILE* xmlout); /* j2k_default_tcp is passed globally */ /* opt in main; */
+void xml_out_frame_com(FILE* xmlout, opj_tcp_t *tcp); /* NO-OP.  COM NOT SAVED IN DATA STRUCTURE */ /* opt in main; */
+void xml_out_dump_hex(FILE* xmlout, char *data, int data_len, char* s);
+void xml_out_dump_hex_and_ascii(FILE* xmlout, char *data, int data_len, char* s);
+void xml_out_frame_jp2h(FILE* xmlout, opj_jp2_t *jp2_struct);
+#ifdef NOTYET
+/* Shown with cp, extended, as data structure... but it could be a new different one */
+void xml_out_frame_jp2i(FILE* xmlout, opj_cp_t *cp);/* IntellectualProperty 'jp2i' (no restrictions on location) */
+void xml_out_frame_xml(FILE* xmlout, opj_cp_t *cp); /* XML 'xml\040' (0x786d6c20).  Can appear multiply */
+void xml_out_frame_uuid(FILE* xmlout, opj_cp_t *cp); /* UUID 'uuid' (top level only) */
+void xml_out_frame_uinf(FILE* xmlout, opj_cp_t *cp); /* UUIDInfo 'uinf', includes UUIDList 'ulst' and URL 'url\40' */
+void xml_out_frame_unknown_type(FILE* xmlout, opj_cp_t *cp);
+#endif
+
+
+void xml_write_init(BOOL n, BOOL t, BOOL r, BOOL d)
+{
+  /* Init file globals */
+  notes = n;
+  sampletables = t;
+  raw = r;
+  derived = d;
+}
+
+int xml_write_struct(FILE* file, FILE *xmlout, opj_mj2_t * movie, unsigned int sampleframe, char* stringDTD, opj_event_mgr_t *event_mgr) {
+
+  if(stringDTD != NULL)
+  {
+    fprintf(xmlout,"<?xml version=\"1.0\" standalone=\"no\"?>\n");
+	/* stringDTD is known to start with "SYSTEM " or "PUBLIC " */
+	/* typical: SYSTEM mj2_to_metadata.dtd */
+	stringDTD[6] = '\0'; /* Break into two strings at space, so quotes can be inserted. */
+    fprintf(xmlout,"<!DOCTYPE MJ2_File %s \"%s\">\n", stringDTD, stringDTD+7); 
+	stringDTD[6] = ' '; /* restore for sake of debugger or memory allocator */
+  } else
+    fprintf(xmlout,"<?xml version=\"1.0\" standalone=\"yes\"?>\n");    
+
+  fprintf(xmlout, "<MJ2_File>\n");
+  xml_write_overall_header(file, xmlout, movie, sampleframe, event_mgr);
+  fprintf(xmlout, "</MJ2_File>");
+  return 0;
+}
+
+/* ------------- */
+
+int xml_write_overall_header(FILE *file, FILE *xmlout, opj_mj2_t * movie, unsigned int sampleframe, opj_event_mgr_t *event_mgr)
+{
+  int i;
+  char buf[5];
+  buf[4] = '\0';
+
+  fprintf(xmlout,   "  <JP2 BoxType=\"jP[space][space]\" Signature=\"0x0d0a870a\" />\n");
+  // Called after structure initialized by mj2_read_ftyp
+  fprintf(xmlout,   "  <FileType BoxType=\"ftyp\">\n");
+  uint_to_chars(movie->brand, buf);
+  fprintf(xmlout,   "    <Brand>%s</Brand>\n", buf);    /* 4 character; BR              */
+  fprintf(xmlout,   "    <MinorVersion>%u</MinorVersion>\n", movie->minversion);    /* 4 char; MinV            */
+  fprintf(xmlout,   "    <CompatibilityList Count=\"%d\">\n",movie->num_cl);
+  for (i = movie->num_cl - 1; i > -1; i--) /* read routine stored in reverse order, so let's undo damage */
+  {
+    uint_to_chars(movie->cl[i], buf);
+    fprintf(xmlout, "      <CompatibleBrand>%s</CompatibleBrand>\n", buf);    /*4 characters, each CLi */
+  }
+  fprintf(xmlout,   "    </CompatibilityList>\n");
+  fprintf(xmlout,   "  </FileType>\n");
+  xml_write_moov(file, xmlout, movie, sampleframe, event_mgr);
+  // To come?              <mdat>  // This is the container for media data that can also be accessed through track structures,
+                                   // so is redundant, and simply not of interest as metadata
+  //                       <moof>  // Allows incremental build up of movie.  Probably not in Simple Profile
+  xml_write_free_and_skip(xmlout, movie); /* NO OP so far */ /* May be a place where user squirrels metadata */
+  xml_write_uuid(xmlout, movie); /* NO OP so far */ /* May be a place where user squirrels metadata */
+  return 0;
+}
+
+/* ------------- */
+
+int xml_write_moov(FILE *file, FILE *xmlout, opj_mj2_t * movie, unsigned int sampleframe, opj_event_mgr_t *event_mgr)
+{
+  unsigned int tnum;
+  mj2_tk_t *track;
+
+  fprintf(xmlout,   "  <MovieBox BoxType=\"moov\">\n");
+  fprintf(xmlout,   "    <MovieHeader BoxType=\"mvhd\">\n");
+  fprintf(xmlout,   "      <CreationTime>\n");
+  if(raw)
+    fprintf(xmlout, "        <InSeconds>%u</InSeconds>\n", movie->creation_time);
+  if(notes)
+    fprintf(xmlout, "        <!-- Seconds since start of Jan. 1, 1904 UTC (Greenwich) -->\n");
+  /*  2082844800 = seconds between 1/1/04 and 1/1/70 */
+  /* There's still a time zone offset problem not solved... but spec is ambigous as to whether stored time
+     should be local or UTC */
+  if(derived) {
+    fprintf(xmlout, "        <AsLocalTime>"); 
+                             xml_time_out(xmlout, movie->creation_time - 2082844800);
+                                                     fprintf(xmlout,"</AsLocalTime>\n");
+  }
+  fprintf(xmlout,   "      </CreationTime>\n");
+  fprintf(xmlout,   "      <ModificationTime>\n");
+  if(raw)
+    fprintf(xmlout, "        <InSeconds>%u</InSeconds>\n", movie->modification_time);
+  if(derived) {
+    fprintf(xmlout, "        <AsLocalTime>"); 
+                             xml_time_out(xmlout, movie->modification_time - 2082844800);
+                                                     fprintf(xmlout,"</AsLocalTime>\n");
+  }
+  fprintf(xmlout,   "      </ModificationTime>\n");
+  fprintf(xmlout,   "      <Timescale>%d</Timescale>\n", movie->timescale);
+  if(notes)
+    fprintf(xmlout, "      <!-- Timescale defines time units in one second -->\n");
+  fprintf(xmlout,   "      <Rate>\n");        /* Rate to play presentation  (default = 0x00010000)          */
+  if(notes) {
+    fprintf(xmlout, "      <!-- Rate to play presentation is stored as fixed-point binary 16.16 value. Decimal value is approximation. -->\n");
+    fprintf(xmlout, "      <!-- Rate is expressed relative to normal (default) value of 0x00010000 (1.0) -->\n");
+  }
+  if(raw)
+    fprintf(xmlout, "        <AsHex>0x%08x</AsHex>\n", movie->rate);
+  if(derived)
+    fprintf(xmlout, "        <AsDecimal>%12.6f</AsDecimal>\n", (double)movie->rate/(double)0x00010000);
+  fprintf(xmlout,   "      </Rate>\n");
+  fprintf(xmlout,   "      <Duration>\n");
+  if(raw)
+    fprintf(xmlout, "        <InTimeUnits>%u</InTimeUnits>\n", movie->duration);
+  if(derived)
+    fprintf(xmlout, "        <InSeconds>%12.3f</InSeconds>\n", (double)movie->duration/(double)movie->timescale);    // Make this double later to get fractional seconds
+  fprintf(xmlout,   "      </Duration>\n");
+#ifdef CURRENTSTRUCT
+  movie->volume = movie->volume << 8;
+#endif
+  fprintf(xmlout,   "      <Volume>\n");
+  if(notes) {
+    fprintf(xmlout, "      <!-- Audio volume stored as fixed-point binary 8.8 value. Decimal value is approximation. -->\n");
+    fprintf(xmlout, "      <!-- Full, normal (default) value is 0x0100 (1.0) -->\n");
+  }
+  if(raw)
+    fprintf(xmlout, "        <AsHex>0x%04x</AsHex>\n", movie->volume);
+  if(derived)
+    fprintf(xmlout, "        <AsDecimal>%6.3f</AsDecimal>\n", (double)movie->volume/(double)0x0100);
+  fprintf(xmlout,   "      </Volume>\n");
+#ifdef CURRENTSTRUCT
+  if(notes)
+    fprintf(xmlout, "      <!-- Current m2j_to_metadata implementation always shows bits to right of decimal as zeroed. -->\n");
+  movie->volume = movie->volume >> 8;
+#endif
+  /* Transformation matrix for video                            */
+  fprintf(xmlout,   "      <TransformationMatrix>\n");
+  if(notes) {
+    fprintf(xmlout, "      <!-- 3 x 3 Video Transformation Matrix {a,b,u,c,d,v,x,y,w}.  Required: u=0, v=0, w=1 -->\n");
+    fprintf(xmlout, "      <!-- Maps decompressed point (p,q) to rendered point (ap + cq + x, bp + dq + y) -->\n");
+    fprintf(xmlout, "      <!-- Stored as Fixed Point Hex: all are binary 16.16, except u,v,w are 2.30 -->\n");
+    fprintf(xmlout, "      <!-- Unity = 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 -->\n");
+  }
+  fprintf(xmlout,   "        <TMa>0x%08x</TMa>\n", movie->trans_matrix[0]);    
+  fprintf(xmlout,   "        <TMb>0x%08x</TMb>\n", movie->trans_matrix[1]);    
+  fprintf(xmlout,   "        <TMu>0x%08x</TMu>\n", movie->trans_matrix[2]);    
+  fprintf(xmlout,   "        <TMc>0x%08x</TMc>\n", movie->trans_matrix[3]);    
+  fprintf(xmlout,   "        <TMd>0x%08x</TMd>\n", movie->trans_matrix[4]);    
+  fprintf(xmlout,   "        <TMv>0x%08x</TMv>\n", movie->trans_matrix[5]);    
+  fprintf(xmlout,   "        <TMx>0x%08x</TMx>\n", movie->trans_matrix[6]);    
+  fprintf(xmlout,   "        <TMy>0x%08x</TMy>\n", movie->trans_matrix[7]);    
+  fprintf(xmlout,   "        <TMw>0x%08x</TMw>\n", movie->trans_matrix[8]);
+  fprintf(xmlout,   "      </TransformationMatrix>\n");
+  fprintf(xmlout,   "    </MovieHeader>\n");
+  
+  fprintf(xmlout,   "    <Statistics>\n");
+  fprintf(xmlout,   "      <TracksFound>\n");
+  fprintf(xmlout,   "        <Video>%d</Video>\n", movie->num_vtk);
+  fprintf(xmlout,   "        <Audio>%d</Audio>\n", movie->num_stk);
+  fprintf(xmlout,   "        <Hint>%d</Hint>\n", movie->num_htk);
+  if(notes)
+    fprintf(xmlout, "        <!-- Hint tracks for streaming video are not part of MJ2, but are a defined extension. -->\n");
+  /* See Part 3 Amend 2 Section 4.2 for relation of MJ2 to Part 12 Sections 7 and 10 hints */
+  fprintf(xmlout,   "      </TracksFound>\n");
+  fprintf(xmlout,   "    </Statistics>\n");
+  /* Idea for the future:  It would be possible to add code to verify that the file values:
+    1) are legal and self-consistent
+	2) comply with particular JP2 and/or MJ2 profiles.
+	This could be reported here as additional XML elements */
+
+  // Find first video track 
+  tnum = 0;
+  while (movie->tk[tnum].track_type != 0)
+    tnum ++;
+
+  track = &(movie->tk[tnum]);
+  // For now, output info on first video track
+  xml_write_trak(file, xmlout, track, tnum, sampleframe, event_mgr);
+
+  // to come:                <MovieExtends mvek> // possibly not in Simple Profile
+  xml_write_moov_udta(xmlout, movie); /* NO OP so far */ /* <UserDataBox udta> contains <CopyrightBox cprt> */
+  fprintf(xmlout,   "  </MovieBox>\n");
+  return 0;
+}
+
+/* --------------- */
+
+void uint_to_chars(unsigned int value, char* buf)
+{
+	/* buf is at least char[5] */
+    int i;
+    for (i = 3; i >= 0; i--)
+    {
+        buf[i] = (value & 0x000000ff);
+        value = (value >> 8);
+    }
+	buf[4] = '\0'; /* Precautionary */
+}
+
+/* ------------- */
+
+/* WINDOWS SPECIFIC */
+
+void UnixTimeToFileTime(time_t t, LPFILETIME pft)
+{
+  /* Windows specific.  From MS Q167296 */
+  /* 'time_t' represents seconds since midnight January 1, 1970 UTC (coordinated universal time). */
+  /* 64-bit FILETIME structure represents the number of 100-nanosecond intervals since January 1, 1601 UTC (coordinate universal time). */
+  LONGLONG ll; /* LONGLONG is a 64-bit value. */
+  ll = Int32x32To64(t, 10000000) + 116444736000000000;
+  pft->dwLowDateTime = (DWORD)ll;
+  /* pft->dwLowDateTime = (DWORD)(0x00000000ffffffff & ll); */
+  pft->dwHighDateTime = (DWORD)(ll >> 32);
+} 
+// Once the UNIX time is converted to a FILETIME structure,
+// other Win32 time formats can be easily obtained by using Win32 functions such
+// as FileTimeToSystemTime() and FileTimeToDosDateTime().
+
+/* ------------- */
+
+void UnixTimeToSystemTime(time_t t, LPSYSTEMTIME pst)
+{
+  /* Windows specific */
+  FILETIME ft;
+  UnixTimeToFileTime(t, &ft);
+  FileTimeToLocalFileTime( &ft, &ft ); /* Adjust from UTC to local time zone */
+  FileTimeToSystemTime(&ft, pst);
+}
+
+/* ------------- */
+
+void xml_time_out(FILE* xmlout, time_t t)
+{
+  /* Windows specific */
+  SYSTEMTIME st;
+  char szLocalDate[255], szLocalTime[255];
+  UnixTimeToSystemTime( t, &st );
+  GetDateFormat( LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szLocalDate, 255 );
+  GetTimeFormat( LOCALE_USER_DEFAULT, 0, &st, NULL, szLocalTime, 255 );
+  fprintf(xmlout, "%s %s", szLocalDate, szLocalTime ); 
+}
+
+/* END WINDOWS SPECIFIC */
+
+/* ------------- */
+
+void xml_write_moov_udta(FILE* xmlout, opj_mj2_t * movie) {
+  /* Compare with xml_write_udta */
+#ifdef NOTYET
+  /* NO-OP so far.  Optional UserData 'udta' (zero or one in moov or each trak)
+     can contain multiple Copyright 'cprt' with different language codes */
+  /* There may be nested non-standard boxes within udta */
+  IMAGINE movie->udta, movie->copyright_count, movie->copyright_language[i] (array of 16bit ints), movie->copyright_notice[i] (array of buffers)
+  PROBABLY ALSO NEED movie->udta_len or special handler for non-standard boxes
+  char buf[5];
+  int i;
+
+  if(movie->udta != 1)
+	  return; /* Not present */
+
+  fprintf(xmlout,    "    <UserData BoxType=\"udta\">\n");
+  for(i = 0; i < movie->copyright_count; i++) {
+    fprintf(xmlout,  "      <Copyright BoxType=\"cprt\"> Instance=\"%d\">\n", i+1);
+    int16_to_3packedchars((short int)movie->copyright_languages[i], buf);
+    fprintf(xmlout,  "        <Language>%s</Language>\n", buf);    /* 3 chars */
+    fprintf(xmlout,  "        <Notice>%s</Notice>\n",movie->copyright_notices[i]);
+    fprintf(xmlout,  "      </Copyright>\n", i+1);
+  }
+  /* TO DO: Non-standard boxes */
+  fprintf(xmlout,    "    </UserData>\n");
+#endif
+}
+
+void xml_write_free_and_skip(FILE* xmlout, opj_mj2_t * movie) {
+#ifdef NOTYET
+  /* NO-OP so far.  There can be zero or more instances of free and/or skip
+     at the top level of the file.  This may be a place where the user squirrel's metadata.
+	 Let's assume unstructured, and do a dump */
+  IMAGINE movie->free_and_skip, movie->free_and_skip_count, movie->free_and_skip_content[i] (array of buffers),
+	  movie->free_and_skip_len[i] (array of ints), movie->is_skip[i] (array of BOOL)
+  int i;
+
+  if(movie->free_and_skip != 1)
+	  return; /* Not present */
+
+  for(i = 0; i < movie->free_and_skip_count; i++) {
+    if(movie->is_skip[i])
+      fprintf(xmlout,    "  <Skip BoxType=\"skip\">\n");
+	else
+      fprintf(xmlout,    "  <Free BoxType=\"free\">\n");
+
+    xml_out_dump_hex_and_ascii(xmlout, movie->free_and_skip_contents[i], movie->free_and_skip_len[i]);
+
+    if(movie->is_skip[i])
+      fprintf(xmlout,    "  </Skip>\n");
+	else
+      fprintf(xmlout,    "  </Free>\n");
+  }
+#endif
+}
+
+void xml_write_uuid(FILE* xmlout, opj_mj2_t * movie) {
+/* Univeral Unique IDs of 16 bytes.  */
+#ifdef NOTYET
+  /* NO-OP so far.  There can be zero or more instances of private uuid boxes in a file.
+     This function supports the top level of the file, but uuid may be elsewhere [not yet supported].
+	 This may be a place where the user squirrel's metadata.  Let's assume unstructured, and do a dump */
+  IMAGINE movie->uuid, movie->uuid_count, movie->uuid_content[i] (array of buffers),
+	  movie->uuid_len[i] (array of ints), movie->uuid_type[i] (array of 17-byte (16+null termination) buffers)
+  int i;
+
+  if(movie->uuid != 1)
+	  return; /* Not present */
+
+  for(i = 0; i < movie->uuid_count; i++) {
+    fprintf(xmlout,    "  <PrivateExtension BoxType=\"uuid\" UUID=\"%s\">\n", movie->uuid_type[i]);
+	// See Part III section 5.2.1, 6.1, 6.2
+    xml_out_dump_hex_and_ascii(xmlout, movie->uuid_contents[i], movie->uuid_len[i]);
+    fprintf(xmlout,    "  </PrivateExtension>\n");
+  }
+#endif
+}
+
+/* ------------- */
+
+void xml_write_trak(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum, unsigned int sampleframe, opj_event_mgr_t *event_mgr)
+{
+  fprintf(xmlout,    "    <Track BoxType=\"trak\" Instance=\"%d\">\n", tnum);
+  xml_write_tkhd(file, xmlout, track, tnum);
+  // TO DO: TrackReferenceContainer 'tref'  just used in hint track
+  // TO DO: EditListContainer 'edts', contains EditList 'elst' with media-time, segment-duration, media-rate
+  xml_write_mdia(file, xmlout, track, tnum);
+  xml_write_udta(file, xmlout, track, tnum); // NO-OP so far.  Optional UserData 'udta', can contain multiple Copyright 'cprt'
+
+  if(track->track_type==0) { /* Only do for visual track */
+	/* sampleframe is from user option -f.  1 = first frame */
+    /* sampleframe of 0 is a user requests: no jp2 header */
+	/* Treat out-of-bounds values in the same way */
+	if(sampleframe > 0 && sampleframe <= track->num_samples) 
+    {
+      mj2_sample_t *sample;
+      unsigned int snum;
+
+      snum = sampleframe-1;
+      // Someday maybe do a smart range scan... for (snum=0; snum < track->num_samples; snum++){
+      //  fprintf(stdout,"Frame %d: ",snum+1);
+      sample = &track->sample[snum];
+	  if(xml_out_frame(file, xmlout, sample, snum, event_mgr))
+	    return; /* Not great error handling here */
+    }
+  }
+  fprintf(xmlout,    "    </Track>\n");
+}
+
+/* ------------- */
+
+void xml_write_tkhd(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum)
+{
+  fprintf(xmlout,    "      <TrackHeader BoxType=\"tkhd\">\n");
+  if(notes) {
+    fprintf(xmlout,  "      <!-- Not shown here: CreationTime, ModificationTime, Duration. -->\n");
+    fprintf(xmlout,  "      <!-- These 3 fields are reported under MediaHeader below.   When reading these 3, -->\n");
+    fprintf(xmlout,  "      <!-- m2j_to_metadata currently doesn't distinguish between TrackHeader and MediaHeader source. -->\n");
+    fprintf(xmlout,  "      <!-- If both found, value read from MediaHeader is used. -->\n");
+  }
+  fprintf(xmlout,    "        <TrackID>%u</TrackID>\n", track->track_ID);
+  if(track->track_type==0) /* For visual track */
+  {
+    fprintf(xmlout,  "        <TrackLayer>%d</TrackLayer>\n", track->layer);
+    if(notes)
+      fprintf(xmlout,"        <!-- front-to-back ordering of video tracks. 0 = normal, -1 is closer, etc. -->\n");
+  }
+  if(track->track_type!=0) /* volume irrelevant for visual track */
+  {
+#ifdef CURRENTSTRUCT
+    track->volume = track->volume << 8;
+#endif
+    fprintf(xmlout,  "        <Volume>\n");
+	if(notes) {
+      fprintf(xmlout,"          <!-- Track audio volume stored as fixed-point binary 8.8 value. Decimal value is approximation. -->\n");
+      fprintf(xmlout,"          <!-- Full, normal (default) value is 0x0100 (1.0) -->\n");
+	}
+	if(raw)
+      fprintf(xmlout,"          <AsHex>0x%04x</AsHex>\n", track->volume);
+	if(derived)
+      fprintf(xmlout,"          <AsDecimal>%6.3f</AsDecimal>\n", (double)track->volume/(double)0x0100);
+    fprintf(xmlout,  "        </Volume>\n");
+#ifdef CURRENTSTRUCT
+  if(notes)
+    fprintf(xmlout,  "        <!-- Current m2j_to_metadata implementation always shows bits to right of decimal as zeroed. -->\n");
+	track->volume = track->volume >> 8;
+#endif
+  }
+  if(track->track_type==0)
+  {
+    /* Transformation matrix for video                            */
+    fprintf(xmlout,  "        <TransformationMatrix>\n");
+	if(notes) {
+      fprintf(xmlout,"          <!-- Comments about matrix in MovieHeader apply here as well. -->\n");
+      fprintf(xmlout,"          <!-- This matrix is applied before MovieHeader one. -->\n");
+	}
+    fprintf(xmlout,  "          <TMa>0x%08x</TMa>\n", track->trans_matrix[0]);    
+    fprintf(xmlout,  "          <TMb>0x%08x</TMb>\n", track->trans_matrix[1]);    
+    fprintf(xmlout,  "          <TMu>0x%08x</TMu>\n", track->trans_matrix[2]);    
+    fprintf(xmlout,  "          <TMc>0x%08x</TMc>\n", track->trans_matrix[3]);    
+    fprintf(xmlout,  "          <TMd>0x%08x</TMd>\n", track->trans_matrix[4]);    
+    fprintf(xmlout,  "          <TMv>0x%08x</TMv>\n", track->trans_matrix[5]);    
+    fprintf(xmlout,  "          <TMx>0x%08x</TMx>\n", track->trans_matrix[6]);    
+    fprintf(xmlout,  "          <TMy>0x%08x</TMy>\n", track->trans_matrix[7]);    
+    fprintf(xmlout,  "          <TMw>0x%08x</TMw>\n", track->trans_matrix[8]);
+    fprintf(xmlout,  "        </TransformationMatrix>\n");
+  }
+#ifdef CURRENTSTRUCT
+  track->w = track->w << 16;
+  track->h = track->h << 16;
+#endif
+  if(notes) {
+    fprintf(xmlout,  "        <!-- Width and Height in pixels are for the presentation; frames will be scaled to this. -->\n");
+    fprintf(xmlout,  "        <!-- Both stored as fixed-point binary 16.16 values. Decimal values are approximations. -->\n");
+  }
+  fprintf(xmlout,    "        <Width>\n");
+  if(raw)
+    fprintf(xmlout,  "          <AsHex>0x%08x</AsHex>\n", track->w);
+  if(derived)
+    fprintf(xmlout,  "          <AsDecimal>%12.6f</AsDecimal>\n", (double)track->w/(double)0x00010000);        /* Rate to play presentation  (default = 0x00010000)          */
+  fprintf(xmlout,    "        </Width>\n");
+  fprintf(xmlout,    "        <Height>\n");
+  if(raw)
+    fprintf(xmlout,  "          <AsHex>0x%08x</AsHex>\n", track->h);
+  if(derived)
+    fprintf(xmlout,  "          <AsDecimal>%12.6f</AsDecimal>\n", (double)track->h/(double)0x00010000);        /* Rate to play presentation  (default = 0x00010000)          */
+  fprintf(xmlout,    "        </Height>\n");
+#ifdef CURRENTSTRUCT
+  if(notes) {
+    fprintf(xmlout,  "        <!-- Current m2j_to_metadata implementation always shows bits to right of decimal as zeroed. -->\n");
+    fprintf(xmlout,  "        <!-- Also, width and height values shown here will actually be those read from track's <VisualSampleEntry> if given. -->\n");
+  }
+  track->w = track->w >> 16;
+  track->h = track->h >> 16;
+#endif
+  fprintf(xmlout,    "      </TrackHeader>\n");
+}
+
+/* ------------- */
+
+void xml_write_udta(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum) {
+  /* NO-OP so far.  Optional UserData 'udta' (zero or one in moov or each trak)
+     can contain multiple Copyright 'cprt' with different language codes */
+  /* There may be nested non-standard boxes within udta */
+#ifdef NOTYET
+  IMAGINE track->udta, track->copyright_count, track->copyright_language[i] (array of 16bit ints), track->copyright_notice[i] (array of buffers)
+  PROBABLY ALSO NEED track->udta_len or special handler for non-standard boxes
+  char buf[5];
+  int i;
+
+  if(track->udta != 1)
+	  return; /* Not present */
+
+  fprintf(xmlout,    "      <UserData BoxType=\"udta\">\n");
+  for(i = 0; i < track->copyright_count; i++) {
+    fprintf(xmlout,  "        <Copyright BoxType=\"cprt\"> Instance=\"%d\">\n", i+1);
+    int16_to_3packedchars((short int)track->copyright_languages[i], buf);
+    fprintf(xmlout,  "          <Language>%s</Language>\n", buf);    /* 3 chars */
+    fprintf(xmlout,  "          <Notice>%s</Notice>\n",track->copyright_notices[i]);
+    fprintf(xmlout,  "        </Copyright>\n", i+1);
+  }
+  /* TO DO: Non-standard boxes */
+  fprintf(xmlout,    "      </UserData>\n");
+#endif
+}
+
+/* ------------- */
+
+void xml_write_mdia(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum)
+{
+  char buf[5];
+  int i, k;
+  buf[4] = '\0';
+
+  fprintf(xmlout,    "      <Media BoxType=\"mdia\">\n");
+  fprintf(xmlout,    "        <MediaHeader BoxType=\"mdhd\">\n");
+  fprintf(xmlout,    "          <CreationTime>\n");
+  if(raw)
+    fprintf(xmlout,  "            <InSeconds>%u</InSeconds>\n", track->creation_time);
+  if(notes)
+    fprintf(xmlout,  "            <!-- Seconds since start of Jan. 1, 1904 UTC (Greenwich) -->\n");
+  /*  2082844800 = seconds between 1/1/04 and 1/1/70 */
+  /* There's still a time zone offset problem not solved... but spec is ambigous as to whether stored time
+     should be local or UTC */
+  if(derived) {
+    fprintf(xmlout,  "            <AsLocalTime>"); 
+                                xml_time_out(xmlout, track->creation_time - 2082844800);
+                                                     fprintf(xmlout,"</AsLocalTime>\n");
+  }
+  fprintf(xmlout,    "          </CreationTime>\n");
+  fprintf(xmlout,    "          <ModificationTime>\n");
+  if(raw)
+    fprintf(xmlout,  "            <InSeconds>%u</InSeconds>\n", track->modification_time);
+  if(derived) {
+    fprintf(xmlout,  "            <AsLocalTime>"); 
+                                xml_time_out(xmlout, track->modification_time - 2082844800);
+                                                     fprintf(xmlout,"</AsLocalTime>\n");
+  }
+  fprintf(xmlout,    "          </ModificationTime>\n");
+  fprintf(xmlout,    "          <Timescale>%d</Timescale>\n", track->timescale);
+  if(notes)
+    fprintf(xmlout,  "          <!-- Timescale defines time units in one second -->\n");
+  fprintf(xmlout,    "          <Duration>\n");
+  if(raw)
+    fprintf(xmlout,  "            <InTimeUnits>%u</InTimeUnits>\n", track->duration);
+  if(derived)
+    fprintf(xmlout,  "            <InSeconds>%12.3f</InSeconds>\n", (double)track->duration/(double)track->timescale);    // Make this double later to get fractional seconds
+  fprintf(xmlout,    "          </Duration>\n");
+  int16_to_3packedchars((short int)track->language, buf);
+  fprintf(xmlout,    "          <Language>%s</Language>\n", buf);    /* 3 chars */
+  fprintf(xmlout,    "        </MediaHeader>\n");
+  fprintf(xmlout,    "        <HandlerReference BoxType=\"hdlr\">\n");
+  switch(track->track_type)
+  {
+  case 0:
+    fprintf(xmlout,  "          <HandlerType Code=\"vide\">video media track</HandlerType>\n"); break;
+  case 1:
+    fprintf(xmlout,  "          <HandlerType Code=\"soun\">Sound</HandlerType>\n"); break;
+  case 2:
+    fprintf(xmlout,  "          <HandlerType Code=\"hint\">Hint</HandlerType>\n"); break;
+  }
+  if(notes) {
+    fprintf(xmlout,  "          <!-- String value shown is not actually read from file. -->\n");
+    fprintf(xmlout,  "          <!-- Shown value is one used for our encode. -->\n");
+  }
+  fprintf(xmlout,    "        </HandlerReference>\n");
+  fprintf(xmlout,    "        <MediaInfoContainer BoxType=\"minf\">\n");
+  switch(track->track_type)
+  {
+  case 0:
+    fprintf(xmlout,  "          <VideoMediaHeader BoxType=\"vmhd\">\n");
+    fprintf(xmlout,  "            <GraphicsMode>0x%02x</GraphicsMode>\n", track->graphicsmode);
+	if(notes) {
+      fprintf(xmlout,"            <!-- Enumerated values of graphics mode: -->\n");
+      fprintf(xmlout,"            <!--  0x00 = copy (over existing image); -->\n");
+      fprintf(xmlout,"            <!--  0x24 = transparent; 'blue-screen' this image using opcolor; -->\n");
+      fprintf(xmlout,"            <!--  0x100 = alpha; alpha-blend this image -->\n");
+/*    fprintf(xmlout,"            <!--  0x101 = whitealpha; alpha-blend this image, which has been blended with white; -->\n"); This was evidently dropped upon amendment */
+      fprintf(xmlout,"            <!--  0x102 = pre-multiplied black alpha; image has been already been alpha-blended with black. -->\n");
+      fprintf(xmlout,"            <!--  0x110 = component alpha; blend alpha channel(s) and color channels individually. -->\n");
+	}
+    fprintf(xmlout,  "            <Opcolor>\n");
+    fprintf(xmlout,  "              <Red>0x%02x</Red>\n", track->opcolor[0]);
+    fprintf(xmlout,  "              <Green>0x%02x</Green>\n",track->opcolor[1]);
+    fprintf(xmlout,  "              <Blue>0x%02x</Blue>\n",track->opcolor[2]);
+    fprintf(xmlout,  "            </Opcolor>\n");
+    fprintf(xmlout,  "          </VideoMediaHeader>\n");
+    break;
+  case 1:
+    fprintf(xmlout,  "          <SoundMediaHeader BoxType=\"smhd\">\n");
+#ifdef CURRENTSTRUCT
+	track->balance = track->balance << 8;
+#endif
+    fprintf(xmlout,  "            <Balance>\n");
+	if(notes) {
+      fprintf(xmlout,"              <!-- Track audio balance fixes mono track in stereo space. -->\n");
+      fprintf(xmlout,"              <!-- Stored as fixed-point binary 8.8 value. Decimal value is approximation. -->\n");
+      fprintf(xmlout,"              <!-- 0.0 = center, -1.0 = full left, 1.0 = full right -->\n");
+	}
+	if(raw)
+      fprintf(xmlout,"              <AsHex>0x%04x</AsHex>\n", track->balance);
+    if(derived)
+	  fprintf(xmlout,"              <AsDecimal>%6.3f</AsDecimal>\n", (double)track->balance/(double)0x0100);
+    fprintf(xmlout,  "            </Balance>\n");
+#ifdef CURRENTSTRUCT
+    if(notes)
+	  fprintf(xmlout,"            <!-- Current m2j_to_metadata implementation always shows bits to right of decimal as zeroed. -->\n");
+	track->balance = track->balance >> 8;
+#endif
+    fprintf(xmlout,  "          </SoundMediaHeader>\n");
+    break;
+  case 2:
+    fprintf(xmlout,  "          <HintMediaHeader BoxType=\"hmhd\">\n");
+    fprintf(xmlout,  "            <MaxPDU_Size>%d</MaxPDU_Size>\n", track->maxPDUsize);
+    if(notes)
+      fprintf(xmlout,"            <!-- Size in bytes of largest PDU in this hint stream. -->\n");
+    fprintf(xmlout,  "            <AvgPDU_Size>%d</AvgPDU_Size>\n", track->avgPDUsize);
+    if(notes)
+      fprintf(xmlout,"            <!-- Average size in bytes of a PDU over the entire presentation. -->\n");
+    fprintf(xmlout,  "            <MaxBitRate>%d</MaxBitRate>\n", track->maxbitrate);
+    if(notes)
+      fprintf(xmlout,"            <!-- Maximum rate in bits per second over any window of 1 second. -->\n");
+    fprintf(xmlout,  "            <AvgBitRate>%d</AvgBitRate>\n", track->avgbitrate);
+    if(notes)
+      fprintf(xmlout,"            <!-- Averate rate in bits per second over the entire presentation. -->\n");
+    fprintf(xmlout,  "            <SlidingAvgBit>%d</SlidingAvgBitRate>\n", track->slidingavgbitrate);
+    if(notes)
+      fprintf(xmlout,"            <!-- Maximum rate in bits per second over any window of one minute. -->\n");
+    fprintf(xmlout,  "          </HintMediaHeader>\n");
+    break;
+  }
+  fprintf(xmlout,    "          <DataInfo BoxType=\"dinf\">\n");
+  fprintf(xmlout,    "            <DataReference BoxType=\"dref\"  URL_Count=\"%d\" URN_Count=\"%d\">\n", track->num_url, track->num_urn); // table w. flags, URLs, URNs
+  // Data structure does not distinguish between single URL, single URN, or DREF table or URLs & URNs.
+  // We could infer those, but for now just present everything as a DREF table.
+  if(notes)
+    fprintf(xmlout,  "              <!-- No entries here mean that file is self-contained, as required by Simple Profile. -->\n");
+  for(k = 0; k < track->num_url; k++) {
+    fprintf(xmlout,  "            <DataEntryUrlBox BoxType=\"url[space]\">\n"); // table w. flags, URLs, URNs
+    if(notes)
+      fprintf(xmlout,"              <!-- Only the first 16 bytes of URL location are recorded in mj2_to_metadata data structure. -->\n");
+    for(i = 0; i < 4; i++) {
+      uint_to_chars(track->url[track->num_url].location[i], buf);
+    fprintf(xmlout,  "              <Location>%s</Location>\n");
+    }
+    fprintf(xmlout,  "            </DataEntryUrlBox>\n"); // table w. flags, URLs, URNs
+  }
+  for(k = 0; k < track->num_urn; k++) {
+    fprintf(xmlout,"            <DataEntryUrnBox BoxType=\"urn[space]\">\n"); // table w. flags, URLs, URNs
+    // Only the first 16 bytes are recorded in the data structure currently.
+    if(notes)
+      fprintf(xmlout,"              <!-- Only the first 16 bytes each of URN name and optional location are recorded in mj2_to_metadata data structure. -->\n");
+    fprintf(xmlout,  "              <Name>");
+    for(i = 0; i < 4; i++) {
+      uint_to_chars(track->urn[track->num_urn].name[i], buf);
+      fprintf(xmlout,"%s", buf);
+    }
+    fprintf(xmlout,  "</Name>\n");
+    fprintf(xmlout,  "              <Location>");
+    for(i = 0; i < 4; i++) {
+      uint_to_chars(track->urn[track->num_urn].location[i], buf);
+      fprintf(xmlout,"%s");
+    }
+    fprintf(xmlout,  "</Location>\n");
+    fprintf(xmlout,  "            </DataEntryUrnBox>\n");
+  }
+  fprintf(xmlout,    "            </DataReference>\n");
+  fprintf(xmlout,    "          </DataInfo>\n");
+
+  xml_write_stbl(file, xmlout, track, tnum); /* SampleTable */
+
+  fprintf(xmlout,    "        </MediaInfoContainer>\n");  
+  fprintf(xmlout,    "      </Media>\n");
+}
+
+/* ------------- */
+
+void xml_write_stbl(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum)
+{
+  char buf[5], buf33[33];
+  int i, len;
+  buf[4] = '\0';
+
+  fprintf(xmlout,      "          <SampleTable BoxType=\"stbl\">\n");
+  if(notes)
+    fprintf(xmlout,    "            <!-- What follows are specific instances of generic SampleDescription BoxType=\"stsd\" -->\n");
+  switch(track->track_type)
+  {
+  case 0:
+    // There could be multiple instances of this, but "entry_count" is just a local at read-time.
+    // And it's used wrong, too, as count of just visual type, when it's really all 3 types.
+    // This is referred to as "smj2" within mj2.c
+    fprintf(xmlout,    "            <VisualSampleEntry BoxType=\"mjp2\">\n");
+	if(notes) {
+      fprintf(xmlout,  "            <!-- If multiple instances of this box, only first is shown here. -->\n");
+	  fprintf(xmlout,  "            <!-- Width and Height are in pixels.  Unlike the Track Header, there is no fractional part. -->\n");
+	  fprintf(xmlout,  "            <!-- In mj2_to_metadata implementation, the values are not represented separately from Track Header's values. -->\n");
+	}
+	/* No shifting required.  If CURRENTSTRUCT gets changed, then may need to revisit treatment of these */
+    fprintf(xmlout,    "              <WidthAsInteger>%d</WidthAsInteger>\n", track->w);
+    fprintf(xmlout,    "              <HeightAsInteger>%d</HeightAsInteger>\n", track->h);
+// Horizresolution and vertresolution don't require shifting, already stored right in CURRENTSTRUCT
+    if(notes) {
+      fprintf(xmlout,  "              <!-- Resolutions are in pixels per inch, for the highest-resolution component (typically luminance). -->\n");
+      fprintf(xmlout,  "              <!-- Both stored as fixed-point binary 16.16 values. Decimal values are approximations. -->\n");
+      fprintf(xmlout,  "              <!-- Typical value for both resolutions is 0x00480000  (72.0) -->\n");
+	}
+    fprintf(xmlout,    "              <HorizontalRes>\n");
+	if(raw)
+      fprintf(xmlout,  "                <AsHex>0x%08x</AsHex>\n", track->horizresolution);
+	if(derived)
+      fprintf(xmlout,  "                <AsDecimal>%12.6f</AsDecimal>\n", (double)track->horizresolution/(double)0x00010000);        /* Rate to play presentation  (default = 0x00010000)          */
+    fprintf(xmlout,    "              </HorizontalRes>\n");
+    fprintf(xmlout,    "              <VerticalRes>\n");
+	if(raw)
+      fprintf(xmlout,  "                <AsHex>0x%08x</AsHex>\n", track->vertresolution);
+	if(derived)
+      fprintf(xmlout,  "                <AsDecimal>%12.6f</AsDecimal>\n", (double)track->vertresolution/(double)0x00010000);        /* Rate to play presentation  (default = 0x00010000)          */
+    fprintf(xmlout,    "              </VerticalRes>\n");
+
+    buf33[0] = '\0';
+    for(i = 0; i < 8; i++) {
+      uint_to_chars((unsigned int)track->compressorname[i], buf);
+      strcat(buf33, buf); /* This loads up (4 * 8) + 1 chars, but trailing ones are usually junk */
+    }
+    len = (int)buf33[0]; /* First byte has string length in bytes.  There may be garbage beyond it. */
+    buf33[len+1] = '\0'; /* Suppress it */
+    fprintf(xmlout,    "              <CompressorName>%s</CompressorName>\n", buf33+1); /* Start beyond first byte */
+	if(notes) {
+      fprintf(xmlout,  "              <!-- Compressor name for debugging.  Standard restricts max length to 31 bytes. -->\n");
+      fprintf(xmlout,  "              <!-- Usually blank or \"Motion JPEG2000\" -->\n");
+	}
+    fprintf(xmlout,    "              <Depth>0x%02x</Depth>\n",track->depth);
+	if(notes) {
+      fprintf(xmlout,  "              <!-- Depth is: -->\n");
+      fprintf(xmlout,  "              <!--   0x20: alpha channels present (color or grayscale) -->\n");
+      fprintf(xmlout,  "              <!--   0x28: grayscale without alpha -->\n");
+      fprintf(xmlout,  "              <!--   0x18: color without alpha -->\n");
+	}
+
+    xml_out_frame_jp2h(xmlout, &(track->jp2_struct));  /* JP2 Header */
+    
+  /* Following subboxes are optional */
+    fprintf(xmlout,    "              <FieldCoding BoxType=\"fiel\">\n");
+    fprintf(xmlout,    "                <FieldCount>%d</FieldCount>\n", (unsigned int)track->fieldcount); /* uchar as 1 byte uint */
+    if(notes)
+      fprintf(xmlout,  "                <!-- Must be either 1 or 2 -->\n");
+    fprintf(xmlout,    "                <FieldOrder>%d</FieldOrder>\n", (unsigned int)track->fieldorder); /* uchar as 1 byte uint */
+	if(notes) {
+      fprintf(xmlout,  "                <!-- When FieldCount=2, FieldOrder means: -->\n");
+      fprintf(xmlout,  "                <!--   0: Field coding unknown -->\n");
+      fprintf(xmlout,  "                <!--   1: Field with topmost line is stored first in sample; fields are in temporal order -->\n");
+      fprintf(xmlout,  "                <!--   6: Field with topmost line is stored second in sample; fields are in temporal order -->\n");
+      fprintf(xmlout,  "                <!-- Defaults: FieldCount=1, FieldOrder=0 if FieldCoding box not present -->\n");
+      fprintf(xmlout,  "                <!-- Current implementation doesn't retain whether box was actually present. -->\n");
+	}
+    fprintf(xmlout,    "              </FieldCoding>\n");
+
+    fprintf(xmlout,    "              <MJP2_Profile BoxType=\"jp2p\" Count=\"%d\">\n",track->num_br);
+    for (i = 0; i < track->num_br; i++) /* read routine stored in reverse order, so let's undo damage */
+    {
+      uint_to_chars(track->br[i], buf);
+      fprintf(xmlout,  "                <CompatibleBrand>%s</CompatibleBrand>\n", buf);    /*4 characters, each CLi */
+    }
+    fprintf(xmlout,    "              </MJP2_Profile>\n");
+
+    fprintf(xmlout,    "              <MJP2_Prefix BoxType=\"jp2x\" Count=\"%d\">\n",track->num_jp2x);
+    for (i = 0; i < track->num_jp2x; i++)
+    { // We'll probably need better formatting than this
+      fprintf(xmlout,  "                <Data>0x%02x</Data>\n", track->jp2xdata[i]);    /* Each entry is single byte */
+    }
+    fprintf(xmlout,    "              </MJP2_Prefix>\n");
+
+    fprintf(xmlout,    "              <MJP2_SubSampling BoxType=\"jsub\">\n"); /* These values are all 1 byte */
+    if(notes)
+	  fprintf(xmlout,  "              <!-- Typical subsample value is 2 for 4:2:0 -->\n");
+    fprintf(xmlout,    "                <HorizontalSub>%d</HorizontalSub>\n", track->hsub);
+    fprintf(xmlout,    "                <VerticalSub>%d</VerticalSub>\n", track->vsub);
+    fprintf(xmlout,    "                <HorizontalOffset>%d</HorizontalOffset>\n", track->hoff);
+    fprintf(xmlout,    "                <VerticalOffset>%d</VerticalOffset>\n", track->voff);
+	if(notes) {
+	  fprintf(xmlout,  "                <!-- Typical {horizontal, vertical} chroma offset values: -->\n");
+	  fprintf(xmlout,  "                <!-- 4:2:2 format (CCIR601, H.262, MPEG2, MPEG4, recom. Exif): {0, 0} -->\n");
+	  fprintf(xmlout,  "                <!-- 4:2:2 format (JFIF):                                      {1, 0} -->\n");
+	  fprintf(xmlout,  "                <!-- 4:2:0 format (H.262, MPEG2, MPEG4):                       {0, 1} -->\n");
+	  fprintf(xmlout,  "                <!-- 4:2:0 format (MPEG1, H.261, JFIF, recom. Exif):           {1, 1} -->\n");
+	}
+    fprintf(xmlout,    "              </MJP2_SubSampling>\n"); /* These values are all 1 byte */
+
+    fprintf(xmlout,    "              <MJP2_OriginalFormat BoxType=\"orfo\">\n"); /* Part III Appx. 2 */
+    fprintf(xmlout,    "                <OriginalFieldCount>%u</OriginalFieldCount>\n", (unsigned int)track->or_fieldcount); /* uchar as 1-byte uint */
+    if(notes)
+      fprintf(xmlout,  "                <!-- In original material before encoding.  Must be either 1 or 2 -->\n");
+    fprintf(xmlout,    "                <OriginalFieldOrder>%u</OriginalFieldOrder>\n", (unsigned int)track->or_fieldorder); /* uchar as 1-byte uint */
+	if(notes) {
+      fprintf(xmlout,  "                <!-- When FieldCount=2, FieldOrder means: -->\n");
+      fprintf(xmlout,  "                <!--   0: Field coding unknown -->\n");
+      fprintf(xmlout,  "                <!--   11: Topmost line came from the earlier field; -->\n");
+      fprintf(xmlout,  "                <!--   16:  Topmost line came form the later field. -->\n");
+      fprintf(xmlout,  "                <!-- Defaults: FieldCount=1, FieldOrder=0 if FieldCoding box not present -->\n");
+      fprintf(xmlout,  "                <!-- Current implementation doesn't retain whether box was actually present. -->\n");
+	}
+    fprintf(xmlout,    "              </MJP2_OriginalFormat>\n");
+    fprintf(xmlout,    "            </VisualSampleEntry>\n");
+    break;
+  case 1: case 2:
+    if(notes)
+      fprintf(xmlout,  "            <!-- mj2_to_metadata's data structure doesn't record this currently. -->\n"); break;
+  }
+  fprintf(xmlout,      "            <TimeToSample BoxType=\"stts\">\n");  
+  fprintf(xmlout,      "              <SampleStatistics>\n");  
+  fprintf(xmlout,      "                <TotalSamples>%d</TotalSamples>\n", track->num_samples);
+  if(notes)
+    fprintf(xmlout,    "                <!-- For video, gives the total frames in the track, by summing all entries in the Sample Table -->\n");
+  fprintf(xmlout,      "              </SampleStatistics>\n"); 
+  fprintf(xmlout,      "              <SampleEntries EntryCount=\"%d\">\n", track->num_tts);
+  for (i = 0; i < track->num_tts; i++) {
+    fprintf(xmlout,    "                <Table Entry=\"%u\" SampleCount=\"%d\" SampleDelta=\"%u\" />\n",
+                                      i+1, track->tts[i].sample_count, track->tts[i].sample_delta);
+  }
+  fprintf(xmlout,      "              </SampleEntries>\n");
+  fprintf(xmlout,      "            </TimeToSample>\n");
+
+  fprintf(xmlout,      "            <SampleToChunk BoxType=\"stsc\" Count=\"%d\">\n", track->num_samplestochunk);
+  for (i = 0; i < track->num_samplestochunk; i++) {
+    fprintf(xmlout,    "              <FirstChunk>%u</FirstChunk>\n",track->sampletochunk[i].first_chunk); /* 4 bytes */
+    fprintf(xmlout,    "              <SamplesPerChunk>%u</SamplesPerChunk>\n",track->sampletochunk[i].samples_per_chunk); /* 4 bytes */
+    fprintf(xmlout,    "              <SampleDescrIndex>%u</SampleDescrIndex>\n",track->sampletochunk[i].sample_descr_idx); /* 4 bytes */
+  }
+  fprintf(xmlout,      "            </SampleToChunk>\n");
+  // After reading this info in, track->num_chunks is calculated and a decompressed table established internally.
+
+  fprintf(xmlout,      "            <SampleSize BoxType=\"stsz\">\n");
+  if(track->same_sample_size) {
+    // all values in track->sample[i].sample_size are equal.  Grab the first one.
+    fprintf(xmlout,    "              <Sample_Size>%u</Sample_Size>\n", track->sample[0].sample_size);
+	if(notes) {
+      fprintf(xmlout,  "              <!-- Non-zero value means all samples have that size. -->\n");
+	  fprintf(xmlout,  "              <!-- So <Sample_Count> (aka Entry_Count in std.) has no meaning, is suppressed from this output, and no table follows. -->\n");
+	}
+  } else {
+    fprintf(xmlout,    "              <Sample_Size>0</Sample_Size>\n");
+    if(notes)
+	  if(sampletables)
+        fprintf(xmlout,"              <!-- Zero value means samples have different sizes, given in table next of length Sample_Count (aka Entry_Count in std). -->\n");
+	  else
+        fprintf(xmlout,"              <!-- Zero value means samples have different sizes, given in table (not shown) of length Sample_Count (aka Entry_Count in std). -->\n");
+	fprintf(xmlout,    "              <Sample_Count>%u</Sample_Count>\n", track->num_samples);
+	if(sampletables)
+     for (i = 0; i < (int)track->num_samples; i++) {
+      fprintf(xmlout,  "              <EntrySize Num=\"%u\">%u</EntrySize>\n", i+1, track->sample[i].sample_size);
+     }
+  }  
+  fprintf(xmlout,      "            </SampleSize>\n");
+
+  fprintf(xmlout,      "            <ChunkOffset BoxType=\"stco\">\n");
+  // Structure not yet - Variant ChunkLargeOffset 'co64'
+  fprintf(xmlout,      "              <EntryCount>%u</EntryCount>\n", track->num_chunks);
+  if(notes) {
+    fprintf(xmlout,    "              <!-- For this implementation, EntryCount shown is one calculated during file read of <SampleToChunk> data. -->\n");
+    fprintf(xmlout,    "              <!-- Implementation will report failure during file read of <ChunkOffset> data if read entry-count disagrees. -->\n");
+  }
+  if(sampletables)
+    for (i = 0; i < (int)track->num_chunks; i++)
+      fprintf(xmlout,  "              <Chunk_Offset Num=\"%d\">%u</Chunk_Offset>\n", i+1, track->chunk[i].offset);
+  fprintf(xmlout,      "            </ChunkOffset>\n");
+
+  fprintf(xmlout,      "          </SampleTable>\n");
+}
+
+/* ------------- */
+
+int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int snum, opj_event_mgr_t *event_mgr)
+{
+	opj_dparameters_t parameters;	/* decompression parameters */
+  opj_image_t *img;
+  opj_cp_t *cp;
+  int i;
+  int numcomps;
+  unsigned char* frame_codestream;
+	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
+	opj_cio_t *cio = NULL;	
+	opj_j2k_t *j2k;
+
+	/* JPEG 2000 compressed image data */
+
+	/* get a decoder handle */
+	dinfo = opj_create_decompress(CODEC_J2K);
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, event_mgr, stderr);
+
+	/* setup the decoder decoding parameters using the current image and user parameters */
+	parameters.cp_limit_decoding = DECODE_ALL_BUT_PACKETS;
+	opj_setup_decoder(dinfo, &parameters);	
+
+  frame_codestream = (unsigned char*) malloc (sample->sample_size-8); /* Skipping JP2C marker */
+  if(frame_codestream == NULL)
+	  return 1;
+
+  fseek(file,sample->offset+8,SEEK_SET);
+  fread(frame_codestream,sample->sample_size-8,1, file);  /* Assuming that jp and ftyp markers size do */
+
+	/* open a byte stream */
+	cio = opj_cio_open((opj_common_ptr)dinfo, frame_codestream, sample->sample_size-8);
+
+  /* Decode J2K to image: */
+	img = opj_decode(dinfo, cio);
+  if (!img) {
+		fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+		opj_destroy_decompress(dinfo);
+		opj_cio_close(cio);
+		return 1;
+	}
+
+	j2k = (opj_j2k_t*)dinfo->j2k_handle;
+	j2k_default_tcp = j2k->default_tcp;
+	cp = j2k->cp;
+
+  numcomps = img->numcomps;
+  /*  Alignments:        "      <       To help maintain xml pretty-printing */  
+  fprintf(xmlout,      "      <JP2_Frame Num=\"%d\">\n", snum+1);
+  fprintf(xmlout,      "        <MainHeader>\n");
+  /* There can be multiple codestreams; a particular image is entirely within a single codestream */
+  /* TO DO:  A frame can be represented by two I-guess-contigious codestreams if its interleaved. */
+  fprintf(xmlout,      "          <StartOfCodestream Marker=\"SOC\" />\n");
+  /* "cp" stands for "coding parameter"; "tcp" is tile coding parameters, "tccp" is tile-component coding parameters */
+  xml_out_frame_siz(xmlout, img, cp); /* reqd in main */
+  xml_out_frame_cod(xmlout, j2k_default_tcp); /* reqd in main */
+  xml_out_frame_coc(xmlout, j2k_default_tcp, numcomps); /* opt in main, at most 1 per component */
+  xml_out_frame_qcd(xmlout, j2k_default_tcp); /* reqd in main */
+  xml_out_frame_qcc(xmlout, j2k_default_tcp, numcomps);	/* opt in main, at most 1 per component */
+  xml_out_frame_rgn(xmlout, j2k_default_tcp, numcomps); /* opt, at most 1 per component */
+  xml_out_frame_poc(xmlout, j2k_default_tcp); /*  opt (but reqd in main or tile for any progression order changes) */
+  /* Next four get j2k_default_tcp passed globally: */
+#ifdef SUPPRESS_FOR_NOW
+  xml_out_frame_ppm(xmlout, cp); /* opt (but either PPM or PPT [distributed in tile headers] or codestream packet header reqd) */
+#endif
+  xml_out_frame_tlm(xmlout); /* NO-OP.  TLM NOT SAVED IN DATA STRUCTURE */ /* opt */
+  xml_out_frame_plm(xmlout); /* NO-OP.  PLM NOT SAVED IN DATA STRUCTURE */ /* opt in main; can be used in conjunction with PLT */
+  xml_out_frame_crg(xmlout); /* NO-OP.  CRG NOT SAVED IN DATA STRUCTURE */ /* opt in main; */
+  xml_out_frame_com(xmlout, j2k_default_tcp); /* NO-OP.  COM NOT SAVED IN DATA STRUCTURE */ /* opt in main; */
+
+  fprintf(xmlout,      "        </MainHeader>\n");
+
+  /*	TO DO: all the tile headers (sigh)  */
+  fprintf(xmlout,      "        <TilePartHeaders Count=\"%d\">\n", cp->tileno_size);		/* size of the vector tileno */
+  for(i = 0; i < cp->tileno_size; i++) { /* I think cp->tileno_size will be same number as (cp->tw * cp->th) or as global j2k_curtileno */
+    // Standard seems to use zero-based # for tile-part.
+    fprintf(xmlout,    "          <TilePartHeader Num=\"%d\" ID=\"%d\">\n", i, cp->tileno[i]);			/* ID number of the tiles present in the codestream */
+    fprintf(xmlout,    "            <StartOfTilePart Marker=\"SOT\" />\n");
+	/* All markers in tile-part headers (between SOT and SOD) are optional, unless structure requires. */
+    if(i == 0) {
+      xml_out_frame_cod(xmlout, &(cp->tcps[i])); /* No more than 1 per tile */
+      xml_out_frame_coc(xmlout, &(cp->tcps[i]), numcomps); /* No more than 1 per component */
+      xml_out_frame_qcd(xmlout, &(cp->tcps[i])); /* No more than 1 per tile */
+      xml_out_frame_qcc(xmlout, &(cp->tcps[i]), numcomps);	/* No more than 1 per component */
+      xml_out_frame_rgn(xmlout, &(cp->tcps[i]), numcomps); /* No more than 1 per component */
+    }
+    xml_out_frame_poc(xmlout, &(cp->tcps[i])); /* Reqd only if any progression order changes different from main POC */
+#ifdef SUPPRESS_FOR_NOW
+    xml_out_frame_ppt(xmlout, &(cp->tcps[i])); /* Either PPT [distributed in tile headers] or PPM or codestream packet header reqd. */
+#endif
+    xml_out_frame_plt(xmlout, &(cp->tcps[i])); /* NO-OP.  PLT NOT SAVED IN DATA STRUCTURE */ /* Can be used in conjunction with main's PLM */
+    xml_out_frame_com(xmlout, &(cp->tcps[i])); /* NO-OP.  COM NOT SAVED IN DATA STRUCTURE */
+    /* opj_tcp_t * cp->tcps; "tile coding parameters" */
+    /* Maybe not: fprintf(xmlout,  "        <>%d</>, cp->matrice[i];			*/ /* Fixed layer    */
+    fprintf(xmlout,    "            <StartOfData Marker=\"SOD\" />\n");
+    if(notes)
+      fprintf(xmlout,  "            <!-- Tile-part bitstream, not shown, follows tile-part header and SOD marker. -->\n");
+    fprintf(xmlout,    "          </TilePartHeader>\n");
+  }
+  fprintf(xmlout,      "        </TilePartHeaders>\n");		/* size of the vector tileno */
+
+#ifdef NOTYET
+  IMAGINE the cp object has data to support the following... but we could use an new different data structure instead
+  /* I'm unclear if the span of the original fread(frame_codestream...) included the following items if they're trailing. */
+  /* ALSO TO DO, BUT DATA STRUCTURE DOESN'T HANDLE YET: boxes (anywhere in file except before the Filetype box): */
+  xml_out_frame_jp2i(xmlout, &cp); /* IntellectualProperty 'jp2i' (no restrictions on location) */
+  xml_out_frame_xml(xmlout, &cp); /* XML 'xml\040' (0x786d6c20).  Can appear multiply */
+  xml_out_frame_uuid(xmlout, &cp); /* UUID 'uuid' (top level only) */
+  xml_out_frame_uinf(xmlout, &cp); /* UUIDInfo 'uinf', includes UUIDList 'ulst' and URL 'url\40' */
+#endif
+
+  fprintf(xmlout,      "      </JP2_Frame>\n");
+
+  /* Extra commentary: */
+  if(notes) {
+    fprintf(xmlout,    "      <!-- Given the number and size of components, mj2_to_frame would try to convert this -->\n");
+    if (((img->numcomps == 3) && (img->comps[0].dx == img->comps[1].dx / 2) 
+      && (img->comps[0].dx == img->comps[2].dx / 2 ) && (img->comps[0].dx == 1)) 
+      || (img->numcomps == 1)) {
+      fprintf(xmlout,  "      <!-- file to a YUV movie in the normal manner. -->\n");
+    }
+    else if ((img->numcomps == 3) && 
+      (img->comps[0].dx == 1) && (img->comps[1].dx == 1)&&
+	  (img->comps[2].dx == 1))  {// If YUV 4:4:4 input --> to bmp
+	  fprintf(xmlout,  "      <!-- YUV 4:4:4 file to a series of .bmp files. -->\n");
+    }
+    else {
+	  fprintf(xmlout,  "      <!-- file whose image component dimension are unknown, to a series of .j2k files. -->\n");
+    }
+  }
+
+	opj_destroy_decompress(dinfo);
+	opj_cio_close(cio);
+  free(frame_codestream);
+
+  return 0;
+}
+
+/* ------------- */
+
+void int16_to_3packedchars(short int value, char* buf)
+{
+    /* This is to retrieve the 3-letter ASCII language code */
+    /* Each char is packed into 5 bits, as difference from 0x60 */
+    int i;
+    for (i = 2; i >= 0; i--)
+    {
+        buf[i] = (value & 0x001f) + 0x60;
+        value = (value >>5);
+    }
+    buf[3] = '\0';
+}
+
+/* ------------- */
+
+void xml_out_frame_siz(FILE* xmlout, opj_image_t *img, opj_cp_t *cp)
+{
+  opj_image_comp_t *comp;
+  int i;
+
+  fprintf(xmlout,    "          <ImageAndFileSize Marker=\"SIZ\">\n");
+  // This is similar to j2k.c's j2k_dump_image.
+  // Not of interest: Lsiz, Rsiz
+  fprintf(xmlout,    "            <Xsiz>%d</Xsiz>\n", img->x1);
+  fprintf(xmlout,    "            <Ysiz>%d</Ysiz>\n", img->y1);
+  if(notes)
+    fprintf(xmlout,  "            <!-- Xsiz, Ysiz is the size of the reference grid. -->\n");
+  fprintf(xmlout,    "            <XOsiz>%d</XOsiz>\n", img->x0);
+  fprintf(xmlout,    "            <YOsiz>%d</YOsiz>\n", img->y0);
+  if(notes)
+    fprintf(xmlout,  "            <!-- XOsiz, YOsiz are offsets from grid origin to image origin. -->\n");
+  fprintf(xmlout,    "            <XTsiz>%d</XTsiz>\n", cp->tdx);
+  fprintf(xmlout,    "            <YTsiz>%d</YTsiz>\n", cp->tdy);
+  if(notes)
+    fprintf(xmlout,  "            <!-- XTsiz, YTsiz is the size of one tile with respect to the grid. -->\n");
+  fprintf(xmlout,    "            <XTOsiz>%d</XTOsiz>\n", cp->tx0);
+  fprintf(xmlout,    "            <YTOsiz>%d</YTOsiz>\n", cp->ty0);
+  if(notes)
+    fprintf(xmlout,  "            <!-- XTOsiz, YTOsiz are offsets from grid origin to first tile origin. -->\n");
+  fprintf(xmlout,    "            <Csiz>%d</Csiz>\n", img->numcomps);
+  if(notes) {
+    fprintf(xmlout,  "            <!-- Csiz is the number of components in the image. -->\n");
+    fprintf(xmlout,  "            <!-- For image components next: -->\n");
+    fprintf(xmlout,  "            <!--   XRsiz, YRsiz denote pixel-sample-spacing on the grid, per Part I Annex B. -->\n");
+    //fprintf(xmlout,"            <!--   XO, YO is offset of the component compared to the whole image. -->\n");
+    fprintf(xmlout,  "            <!--   Bits per pixel (bpp) is the pixel depth. -->\n");
+    fprintf(xmlout,  "            <!--   WidthOfData and HeightOfData are calculated values, e.g.: w = roundup((Xsiz - XOsiz)/ XRsiz) -->\n");
+  }
+
+  for (i = 0; i < img->numcomps; i++) {/* image-components */
+    comp = &(img->comps[i]);
+    fprintf(xmlout,  "            <Component Num=\"%d\">\n", i+1);
+    fprintf(xmlout,  "              <Ssiz>\n");
+	if(raw)
+      fprintf(xmlout,"                <AsHex>0x%02x</AsHex>\n", (comp->sgnd << 7) & (comp->prec - 1));
+	if(derived) {
+      fprintf(xmlout,"                <Signed>%d</Signed>\n", comp->sgnd);
+      fprintf(xmlout,"                <PrecisionInBits>%d</PrecisionInBits>\n", comp->prec);
+	}
+    fprintf(xmlout,  "              </Ssiz>\n");
+    fprintf(xmlout,  "              <XRsiz>%d</XRsiz>\n", comp->dx);
+    fprintf(xmlout,  "              <YRsiz>%d</YRsiz>\n", comp->dy);
+    fprintf(xmlout,  "              <WidthOfData>%d</WidthOfData>\n", comp->w);
+    fprintf(xmlout,  "              <HeightOfData>%d</HeightOfData>\n", comp->h);
+    /* Rest of these aren't calculated when SIZ is read:
+    fprintf(xmlout,  "              <XO>%d</XO>\n", comp->x0);
+    fprintf(xmlout,  "              <YO>%d</YO>\n", comp->y0);
+	if(notes)
+	  fprintf(xmlout,"              <!--  XO, YO is offset of the component compared to the whole image. -->\n");
+    fprintf(xmlout,  "              <BitsPerPixel>%d</BitsPerPixel>\n", comp->bpp);
+    fprintf(xmlout,  "              <NumberOfDecodedResolution>%d</NumberOfDecodedResolution>\n", comp->resno_decoded); */
+    // SUPPRESS: n/a to mj2_to_metadata.  fprintf(xmlout,"        <Factor>%d</Factor\n", comp->factor);
+    /* factor = number of division by 2 of the out image  compare to the original size of image */
+    // TO DO comp->data:  int *data;			/* image-component data      */
+
+    fprintf(xmlout,  "            </Component>\n");
+  }
+  fprintf(xmlout,    "          </ImageAndFileSize>\n");
+}
+
+/* ------------- */
+
+void xml_out_frame_cod(FILE* xmlout, opj_tcp_t *tcp)
+{
+/* Could be called with tcp = &j2k_default_tcp;
+/* Or, for tile-part header, with &j2k_cp->tcps[j2k_curtileno]
+/*  Alignment for main:"          < < < <   To help maintain xml pretty-printing */  
+/*  Alignment for tile:"            < < <   To help maintain xml pretty-printing */  
+  opj_tccp_t *tccp;
+  int i;
+  char spaces[13] = "            "; /* 12 spaces if tilepart*/
+  char* s = spaces;
+  if(tcp == j2k_default_tcp) {
+    s++;s++; /* shorten s to 10 spaces if main */
+  }
+  tccp = &(tcp->tccps[0]);
+
+  fprintf(xmlout,      "%s<CodingStyleDefault Marker=\"COD\">\n",s); /* Required in main header */
+  /* Not retained or of interest: Lcod */
+  fprintf(xmlout,      "%s  <Scod>0x%02x</Scod>\n", s, tcp->csty); /* 1 byte */
+  if(notes) {
+    fprintf(xmlout,    "%s  <!-- For Scod, specific bits mean (where bit 0 is lowest or rightmost): -->\n",s);
+    fprintf(xmlout,    "%s  <!-- bit 0: Defines entropy coder precincts -->\n",s);
+    fprintf(xmlout,    "%s  <!--        0 = (PPx=15, PPy=15); 1 = precincts defined below. -->\n",s);
+    fprintf(xmlout,    "%s  <!-- bit 1: 1 = SOP marker may be used; 0 = not. -->\n",s);
+    fprintf(xmlout,    "%s  <!-- bit 2: 1 = EPH marker may be used; 0 = not. -->\n",s);
+  }
+  fprintf(xmlout,      "%s  <SGcod>\n",s);
+  fprintf(xmlout,      "%s    <ProgressionOrder>%d</ProgressionOrder>\n", s, tcp->prg); /* 1 byte, SGcod (A) */
+  if(notes) {
+    fprintf(xmlout,    "%s    <!-- Defined Progression Order Values are: -->\n",s);
+    fprintf(xmlout,    "%s    <!-- 0 = LRCP; 1 = RLCP; 2 = RPCL; 3 = PCRL; 4 = CPRL -->\n",s);
+    fprintf(xmlout,    "%s    <!-- where L = \"layer\", R = \"resolution level\", C = \"component\", P = \"position\". -->\n",s);
+  }
+  fprintf(xmlout,      "%s    <NumberOfLayers>%d</NumberOfLayers>\n", s, tcp->numlayers); /* 2 bytes, SGcod (B) */
+  fprintf(xmlout,      "%s    <MultipleComponentTransformation>%d</MultipleComponentTransformation>\n", s, tcp->mct); /* 1 byte, SGcod (C).  More or less boolean */
+  if(notes)
+    fprintf(xmlout,    "%s    <!-- For MCT, 0 = none, 1 = transform first 3 components for efficiency, per Part I Annex G -->\n",s);
+  fprintf(xmlout,      "%s  </SGcod>\n",s);
+  /* This code will compile only if declaration of j2k_default_tcp is changed from static (to implicit extern) in j2k.c */
+  fprintf(xmlout,      "%s  <SPcod>\n",s);
+  /* Internal data structure tccp defines separate defaults for each component, but they all get the same values */
+  /* So we only have to report the first component's values here. */
+  /* Compare j2k_read_cox(...) */
+  fprintf(xmlout,      "%s    <NumberOfDecompositionLevels>%d</NumberOfDecompositionLevels>\n", s, tccp->numresolutions - 1);	/* 1 byte, SPcox (D) */
+  fprintf(xmlout,      "%s    <CodeblockWidth>%d</CodeblockWidth>\n", s, tccp->cblkw - 2);	/* 1 byte, SPcox (E) */
+  fprintf(xmlout,      "%s    <CodeblockHeight>%d</CodeblockHeight>\n", s, tccp->cblkh - 2);	/* 1 byte, SPcox (F) */
+  if(notes) {
+    fprintf(xmlout,    "%s    <!-- CBW and CBH are non-negative, and summed cannot exceed 8 -->\n",s);
+    fprintf(xmlout,    "%s    <!-- Codeblock dimension is 2^(value + 2) -->\n", s);
+  }
+  fprintf(xmlout,      "%s    <CodeblockStyle>0x%02x</CodeblockStyle>\n", s, tccp->cblksty);	/* 1 byte, SPcox (G) */
+  if(notes) {
+    fprintf(xmlout,    "%s    <!-- For CodeblockStyle, bits mean (with value 1=feature on, 0=off): -->\n",s);
+    fprintf(xmlout,    "%s    <!-- bit 0: Selective arithmetic coding bypass. -->\n",s);
+    fprintf(xmlout,    "%s    <!-- bit 1: Reset context probabilities on coding pass boundaries. -->\n",s);
+    fprintf(xmlout,    "%s    <!-- bit 2: Termination on each coding pass. -->\n",s);
+    fprintf(xmlout,    "%s    <!-- bit 3: Vertically causal context. -->\n",s);
+    fprintf(xmlout,    "%s    <!-- bit 4: Predictable termination. -->\n",s);
+    fprintf(xmlout,    "%s    <!-- bit 5: Segmentation symbols are used. -->\n",s);
+  }
+  fprintf(xmlout,      "%s    <Transformation>%d</Transformation>\n", s, tccp->qmfbid);	/* 1 byte, SPcox (H) */
+  if(notes)
+    fprintf(xmlout,    "%s    <!-- For Transformation, 0=\"9-7 irreversible filter\", 1=\"5-3 reversible filter\" -->\n",s);
+  if (tccp->csty & J2K_CP_CSTY_PRT) {
+    fprintf(xmlout,    "%s    <PrecinctSize>\n",s); /* 1 byte, SPcox (I_i) */
+    if(notes)
+      fprintf(xmlout,  "%s    <!-- These are size exponents PPx and PPy. May be zero only for first level (aka N(L)LL subband)-->\n",s);
+    for (i = 0; i < tccp->numresolutions; i++) {	
+      fprintf(xmlout,  "%s      <PrecinctHeightAndWidth  ResolutionLevel=\"%d\">\n", s, i);
+	  if(raw)
+        fprintf(xmlout,"%s        <AsHex>0x%02x</AsHex>\n", s, (tccp->prch[i] << 4) | tccp->prcw[i]);	/* packed into 1 byte, SPcox (G) */
+	  if(derived) {
+        fprintf(xmlout,"%s        <WidthAsDecimal>%d</WidthAsDecimal>\n", s, tccp->prcw[i]);
+        fprintf(xmlout,"%s        <HeightAsDecimal>%d</HeightAsDecimal>\n", s, tccp->prch[i]);
+	  }
+      fprintf(xmlout,  "%s      </PrecinctHeightAndWidth>\n", s, i);
+    }
+    fprintf(xmlout,    "%s    </PrecinctSize>\n",s); /* 1 byte, SPcox (I_i) */
+  }
+  fprintf(xmlout,      "%s  </SPcod>\n",s);
+  fprintf(xmlout,      "%s</CodingStyleDefault>\n",s);
+}
+
+/* ------------- */
+
+void xml_out_frame_coc(FILE* xmlout, opj_tcp_t *tcp, int numcomps) /* Optional in main & tile-part headers */
+{
+/* Uses global j2k_default_tcp */
+  opj_tccp_t *tccp, *firstcomp_tccp;
+  int i, compno;
+  char spaces[13] = "            "; /* 12 spaces if tilepart*/
+  char* s = spaces;
+  if(tcp == j2k_default_tcp) {
+    s++;s++; /* shorten s to 10 spaces if main */
+  }
+
+  firstcomp_tccp = &(tcp->tccps[0]);
+    /* Internal data structure tccp defines separate defaults for each component, set from main */
+	/* default, then selectively overwritten. */
+    /* Compare j2k_read_cox(...) */
+  /* We don't really know which was the default, and which were not */
+  /* Let's pretend that [0] is the default and all others are not */
+  if(notes) {
+    fprintf(xmlout,    "%s<!-- mj2_to_metadata implementation always reports component[0] as using default COD, -->\n", s);
+    if(tcp == j2k_default_tcp)
+      fprintf(xmlout,  "%s<!-- and any other component, with main-header style values different from [0], as COC. -->\n", s);
+    else
+      fprintf(xmlout,  "%s<!-- and any other component, with tile-part-header style values different from [0], as COC. -->\n", s);
+  }
+  for (compno = 1; compno < numcomps; compno++) /* spec says components are zero-based */
+  {
+    tccp = &tcp->tccps[compno];
+    if(same_component_style(firstcomp_tccp, tccp))
+		continue;
+
+/*  Alignments:          "      < < < < <   To help maintain xml pretty-printing */  
+    fprintf(xmlout,      "%s<CodingStyleComponent Marker=\"COC\">\n", s); /* Optional in main header, at most 1 per component */
+    if(notes)
+      fprintf(xmlout,    "%s  <!-- See Ccoc below for zero-based component number. -->\n", s);
+    /* Overrides the main COD for the specific component */
+    /* Not retained or of interest: Lcod */
+    fprintf(xmlout,      "%s  <Scoc>0x%02x</Scoc>\n", s, tccp->csty); /* 1 byte */
+	if(notes) {
+	  fprintf(xmlout,    "%s  <!-- Scoc defines entropy coder precincts: -->\n", s);
+      fprintf(xmlout,    "%s  <!--   0 = maximum, namely (PPx=15, PPy=15); 1 = precincts defined below. -->\n", s);
+	}
+    fprintf(xmlout,      "%s  <Ccoc>%d</Ccoc>\n", s, compno); /* 1 or 2 bytes */
+    /* Unfortunately compo isn't retained in j2k_read_coc:  compno = cio_read(j2k_img->numcomps <= 256 ? 1 : 2);	/* Ccoc */
+    /*if(j2k_img_numcomps <=256)
+	  component is 1 byte
+    else
+      compno is 2 byte */
+
+    /* This code will compile only if declaration of j2k_default_tcp is changed from static (to implicit extern) in j2k.c */
+    fprintf(xmlout,      "%s  <SPcoc>\n", s);
+    fprintf(xmlout,      "%s    <NumberOfDecompositionLevels>%d</NumberOfDecompositionLevels>\n", s, tccp->numresolutions - 1);	/* 1 byte, SPcox (D) */
+    fprintf(xmlout,      "%s    <CodeblockWidth>%d</CodeblockWidth>\n", s, tccp->cblkw - 2);	/* 1 byte, SPcox (E) */
+    fprintf(xmlout,      "%s    <CodeblockHeight>%d</CodeblockHeight>\n", s, tccp->cblkh - 2);	/* 1 byte, SPcox (F) */
+	if(notes) {
+      fprintf(xmlout,    "%s    <!-- CBW and CBH are non-negative, and summed cannot exceed 8 -->\n", s);
+      fprintf(xmlout,    "%s    <!-- Codeblock dimension is 2^(value + 2) -->\n", s);
+	}
+    fprintf(xmlout,      "%s    <CodeblockStyle>0x%02x</CodeblockStyle>\n", s, tccp->cblksty);	/* 1 byte, SPcox (G) */
+	if(notes) {
+      fprintf(xmlout,    "%s    <!-- For CodeblockStyle, bits mean (with value 1=feature on, 0=off): -->\n", s);
+      fprintf(xmlout,    "%s    <!-- bit 0: Selective arithmetic coding bypass. -->\n", s);
+      fprintf(xmlout,    "%s    <!-- bit 1: Reset context probabilities on coding pass boundaries. -->\n", s);
+      fprintf(xmlout,    "%s    <!-- bit 2: Termination on each coding pass. -->\n", s);
+      fprintf(xmlout,    "%s    <!-- bit 3: Vertically causal context. -->\n", s);
+      fprintf(xmlout,    "%s    <!-- bit 4: Predictable termination. -->\n", s);
+      fprintf(xmlout,    "%s    <!-- bit 5: Segmentation symbols are used. -->\n", s);
+	}
+    fprintf(xmlout,      "%s    <Transformation>%d</Transformation>\n", s, tccp->qmfbid);	/* 1 byte, SPcox (H) */
+    if(notes)
+      fprintf(xmlout,    "%s    <!-- For Transformation, 0=\"9-7 irreversible filter\", 1=\"5-3 reversible filter\" -->\n", s);
+    if (tccp->csty & J2K_CP_CSTY_PRT) {
+      fprintf(xmlout,    "%s    <PrecinctSize>\n", s); /* 1 byte, SPcox (I_i) */
+      if(notes)
+        fprintf(xmlout,  "%s      <!-- These are size exponents PPx and PPy. May be zero only for first level (aka N(L)LL subband)-->\n", s);
+      for (i = 0; i < tccp->numresolutions-1; i++) { /* subtract 1 to get # of decomposition levels */	
+        fprintf(xmlout,  "%s      <PrecinctHeightAndWidth  ResolutionLevel=\"%d\">\n", s, i);
+		if(raw)
+          fprintf(xmlout,"%s        <AsHex>0x%02x</AsHex>\n", s, (tccp->prch[i] << 4) | tccp->prcw[i]);	/* packed into 1 byte, SPcox (G) */
+		if(derived) {
+          fprintf(xmlout,"%s        <WidthAsDecimal>%d</WidthAsDecimal>\n", s, tccp->prcw[i]);
+          fprintf(xmlout,"%s        <HeightAsDecimal>%d</HeightAsDecimal>\n", s, tccp->prch[i]);
+		}
+        fprintf(xmlout,  "%s      </PrecinctHeightAndWidth>\n", s, i);
+      }
+      fprintf(xmlout,    "%s    </PrecinctSize>\n", s); /* 1 byte, SPcox (I_i) */
+    }
+    fprintf(xmlout,      "%s  </SPcoc>\n", s);
+    fprintf(xmlout,      "%s</CodingStyleComponent>\n", s);
+  }
+}
+
+/* ------------- */
+
+BOOL same_component_style(opj_tccp_t *tccp1, opj_tccp_t *tccp2)
+{
+  int i;
+
+  if(tccp1->numresolutions != tccp2->numresolutions)
+	  return FALSE;
+  if(tccp1->cblkw != tccp2->cblkw)
+	  return FALSE;
+  if(tccp1->cblkh != tccp2->cblkh)
+	  return FALSE;
+  if(tccp1->cblksty != tccp2->cblksty)
+	  return FALSE;
+  if(tccp1->csty != tccp2->csty)
+	  return FALSE;
+  
+  if (tccp1->csty & J2K_CP_CSTY_PRT) {
+      for (i = 0; i < tccp1->numresolutions; i++) {	
+         if(tccp1->prcw[i] != tccp2->prcw[i] || tccp1->prch[i] != tccp2->prch[i])
+			 return FALSE;
+      }
+  }
+  return TRUE;
+}
+
+/* ------------- */
+
+void xml_out_frame_qcd(FILE* xmlout, opj_tcp_t *tcp)
+{
+  /* This code will compile only if declaration of j2k_default_tcp is changed from static (to implicit extern) in j2k.c */
+  opj_tccp_t *tccp;
+  int bandno, numbands;
+  char spaces[13] = "            "; /* 12 spaces if tilepart*/
+  char* s = spaces;
+  if(tcp == j2k_default_tcp) {
+    s++;s++; /* shorten s to 10 spaces if main */
+  }
+
+  /* Compare j2k_read_qcx */
+  fprintf(xmlout,      "%s<QuantizationDefault Marker=\"QCD\">\n", s); /* Required in main header, single occurrence */
+  tccp = &(tcp->tccps[0]);
+  /* Not retained or of interest: Lqcd */
+  fprintf(xmlout,      "%s  <Sqcd>\n", s);		/* 1 byte */
+  if(notes)
+    fprintf(xmlout,    "%s  <!-- Default quantization style for all components. -->\n", s);
+  if(raw)
+    fprintf(xmlout,    "%s    <AsHex>0x%02x</AsHex>\n", s, (tccp->numgbits) << 5 | tccp->qntsty);
+  if(derived)
+    fprintf(xmlout,    "%s    <QuantizationStyle>%d</QuantizationStyle>\n", s, tccp->qntsty);
+  if(notes) {
+    fprintf(xmlout,    "%s    <!-- Quantization style (in Sqcd's low 5 bits) may be: -->\n", s);
+    fprintf(xmlout,    "%s    <!--   0 = No quantization. SPqcd size = 8 bits-->\n", s);
+    fprintf(xmlout,    "%s    <!--   1 = Scalar derived (values signaled for N(L)LL subband only). Use Eq. E.5. SPqcd size = 16. -->\n", s);
+    fprintf(xmlout,    "%s    <!--   2 = Scalar expounded (values signaled for each subband). SPqcd size = 16. -->\n", s);
+  }
+  if(derived)
+    fprintf(xmlout,    "%s    <NumberOfGuardBits>%d</NumberOfGuardBits>\n", s,	tccp->numgbits);
+  if(notes)
+    fprintf(xmlout,    "%s    <!-- 0-7 guard bits allowed (stored in Sqcd's high 3 bits) -->\n", s);
+  fprintf(xmlout,      "%s  </Sqcd>\n", s);
+	  
+  /* Problem: numbands in some cases is calculated from len, which is not retained or available here at this time */
+  /* So we'll just dump all internal values */
+  /* We could calculate it, but I'm having trouble believing the length equations in the standard */
+  
+  fprintf(xmlout,      "%s  <SPqcd>\n", s);
+  switch(tccp->qntsty) {
+  case J2K_CCP_QNTSTY_NOQNT: /* no quantization */
+    /* This is what standard says, but I don't believe it: len = 4 + (3*decomp); */
+    numbands = J2K_MAXBANDS; /* should be: numbands = len - 1; */
+	/* Better: IMAGINE numbands = tccp->stepsize_numbands; */
+    /* Instead look for first zero exponent, quit there.  Adequate? */
+    fprintf(xmlout,    "%s    <ReversibleStepSizeValue>\n", s);
+	if(notes) {
+      fprintf(xmlout,  "%s    <!-- Current mj2_to_metadata implementation dumps entire internal table, -->\n", s);
+	  fprintf(xmlout,  "%s    <!-- until an exponent with zero value is reached. -->\n", s);
+	  fprintf(xmlout,  "%s    <!-- Exponent epsilon(b) of reversible dynamic range. -->\n", s);
+	  fprintf(xmlout,  "%s    <!-- Hex value is as stored, in high-order 5 bits. -->\n", s);
+	}
+    for (bandno = 0; bandno < numbands; bandno++) {
+      if(tccp->stepsizes[bandno].expn == 0)
+        break; /* Remove when we have real numbands */
+      fprintf(xmlout,  "%s      <DynamicRangeExponent Subband=\"%d\">\n", s, bandno);
+	  if(raw)
+        fprintf(xmlout,"%s        <AsHex>0x%02x</AsHex>\n", s, tccp->stepsizes[bandno].expn << 3);
+	  if(derived)
+        fprintf(xmlout,"%s        <AsDecimal>%d</AsDecimal>\n", s, tccp->stepsizes[bandno].expn);
+      fprintf(xmlout,  "%s      </DynamicRangeExponent>\n", s);
+    }
+    fprintf(xmlout,    "%s    </ReversibleStepSizeValue>\n", s);
+    break;
+  case J2K_CCP_QNTSTY_SIQNT:  /* scalar quantization derived */
+    /* This is what standard says.  Should I believe it:: len = 5;
+    /* numbands = 1; */
+    fprintf(xmlout,    "%s    <QuantizationStepSizeValues>\n", s);
+    if(notes)
+      fprintf(xmlout,  "%s    <!-- For irreversible transformation only.  See Part I Annex E Equation E.3 -->\n", s);
+    fprintf(xmlout,    "%s      <QuantizationValues Subband=\"0\">\n", s);
+    if(notes)
+      fprintf(xmlout,  "%s      <!-- For N(L)LL subband: >\n", s);
+	if(raw)
+      fprintf(xmlout,  "%s        <AsHex>0x%02x</AsHex>\n", s, (tccp->stepsizes[0].expn << 11) | tccp->stepsizes[0].mant);
+	if(derived) {
+      fprintf(xmlout,  "%s        <Exponent>%d</Exponent>\n", s, tccp->stepsizes[0].expn);
+      fprintf(xmlout,  "%s        <Mantissa>%d</Mantissa>\n", s, tccp->stepsizes[0].mant);
+	}
+    fprintf(xmlout,    "%s      </QuantizationValues>\n", s);
+	if(notes) {
+      fprintf(xmlout,  "%s      <!-- Exponents for subbands beyond 0 are not from header, but calculated per Eq. E.5 -->\n", s);
+      fprintf(xmlout,  "%s      <!-- The mantissa for all subbands is the same, given by the value above. -->\n", s);
+      fprintf(xmlout,  "%s      <!-- Current mj2_to_metadata implementation dumps entire internal table, -->\n", s);
+	  fprintf(xmlout,  "%s      <!-- until a subband with exponent of zero value is reached. -->\n", s);
+	}
+
+    for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) {
+      if(tccp->stepsizes[bandno].expn == 0)
+        break;
+
+      fprintf(xmlout,  "%s      <CalculatedExponent Subband=\"%d\">%d</CalculatedExponent>\n", s, bandno, tccp->stepsizes[bandno].expn);
+    }
+
+    fprintf(xmlout,    "%s    </QuantizationStepSizeValues>\n", s);
+    break;
+
+  default: /* J2K_CCP_QNTSTY_SEQNT */ /* scalar quantization expounded */
+    /* This is what standard says, but should I believe it: len = 5 + 6*decomp; */
+    numbands = J2K_MAXBANDS; /* should be: (len - 1) / 2;*/
+	/* Better: IMAGINE numbands = tccp->stepsize_numbands; */
+    fprintf(xmlout,    "%s    <QuantizationStepSizeValues>\n", s);
+	if(notes) {
+      fprintf(xmlout,  "%s    <!-- For irreversible transformation only.  See Part I Annex E Equation E.3 -->\n", s);
+      fprintf(xmlout,  "%s    <!-- Current mj2_to_metadata implementation dumps entire internal table, -->\n", s);
+      fprintf(xmlout,  "%s    <!-- until a subband with mantissa and exponent of zero values is reached. -->\n", s);
+    }
+    for (bandno = 0; bandno < numbands; bandno++) {
+      if(tccp->stepsizes[bandno].expn == 0 && tccp->stepsizes[bandno].mant == 0)
+        break; /* Remove when we have real numbands */
+
+      fprintf(xmlout,  "%s      <QuantizationValues Subband=\"%d\">\n", s, bandno);
+	  if(raw)
+        fprintf(xmlout,"%s        <AsHex>0x%02x</AsHex>\n", s, (tccp->stepsizes[bandno].expn << 11) | tccp->stepsizes[bandno].mant);
+	  if(derived) {
+        fprintf(xmlout,"%s        <Exponent>%d</Exponent>\n", s, tccp->stepsizes[bandno].expn);
+        fprintf(xmlout,"%s        <Mantissa>%d</Mantissa>\n", s, tccp->stepsizes[bandno].mant);
+	  }
+      fprintf(xmlout,  "%s      </QuantizationValues>\n", s);
+    }
+    fprintf(xmlout,    "%s    </QuantizationStepSizeValues>\n", s);
+    break;
+  } /* switch */
+  fprintf(xmlout,      "%s  </SPqcd>\n", s);
+  fprintf(xmlout,      "%s</QuantizationDefault>\n", s);
+
+/*  Alignments:        "    < < < < <   To help maintain xml pretty-printing */  
+}
+
+/* ------------- */
+
+void xml_out_frame_qcc(FILE* xmlout, opj_tcp_t *tcp, int numcomps)
+{
+/* Uses global j2k_default_tcp */
+  /* This code will compile only if declaration of j2k_default_tcp is changed from static (to implicit extern) in j2k.c */
+  opj_tccp_t *tccp, *firstcomp_tccp;
+  int bandno, numbands;
+  int compno;
+  char spaces[13] = "            "; /* 12 spaces if tilepart*/
+  char* s = spaces;
+  if(tcp == j2k_default_tcp) {
+    s++;s++; /* shorten s to 10 spaces if main */
+  }
+
+  firstcomp_tccp = &(tcp->tccps[0]);
+    /* Internal data structure tccp defines separate defaults for each component, set from main */
+	/* default, then selectively overwritten. */
+    /* Compare j2k_read_qcx(...) */
+  /* We don't really know which was the default, and which were not */
+  /* Let's pretend that [0] is the default and all others are not */
+  if(notes) {
+    fprintf(xmlout,      "%s<!-- mj2_to_metadata implementation always reports component[0] as using default QCD, -->\n", s);
+    if(tcp == j2k_default_tcp)
+      fprintf(xmlout,    "%s<!-- and any other component, with main-header quantization values different from [0], as QCC. -->\n", s);
+    else
+      fprintf(xmlout,    "%s<!-- and any other component, with tile-part-header quantization values different from [0], as QCC. -->\n", s);
+  }
+  for (compno = 1; compno < numcomps; compno++) /* spec says components are zero-based */
+  {
+    tccp = &(tcp->tccps[compno]);
+    if(same_component_quantization(firstcomp_tccp, tccp))
+		continue;
+
+    /* Compare j2k_read_qcx */
+    fprintf(xmlout,      "%s<QuantizationComponent Marker=\"QCC\" Component=\"%d\">\n", s, compno); /* Required in main header, single occurrence */
+    tccp = &j2k_default_tcp->tccps[0];
+    /* Not retained or perhaps of interest: Lqcd   It maybe can be calculated.  */
+    fprintf(xmlout,      "%s  <Sqcc>\n", s);		/* 1 byte */
+    if(notes)
+      fprintf(xmlout,    "%s  <!-- Quantization style for this component. -->\n", s);
+	if(raw)
+      fprintf(xmlout,    "%s    <AsHex>0x%02x</AsHex>\n", s, (tccp->numgbits) << 5 | tccp->qntsty);
+	if(derived)
+      fprintf(xmlout,    "%s    <QuantizationStyle>%d</QuantizationStyle>\n", s, tccp->qntsty);
+	if(notes) {
+      fprintf(xmlout,    "%s    <!-- Quantization style (in Sqcc's low 5 bits) may be: -->\n", s);
+      fprintf(xmlout,    "%s    <!--   0 = No quantization. SPqcc size = 8 bits-->\n", s);
+      fprintf(xmlout,    "%s    <!--   1 = Scalar derived (values signaled for N(L)LL subband only). Use Eq. E.5. SPqcc size = 16. -->\n", s);
+      fprintf(xmlout,    "%s    <!--   2 = Scalar expounded (values signaled for each subband). SPqcc size = 16. -->\n", s);
+	}
+	if(derived)
+      fprintf(xmlout,    "%s    <NumberOfGuardBits>%d</NumberOfGuardBits>\n", s,	tccp->numgbits);
+    if(notes)
+      fprintf(xmlout,    "%s    <!-- 0-7 guard bits allowed (stored in Sqcc's high 3 bits) -->\n", s);
+    fprintf(xmlout,      "%s  </Sqcc>\n", s);
+	  
+    /* Problem: numbands in some cases is calculated from len, which is not retained or available here at this time */
+    /* So we'll just dump all internal values */
+    fprintf(xmlout,      "%s  <SPqcc>\n", s);
+    switch(tccp->qntsty) {
+    case J2K_CCP_QNTSTY_NOQNT:
+      numbands = J2K_MAXBANDS; /* should be: numbands = len - 1; */
+	  /* Better: IMAGINE numbands = tccp->stepsize_numbands; */
+
+      /* Instead look for first zero exponent, quit there.  Adequate? */
+      fprintf(xmlout,    "%s    <ReversibleStepSizeValue>\n", s);
+	  if(notes) {
+        fprintf(xmlout,  "%s    <!-- Current mj2_to_metadata implementation dumps entire internal table, -->\n", s);
+	    fprintf(xmlout,  "%s    <!-- until an exponent with zero value is reached. -->\n", s);
+	    fprintf(xmlout,  "%s    <!-- Exponent epsilon(b) of reversible dynamic range. -->\n", s);
+	    fprintf(xmlout,  "%s    <!-- Hex value is as stored, in high-order 5 bits. -->\n", s);
+	  }
+      for (bandno = 0; bandno < numbands; bandno++) {
+        if(tccp->stepsizes[bandno].expn == 0)
+          break; /* Remove this once we have real numbands */
+        fprintf(xmlout,  "%s      <Exponent Subband=\"%d\">\n", s, bandno);
+		if(raw)
+          fprintf(xmlout,"%s        <AsHex>0x%02x</AsHex>\n", s, tccp->stepsizes[bandno].expn << 3);
+		if(derived)
+          fprintf(xmlout,"%s        <AsDecimal>%d</AsDecimal>\n", s, tccp->stepsizes[bandno].expn);
+        fprintf(xmlout,  "%s      </Exponent>\n", s);
+      }
+      fprintf(xmlout,    "%s    </ReversibleStepSizeValue>\n", s);
+      break;
+    case J2K_CCP_QNTSTY_SIQNT:
+      /* numbands = 1; */
+      fprintf(xmlout,    "%s    <QuantizationStepSizeValues>\n", s);
+      if(notes)
+        fprintf(xmlout,  "%s    <!-- For irreversible transformation only.  See Part I Annex E Equation E.3 -->\n", s);
+      fprintf(xmlout,    "%s      <QuantizationValuesForSubband0>\n", s);
+      if(notes)
+        fprintf(xmlout,  "%s      <!-- For N(L)LL subband: >\n", s);
+	  if(raw)
+        fprintf(xmlout,  "%s        <AsHex>0x%02x</AsHex>\n", s, (tccp->stepsizes[0].expn << 11) | tccp->stepsizes[0].mant);
+	  if(derived) {
+        fprintf(xmlout,  "%s        <Exponent>%d</Exponent>\n", s, tccp->stepsizes[0].expn);
+        fprintf(xmlout,  "%s        <Mantissa>%d</Mantissa>\n", s, tccp->stepsizes[0].mant);
+	  }
+      fprintf(xmlout,    "%s      </QuantizationValuesForSubband0>\n", s);
+	  if(notes) {
+        fprintf(xmlout,  "%s      <!-- Exponents for subbands beyond 0 are not from header, but calculated per Eq. E.5 -->\n", s);
+        fprintf(xmlout,  "%s      <!-- The mantissa for all subbands is the same, given by the value above. -->\n", s);
+        fprintf(xmlout,  "%s      <!-- Current mj2_to_metadata implementation dumps entire internal table, -->\n", s);
+	    fprintf(xmlout,  "%s      <!-- until a subband with exponent of zero value is reached. -->\n", s);
+        }
+
+      for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) {
+        if(tccp->stepsizes[bandno].expn == 0)
+          break;
+
+        fprintf(xmlout,  "%s      <CalculatedExponent Subband=\"%d\">%d</CalculatedExponent>\n", s, bandno, tccp->stepsizes[bandno].expn);
+      }
+      fprintf(xmlout,    "%s    </QuantizationStepSizeValues>\n", s);
+      break;
+
+    default: /* J2K_CCP_QNTSTY_SEQNT */
+      numbands = J2K_MAXBANDS; /* should be: (len - 1) / 2;*/
+	  /* Better: IMAGINE numbands = tccp->stepsize_numbands; */
+      fprintf(xmlout,    "%s    <QuantizationStepSizeValues>\n", s);
+      if(notes) {
+        fprintf(xmlout,  "%s    <!-- For irreversible transformation only.  See Part I Annex E Equation E.3 -->\n", s);
+        fprintf(xmlout,  "%s    <!-- Current mj2_to_metadata implementation dumps entire internal table, -->\n", s);
+	    fprintf(xmlout,  "%s    <!-- until a subband with mantissa and exponent of zero values is reached. -->\n", s);
+	  }
+      for (bandno = 0; bandno < numbands; bandno++) {
+        if(tccp->stepsizes[bandno].expn == 0 && tccp->stepsizes[bandno].mant == 0)
+			break; /* Remove this once we have real numbands count */
+        fprintf(xmlout,  "%s      <QuantizationValues Subband=\"%d\">\n", s, bandno);
+		if(raw)
+          fprintf(xmlout,"%s        <AsHex>0x%02x</AsHex>\n", s, (tccp->stepsizes[bandno].expn << 11) | tccp->stepsizes[bandno].mant);
+		if(derived) {
+          fprintf(xmlout,"%s        <Exponent>%d</Exponent>\n", s, tccp->stepsizes[bandno].expn);
+          fprintf(xmlout,"%s        <Mantissa>%d</Mantissa>\n", s, tccp->stepsizes[bandno].mant);
+		}
+        fprintf(xmlout,  "%s      </QuantizationValues>\n", s);
+      }
+      fprintf(xmlout,    "%s    </QuantizationStepSizeValues>\n", s);
+      break;
+    } /* switch */
+    fprintf(xmlout,      "%s  </SPqcc>\n", s);
+    fprintf(xmlout,      "%s</QuantizationComponent>\n", s);
+  }
+/*  Alignments:          "    < < < < <   To help maintain xml pretty-printing */  
+}
+
+/* ------------- */
+
+BOOL same_component_quantization(opj_tccp_t *tccp1, opj_tccp_t *tccp2)
+{
+  int bandno, numbands;
+
+  if(tccp1->qntsty != tccp2->qntsty)
+	  return FALSE;
+  if(tccp1->numgbits != tccp2->numgbits)
+	  return FALSE;
+
+  switch(tccp1->qntsty) {
+    case J2K_CCP_QNTSTY_NOQNT:
+      numbands = J2K_MAXBANDS; /* should be: numbands = len - 1; */
+      /* Instead look for first zero exponent, quit there.  Adequate? */
+      for (bandno = 0; bandno < numbands; bandno++) {
+        if(tccp1->stepsizes[bandno].expn == 0)
+          break;
+        if(tccp1->stepsizes[bandno].expn != tccp2->stepsizes[bandno].expn)
+         return FALSE;
+      }
+      break;
+    case J2K_CCP_QNTSTY_SIQNT:
+      /* numbands = 1; */
+      if(tccp1->stepsizes[0].expn != tccp2->stepsizes[0].expn || tccp1->stepsizes[0].mant != tccp2->stepsizes[0].mant)
+        return FALSE;
+	  /* Don't need to check remainder, since they are calculated from [0] */
+      break;
+
+    default: /* J2K_CCP_QNTSTY_SEQNT */
+      numbands = J2K_MAXBANDS; /* should be: (len - 1) / 2;*/
+	  /* This comparison may cause us problems with trailing junk values. */
+      for (bandno = 0; bandno < numbands; bandno++) {
+        if(tccp1->stepsizes[bandno].expn != tccp2->stepsizes[bandno].expn || tccp1->stepsizes[bandno].mant != tccp2->stepsizes[bandno].mant);
+          return FALSE;
+      }
+      break;
+    } /* switch */
+  return TRUE;
+}
+
+/* ------------- */
+
+void xml_out_frame_rgn(FILE* xmlout, opj_tcp_t *tcp, int numcomps)
+{
+  int compno, SPrgn;
+  /* MJ2 files can have regions of interest if hybridized with JPX Part II */
+  char spaces[13] = "            "; /* 12 spaces if tilepart*/
+  char* s = spaces;
+  if(tcp == j2k_default_tcp) {
+    s++;s++; /* shorten s to 10 spaces if main */
+  }
+
+  for(compno = 0; compno < numcomps; compno++) {
+    SPrgn = tcp->tccps[compno].roishift;	/* 1 byte; SPrgn */
+    if(SPrgn == 0)
+		continue; /* Yet another kludge */
+
+    fprintf(xmlout,    "%s<RegionOfInterest Marker=\"RGN\">\n", s); /* Optional in main header, at most 1 per component */
+    if(notes)
+      fprintf(xmlout,  "%s<!-- See Crgn below for zero-based component number. -->\n", s);
+    /* Not retained or of interest: Lrgd */
+    fprintf(xmlout,    "%s  <Srgn>0</Srgn>\n", s); /* 1 byte */
+    if(notes)
+	  fprintf(xmlout,  "%s  <!-- Srgn is ROI style.  Only style=0 defined: Implicit ROI (max. shift) -->\n", s);
+    fprintf(xmlout,    "%s  <Crgn>%d</Crgn>\n", s, compno); /* 1 or 2 bytes */
+    fprintf(xmlout,    "%s  <SPrgn>%d</SPrgn>\n", s, SPrgn); /* 1 byte */
+    if(notes)
+      fprintf(xmlout,  "%s  <!-- SPrgn is implicit ROI shift, i.e., binary shifting of ROI coefficients above background. -->\n", s);
+    fprintf(xmlout,    "</RegionOfInterest\n", s); /* Optional in main header, at most 1 per component */
+  }
+}
+
+/* ------------- */
+
+void xml_out_frame_poc(FILE* xmlout, opj_tcp_t *tcp) { /* Progression Order Change */
+  /* Compare j2k_read_poc() */
+  int i;
+  opj_poc_t *poc;
+  char spaces[13] = "            "; /* 12 spaces if tilepart*/
+  char* s = spaces;
+  if(tcp == j2k_default_tcp) {
+    s++;s++; /* shorten s to 10 spaces if main */
+  }
+  
+  if(tcp->POC != 1)
+	  return; /* Not present */
+
+  fprintf(xmlout,    "%s<ProgressionOrderChange Marker=\"POC\">\n", s); /* Optional in main header, at most 1 per component */
+  /* j2k_read_poc seems to allow accumulation of default pocs from multiple POC segments, but does
+  the spec really allow that? */
+  /* 2 bytes, not retained; Lpoc */
+  /* I probably didn't get this dump precisely right. */
+  for (i = 0; i < tcp->numpocs; i++) {
+    poc = &tcp->pocs[i];
+    fprintf(xmlout,  "%s  <Progression Num=\"%d\">\n", s, i+1);
+    fprintf(xmlout,  "%S    <RSpoc>%d</RSpoc>\n", s, poc->resno0);	/* 1 byte, RSpoc_i */
+    if(notes)
+	  fprintf(xmlout,"%s    <!-- Resolution level index (inclusive) for progression start. Range: 0 to 33 -->\n", s);
+    fprintf(xmlout,  "%s    <CSpoc>%d</CSpoc>\n", s, poc->compno0);/* j2k_img->numcomps <= 256 ? 1 byte : 2 bytes; CSpoc_i */
+    if(notes)
+      fprintf(xmlout,"%s    <!-- Component index (inclusive) for progression start. -->\n", s);
+    fprintf(xmlout,  "%s    <LYEpoc>%d</LYEpoc>\n", s, poc->layno1); /* int_min(cio_read(2), tcp->numlayers);	/* 2 bytes; LYEpoc_i */
+    if(notes)
+      fprintf(xmlout,"%s    <!-- Layer index (exclusive) for progression end. -->\n", s);
+    fprintf(xmlout,  "%s    <REpoc>%d</REpoc>\n", s, poc->resno1); /*int_min(cio_read(1), tccp->numresolutions);	/* REpoc_i */
+    if(notes)
+      fprintf(xmlout,"%s    <!-- Resolution level index (exclusive) for progression end. Range: RSpoc to 33 -->\n", s);
+    fprintf(xmlout,  "%s    <CEpoc>%d</CEpoc>\n", s, poc->compno1); /* int_min(cio_read(j2k_img->numcomps <= 256 ? 1 : 2), j2k_img->numcomps);	/* CEpoc_i */
+    if(notes)
+	  fprintf(xmlout,"%s    <!-- Component index (exclusive) for progression end.  Minimum: CSpoc -->\n", s);
+    fprintf(xmlout,  "%s    <Ppoc>%d</Ppoc>\n", s, poc->prg); /* 1 byte Ppoc_i */
+	if(notes) {
+      fprintf(xmlout,"%s    <!-- Defined Progression Order Values are: -->\n", s);
+      fprintf(xmlout,"%s    <!-- 0 = LRCP; 1 = RLCP; 2 = RPCL; 3 = PCRL; 4 = CPRL -->\n", s);
+      fprintf(xmlout,"%s    <!-- where L = \"layer\", R = \"resolution level\", C = \"component\", P = \"position\". -->\n", s);
+	}
+    fprintf(xmlout,  "%s  </Progression>\n", s);
+  }
+  fprintf(xmlout,    "%s</ProgressionOrderChange\n", s);
+}
+
+/* ------------- */
+
+#ifdef SUPPRESS_FOR_NOW
+/* Suppress PPM and PPT since we're not showing data from the third option, namely within the codestream, and
+that's evidently what frames_to_mj2 uses.  And a hex dump isn't so useful anyway */
+
+void xml_out_frame_ppm(FILE *xmlout, opj_cp_t *cp) { /* For main header, not tile-part (which uses PPT instead). */
+/* Either the PPM or PPT is required if the packet headers are not distributed in the bit stream */
+/* Use of PPM and PPT are mutually exclusive. */
+/* Compare j2k_read_ppm() */
+  int j;
+  
+  if(cp->ppm != 1)
+	  return; /* Not present */
+/* Main header uses indent of 10 spaces */
+  fprintf(xmlout,    "          <PackedPacketHeadersMainHeader Marker=\"PPM\">\n"); /* Optional in main header, but if not, must be in PPT or codestream */
+  /* 2 bytes Lppm not saved */
+  if(notes) {
+    fprintf(xmlout,  "          <!-- If there are multiple PPM marker segments in the main header, -->\n");
+    fprintf(xmlout,  "          <!-- this mj2_to_metadata implementation will report them as a single consolidated PPM header. -->\n");
+    fprintf(xmlout,  "          <!-- The implementation can't currently segregate by tile-part. -->\n");
+    fprintf(xmlout,  "          <!-- TO DO? further map the packet headers to xml. -->\n");
+  }
+ 
+  /* 1 byte, not retained ; Zppm is sequence # of this PPM header */
+  /* 4 bytes, possibly overwritten multiple times in j2k_cp->ppm_previous: Nppm */
+  /* Use j symbol for index instead of i, to make comparable with j2k_read_ppm */
+  /* Not real clear whether to use ppm->store or ppm_len as upper bound */
+  fprintf(xmlout,    "            <PackedData>\n");
+  xml_out_dump_hex(xmlout, cp->ppm_data, cp->ppm_len);
+  /* Dump packet headers 1 byte at a time: lppm[i][j] */
+  fprintf(xmlout,    "            </PackedData>\n");
+  fprintf(xmlout,    "          </PackedPacketHeadersMainHeader>\n"); /* Optional in main header, but if not, must be in PPT or codestream */
+}
+
+/* ------------- */
+
+void xml_out_frame_ppt(FILE *xmlout, opj_tcp_t *tcp) { /* For tile-part header, not main (which uses PPM instead). */
+/* Either the PPM or PPT is required if the packet headers are not distributed in the bit stream */
+/* Use of PPM and PPT are mutually exclusive. */
+/* Compare j2k_read_ppt() */
+  int j;
+  
+  if(tcp->ppt != 1)
+	  return; /* Not present */
+
+  /* Tile-part indents are 12 spaces */
+  fprintf(xmlout,    "            <PackedPacketHeadersTilePartHeader Marker=\"PPT\">\n"); /* Optional in main header, but if not, must be in PPT or codestream */
+  /* 2 bytes Lppm not saved */
+  if(notes) {
+    fprintf(xmlout,  "            <!-- If there are multiple PPT marker segments in the tile-part header, -->\n");
+    fprintf(xmlout,  "            <!-- this mj2_to_metadata implementation will report them as a single consolidated PPT header. -->\n");
+    fprintf(xmlout,  "            <!-- The implementation can't currently segregate by tile-part. -->\n");
+    fprintf(xmlout,  "            <!-- TO DO? further map the packet headers to xml. -->\n");
+  }
+ 
+  /* 1 byte, not retained ; Zppt is sequence # of this PPT header */
+  /* 4 bytes, possibly overwritten multiple times in j2k_cp->ppt_previous: Nppt */
+  /* Use j symbol for index instead of i, to make comparable with j2k_read_ppt */
+  /* Not real clear whether to use ppt->store or ppt_len as upper bound */
+  fprintf(xmlout,    "              <PackedData>\n");
+  xml_out_dump_hex(xmlout, tcp->ppt_data, tcp->ppt_len);
+  /* Dump packet headers 1 byte at a time: lppt[i][j] */
+  fprintf(xmlout,    "              </PackedData>\n");
+  fprintf(xmlout,    "            </PackedPacketHeadersTileHeader>\n"); /* Optional in tile-part header, but if not, must be in PPM or codestream */
+}
+#endif SUPPRESS_FOR_NOW
+
+/* ------------- */
+
+void xml_out_frame_tlm(FILE* xmlout) { /* opt, main header only.  May be multiple. */
+/* Compare j2k_read_tlm()... which doesn't retain anything! */
+/* Plan:  Since this is only called from main header, not tilepart, use global j2k_default_tcp rather than parameter */
+/* Main header indents are 10 spaces */
+}
+
+/* ------------- */
+
+void xml_out_frame_plm(FILE* xmlout) { /* opt, main header only; can be used in conjunction with tile-part's PLT */
+/* NO-OP.  PLM NOT SAVED IN DATA STRUCTURE */
+	/* Compare j2k_read_plm()... which doesn't retain anything! */
+/* Plan:  Since this is only called from main header, not tilepart, use global j2k_default_tcp rather than parameter */
+/* Main header indents are 10 spaces */
+}
+
+/* ------------- */
+
+void xml_out_frame_plt(FILE* xmlout, opj_tcp_t *tcp) { /* opt, tile-part headers only; can be used in conjunction with main header's PLM */
+/* NO-OP.  PLT NOT SAVED IN DATA STRUCTURE */
+	/* Compare j2k_read_plt()... which doesn't retain anything! */
+/* Tile-part header indents are 12 spaces */
+}
+
+/* ------------- */
+
+void xml_out_frame_crg(FILE* xmlout) { /* NO-OP.  CRG NOT SAVED IN DATA STRUCTURE */ /* opt, main header only; */
+/* Compare j2k_read_crg()... which doesn't retain anything! */
+/* Plan:  Since this is only called from main header, not tilepart, use global j2k_default_tcp rather than parameter */
+#ifdef NOTYET
+  THIS PSEUDOCODE IMAGINES THESE EXIST: j2k_default_tcp->crg, j2k_default_tcp->crg_i, j2k_default_tcp->crg_xcrg*, j2k_default_tcp->crg_ycrg* 
+  (POSSIBLY DON'T NEED crg_i, CAN GET NUMBER OR COMPONENTS FROM ELSEWHERE)
+  if(j2k_default_tcp->crg != 1 || j2k_default_tcp->crg_i == 0)
+	  return; /* Not present */
+
+/* Main header indents are 10 spaces */
+  fprintf(xmlout,    "          <ComponentRegistration Marker=\"RG\" Count=\"%d\">\n", j2k_default_tcp->crg_i);
+  if(notes) {
+    fprintf(xmlout,  "          <!-- Fine tuning of registration of components with respect to each other, -->\n");
+    fprintf(xmlout,  "          <!-- not required but potentially helpful for decoder. -->\n");
+    fprintf(xmlout,  "          <!-- These supplementary fractional offsets are in units of 1/65536 of the horizontal -->\n");
+    fprintf(xmlout,  "          <!-- or vertical separation (e.g., XRsiz[i] or YRsiz[i] for component i). -->\n");
+  }
+  /* This isn't the most compact form of table, but is OK when number of components is small, as is likely. */
+  for (i = 0; i < j2k_default_tcp->crg_i; i++) {
+    fprintf(xmlout,  "            <Component Num=\"%d\">\n", i+1);
+    fprintf(xmlout,  "              <Xcrg>\n");
+	if(raw)
+      fprintf(xmlout,"                <AsNumerator>%d</AsNumerator>\n", j2k_default_tcp->crg_xcrg[i]);
+	if(derived) {
+	  /* Calculate n * 100%/65536; 4 digits after decimal point is sufficiently accurate */
+      fprintf(xmlout,"                <AsPercentage>%.4f</AsPercentage>\n", ((double)j2k_default_tcp->crg_xcrg[i])/655.36);
+	  /* We could do another calculation that include XRsiz[i]; maybe later. */
+	}
+    fprintf(xmlout,  "              </Xcrg>\n");
+    fprintf(xmlout,  "              <Ycrg>\n");
+	if(raw)
+      fprintf(xmlout,"                <AsNumerator>%d</AsNumerator>\n", j2k_default_tcp->crg_ycrg[i]);
+	if(derived) {
+      fprintf(xmlout,"                <AsPercentage>%f</AsPercentage>\n", ((double)j2k_default_tcp->crg_ycrg[i])/655.36);
+	}
+    fprintf(xmlout,  "              </Ycrg>\n");
+    fprintf(xmlout,  "            </Component>\n");
+  }
+
+  fprintf(xmlout,    "          </ComponentRegistration>\n");
+
+#endif
+}
+
+/* ------------- */
+
+/* Regrettably from a metadata point of view, j2k_read_com() skips over any comments in main header or tile-part-header */
+void xml_out_frame_com(FILE* xmlout, opj_tcp_t *tcp) { /* NO-OP.  COM NOT SAVED IN DATA STRUCTURE */ /* opt in main or tile-part headers; */
+/* Compare j2k_read_com()... which doesn't retain anything! */
+#ifdef NOTYET
+  char spaces[13] = "            "; /* 12 spaces if tilepart*/
+  char* s = spaces;
+  if(tcp == &j2k_default_tcp) {
+    s++;s++; /* shorten s to 10 spaces if main */
+  }
+  THIS PSEUDOCODE IMAGINES THESE EXIST: tcp->com, tcp->com_len, tcp->com_data array 
+  if(tcp->com != 1)
+	  return; /* Not present */
+
+  fprintf(xmlout,    "%s<Comment Marker=\"COM\">\n", s); /* Optional in main or tile-part header */
+  xml_out_dump_hex_and_ascii(tcp->com_data, tcp->com_len, s);
+  fprintf(xmlout,    "%s</Comment>\n", s);
+#endif
+}
+
+void xml_out_dump_hex(FILE* xmlout, char *data, int data_len, char* s) {
+  /* s is a string of spaces for indent */
+  int i;
+  
+  /* This is called when raw is true, or there is no appropriate derived form */
+  fprintf(xmlout,    "%s<AsHex>\n", s);
+  fprintf(xmlout,    "%s  ", s); /* Inadequate for pretty printing */
+  for (i = 0; i < data_len; i++) {	/* Dump packet headers */
+    fprintf(xmlout,  "%02x", data[i]);
+  }
+  fprintf(xmlout,    "%s</AsHex>\n", s);
+}
+
+/* Define this as an even number: */
+#define BYTES_PER_DUMP_LINE 40
+/* Current total width for Hex and ASCII is : 11 spaces lead + (3 * BPDL) + 2 spaces + BPDL */
+void xml_out_dump_hex_and_ascii(FILE* xmlout, char *data, int data_len, char* s) {
+  /* s is a string of spaces for indent */
+  int i,j;
+  
+  if(raw)
+    xml_out_dump_hex(xmlout, data, data_len, s);
+
+  if(derived) {
+    fprintf(xmlout,  "%s<AsHexAndASCII>\n", s);
+	for (i = 0; i < data_len; ) {
+      fprintf(xmlout,"%s ", s); /* Additional leading space added in loop */
+	  /* First column: hex */
+      for (j = 0; j < BYTES_PER_DUMP_LINE; j++)	/* Dump bytes */
+        fprintf(xmlout," %02x", data[i+j]);
+      /* Space between columns... */ fprintf(xmlout,  "  ");
+	  /* Second column: ASCII */
+	  for (j = 0; j < BYTES_PER_DUMP_LINE; j++, i++) {
+	    if(isprint((int)data[i]) && i < data_len)
+          fprintf(xmlout,"%c", data[i]);
+	    else
+	      fprintf(xmlout," ");
+      }
+      /* If we also wanted to output UCS-2 Unicode as a third column, then entire document
+      must use fwprintf.  Forget about it for now.  As it stands, if data is UCS-2 format but still
+      the ASCII set, then we'll be able to read every other byte as ASCII in column 2.  If
+      data is UTF-8 format but still ASCII, then we'll be able to read every byte as ASCII
+      in column 2. */
+    }
+    fprintf(xmlout,  "%s</AsHexAndASCII>\n", s);
+  }
+}
+
+
+/* ------------- */
+
+void xml_out_frame_jp2h(FILE* xmlout, opj_jp2_t *jp2_struct) {  /* JP2 Header */
+/* Compare jp2_read_jp2h(opj_jp2_t * jp2_struct) */
+  int i;
+
+  fprintf(xmlout,      "              <JP2Header BoxType=\"jp2h\">\n");
+
+/* Compare jp2_read_ihdr(jp2_struct)) */
+  fprintf(xmlout,      "                <ImageHeader BoxType=\"ihdr\">\n");
+  fprintf(xmlout,      "                  <HEIGHT>%d</HEIGHT>\n", jp2_struct->h); /* 4 bytes */
+  fprintf(xmlout,      "                  <WIDTH>%d</WIDTH>\n", jp2_struct->w); /* 4 bytes */
+  if(notes)
+    fprintf(xmlout,    "                  <!-- HEIGHT here, if 2 fields per image, is of total deinterlaced height. -->\n");
+  fprintf(xmlout,      "                  <NC>%d</NC>\n", jp2_struct->numcomps); /* 2 bytes */
+  if(notes)
+    fprintf(xmlout,    "                  <!-- NC is number of components -->\n"); /* 2 bytes */
+  fprintf(xmlout,      "                  <BPC>\n"); /* 1 byte */
+  if(jp2_struct->bpc == 255) {
+    fprintf(xmlout,    "                    <AsHex>0x%02x</AsHex>\n", jp2_struct->bpc); /* 1 byte */
+    if(notes)
+      fprintf(xmlout,  "                    <!-- BPC = 0xff means bits per pixel varies with component; see table below. -->\n");
+  } else { /* Not 0xff */
+    if(raw) {
+      fprintf(xmlout,  "                    <AsHex>0x%02x</AsHex>\n", jp2_struct->bpc); /* 1 byte */
+      if(notes)
+        fprintf(xmlout,"                    <!-- BPC = 0xff means bits per pixel varies with component; see table below. -->\n");
+	}
+    if(derived) {
+      fprintf(xmlout,  "                    <BitsPerPixel>%d</BitsPerPixel>\n", jp2_struct->bpc & 0x7f);
+      fprintf(xmlout,  "                    <Signed>%d</Signed>\n", jp2_struct->bpc >> 7);
+	}
+  }
+  fprintf(xmlout,      "                  </BPC>\n");
+  fprintf(xmlout,      "                  <C>%d</C>\n", jp2_struct->C); /* 1 byte */
+  if(notes)
+    fprintf(xmlout,    "                  <!-- C is compression type.  Only \"7\" is allowed to date. -->\n"); /* 2 bytes */
+  fprintf(xmlout,      "                  <UnkC>%d</UnkC>\n", jp2_struct->UnkC); /* 1 byte */
+  if(notes)
+    fprintf(xmlout,    "                  <!-- Colourspace Unknown. 1 = unknown, 0 = known (e.g., colourspace spec is accurate) -->\n"); /* 1 byte */
+  fprintf(xmlout,      "                  <IPR>%d</IPR>\n", jp2_struct->IPR); /* 1 byte */
+  if(notes)
+    fprintf(xmlout,    "                  <!-- IPR is 1 if frame contains an Intellectual Property box; 0 otherwise. -->\n"); /* 2 bytes */
+  fprintf(xmlout,      "                </ImageHeader>\n");
+
+  if (jp2_struct->bpc == 255)
+  {
+    fprintf(xmlout,    "                <BitsPerComponent BoxType=\"bpcc\">\n");
+    if(notes)
+      fprintf(xmlout,  "                <!-- Pixel depth (range 1 to 38) is low 7 bits of hex value + 1 -->\n");
+	/* Bits per pixel varies with components */
+    /* Compare jp2_read_bpcc(jp2_struct) */
+	for (i = 0; i < (int)jp2_struct->numcomps; i++) {
+	  if(raw)
+        fprintf(xmlout,"                  <AsHex>0x%02x</AsHex>\n", jp2_struct->comps[i].bpcc); /* 1 byte */
+	  if(derived) {
+        fprintf(xmlout,"                  <BitsPerPixel>%d</BitsPerPixel>\n", (jp2_struct->comps[i].bpcc & 0x7f)+1);
+        fprintf(xmlout,"                  <Signed>%d</Signed>\n", jp2_struct->comps[i].bpcc >> 7);
+	  }
+	}
+    fprintf(xmlout,    "                </BitsPerComponent>\n");
+  }
+
+  /* Compare jp2_read_colr(jp2_struct) */
+  fprintf(xmlout,      "                <ColourSpecification BoxType=\"colr\">\n");
+  fprintf(xmlout,      "                  <METH>%d</METH>\n", jp2_struct->meth); /* 1 byte */
+  if(notes) {
+    fprintf(xmlout,    "                  <!-- Valid values of specification method so far: -->\n");
+    fprintf(xmlout,    "                  <!--   1 = Enumerated colourspace, in EnumCS field -->\n");
+    fprintf(xmlout,    "                  <!--   2 = Restricted ICC Profile, in PROFILE field -->\n");
+  }
+  fprintf(xmlout,      "                  <PREC>%d</PREC>\n", jp2_struct->precedence); /* 1 byte */
+  if(notes)
+    fprintf(xmlout,    "                  <!-- 0 is only valid value of precedence so far. -->\n");
+  fprintf(xmlout,      "                  <APPROX>%d</APPROX>\n", jp2_struct->approx); /* 1 byte */
+  if(notes)
+    fprintf(xmlout,    "                  <!-- 0 is only valid value of colourspace approximation so far. -->\n");
+
+  if (jp2_struct->meth == 1) {
+    fprintf(xmlout,    "                  <EnumCS>%d</EnumCS>\n", jp2_struct->enumcs); /* 4 bytes */
+	if(notes) {
+	  fprintf(xmlout,  "                  <!-- Valid values of enumerated MJ2 colourspace so far: -->\n");
+	  fprintf(xmlout,  "                  <!--   16: sRGB as defined by IEC 61966-2-1. -->\n");
+	  fprintf(xmlout,  "                  <!--   17: greyscale (related to sRGB). -->\n");
+	  fprintf(xmlout,  "                  <!--   18: sRGB YCC (from JPEG 2000 Part II). -->\n");
+	  fprintf(xmlout,  "                  <!-- (Additional JPX values are defined in Part II). -->\n");
+	}
+  }
+  else
+    if(notes)
+      fprintf(xmlout,  "                  <!-- PROFILE is not handled by current OpenJPEG implementation. -->\n");
+    /* only 1 byte is read and nothing stored */
+  fprintf(xmlout,      "                </ColourSpecification>\n");
+
+  /* TO DO?  No OpenJPEG support.
+  Palette 'pclr'
+  ComponentMapping 'cmap'
+  ChannelDefinition 'cdef'
+  Resolution 'res'
+  */
+  fprintf(xmlout,      "              </JP2Header>\n");
+}
+/* ------------- */
+
+#ifdef NOTYET
+IMAGE these use cp structure, extended... but we could use a new data structure instead
+void xml_out_frame_jp2i(FILE* xmlout, opj_cp_t *cp) {
+  /* IntellectualProperty 'jp2i' (no restrictions on location) */
+  int i;
+  IMAGE cp->jp2i, cp->jp2i_count, cp->jp2i_data (array of chars), cp->cp2i_len (array of ints)
+  if(cp->jp2i != 1)
+	  return; /* Not present */
+
+  for(i = 0; i < cp->jp2i_count; i++)
+  {
+    fprintf(xmlout,      "            <IntellectualProperty BoxType=\"jp2i\">\n");
+  /* I think this can be anything, including binary, so do a dump */
+    /* Is it better to indent or not indent this content?  Indent is better for reading, but
+    worse for cut/paste. */
+    xml_out_dump_hex_and_ascii(xmlout, cp->jp2i_data[i], cp->jp2i_len[i]);
+    fprintf(xmlout,      "            </IntellectualProperty>\n");
+  }
+}
+
+void xml_out_frame_xml(FILE* xmlout, opj_cp_t *cp) {
+  /* XML 'xml\040' (0x786d6c20).  Can appear multiply, before or after jp2c codestreams */
+  IMAGE cp->xml, cp->xml_count, cp->xml_data (array of chars)
+  MAYBE WE DON'T NEED cp->xml_len (array of ints) IF WE ASSUME xml_data IS NULL-TERMINATED.
+  ASSUME ASSUME EACH LINE IS ENDED BY \n.
+  int i;
+  if(cp->xml != 1)
+	  return; /* Not present */
+
+  for(i = 0; i < cp->xml_count; i++)
+  {
+    fprintf(xmlout,      "            <TextFormXML BoxType=\"xml[space]" Instance=\"%d\">\n", i+1);
+    /* Is it better to indent or not indent this content?  Indent is better for reading, but
+    worse for cut/paste. Being lazy, didn't indent here. */
+    fprintf(xmlout,cp->xml_data[i]); /* May be multiple lines */ /* Could check if this is well-formed */
+    fprintf(xmlout,      "            </TextFormXML>\n");
+  }
+}
+
+void xml_out_frame_uuid(FILE* xmlout, opj_cp_t *cp) {
+	/* UUID 'uuid' (top level only) */
+	/* Part I 1.7.2 says: may appear multiply in JP2 file, anywhere except before File Type box */
+	/* Part III 5.2.1 says: Private extensions shall be achieved through the 'uuid' type. */
+	/* A UUID is a 16-byte value.  There is a conventional string representation for it:
+	   "0x12345678-9ABC-DEF0-1234-567890ABCDEF".  Let's assume that is what is stored in uuid_value */
+
+	/* Part III 6.1 Any other MJ2 box type could be alternatively written as a 'uuid' box, with value given
+	   as : 0xXXXXXXXX-0011-0010-8000-00AA00389B71, where the Xs are the boxtype in hex.  However,
+	   such a file is "not compliant; systems may choose to read [such] objects ... as equivalent to the box of
+	   the same type, or not."  Here, we choose not to. */
+  int i;
+  IMAGE cp->uuid, cp->uuid_count, cp->uuid_value (array of uuids... let's say fixed-length strings) cp->uuid_data (array of char buffers), cp->uuid_len (array of ints)
+  if(cp->juuid != 1)
+	  return; /* Not present */
+
+  for(i = 0; i < cp->uuid_count; i++)
+  {
+    fprintf(xmlout,      "            <UniversalUniqueID BoxType=\"uuid\">
+	fprintf(xmlout,      "              <UUID>%s</UUDI>\n", cp->uuid_value[i]);
+	fprintf(xmlout,      "              <Data>\n");
+  /* I think this can be anything, including binary, so do a dump */
+    /* Is it better to indent or not indent this content?  Indent is better for reading, but
+    worse for cut/paste. */
+    xml_out_dump_hex_and_ascii(xmlout, cp->uuid_data[i], cp->uuid_len[i]);
+	fprintf(xmlout,      "              </Data>\n");
+    fprintf(xmlout,      "            </UniversalUniqueID>\n");
+  }
+}
+
+void xml_out_frame_uinf(FILE* xmlout, opj_cp_t *cp) {
+	/* UUIDInfo 'uinf', includes UUIDList 'ulst' and URL 'url\40' */
+	/* Part I 1.7.3 says: may appear multiply in JP2 file, anywhere at the top level except before File Type box */
+	/* So there may be multiple ulst's, and each can have multiple UUIDs listed (with a single URL) */
+	/* This is not quite as vendor-specific as UUIDs, or at least is meant to be generally readable */
+	/* Assume UUIDs stored in canonical string format */
+  int i, j;
+  IMAGE cp->uinf, cp->uinf_count, cp->uinf_ulst_nu (array of ints)
+    cp->uinf_uuid (2 dimensional array of uuids... let's say fixed-length strings),
+    cp->uinf_url (array of char buffers)
+
+  if(cp->uinf != 1)
+	  return; /* Not present */
+
+  for(i = 0; i < cp->uuid_count; i++)
+  {
+    fprintf(xmlout,      "            <UUIDInfo BoxType=\"uinf\">\n");
+    fprintf(xmlout,      "              <UUIDList BoxType=\"ulst\" Count=\"%d\">\n",cp->cp->uinf_ulst_nu[i]);
+	for(j = 0; j < cp->uinf_ulst_nu[i];  j++)
+	  fprintf(xmlout,    "              <ID Instance=\"%s\">%s</ID>\n", cp->uuif_uuid[i][j], j+1);
+    fprintf(xmlout,      "              </UUIDList>\n");
+	fprintf(xmlout,      "              <DataEntryURL>\n");
+	/* Could add VERS and FLAG here */
+	fprintf(xmlout,      "                <LOC>\n");
+    fprintf(xmlout,      "                  %s",cp->uinf_url[i]); /* Probably single line, so indent works */ /* In theory, could check if this is well-formed, or good live link */
+	fprintf(xmlout,      "                </LOC>\n");
+	fprintf(xmlout,      "              </DataEntryURL>\n");
+    fprintf(xmlout,      "            </UUIDInfo>\n");
+  }
+}
+
+IMAGE these use cp structure, extended... but we could use a new data structure instead
+void xml_out_frame_unknown_type(FILE* xmlout, opj_cp_t *cp) {
+  /* Part III 5.2.1 says "Type fields not defined here are reserved.  Private extensions
+     shall be acieved through the 'uuid' type." [This implies an unknown
+     type would be an error, but then...] "Boxes not explicitly defined in this standard,
+	 or otherwise unrecognized by a reader, may be ignored."
+	 Also, it says  "the following types are not and will not be used, or used only in
+	 their existing sense, in future versions of this specification, to avoid conflict
+	 with existing content using earlier pre-standard versions of this format:
+	   clip, crgn, matt, kmat, pnot, ctab, load, imap;
+	   track reference types tmcd, chap, sync,scpt, ssrc"
+	 [But good luck figuring out the mapping.]
+	 Part III Amend. 2 4.1 is stronger: "All these specifications [of this family, e.g.,
+	 JP2 Part I, ISO Base format (Part 12) leading to MP4, Quicktime, and possibly including
+	 MJ2] require that readers ignore objects that are unrecognizable to them".
+	 */
+  int i;
+  IMAGE cp->unknown_type, cp->unknown_type_count, cp->unknown_type_boxtype (array of buf[5]s), cp->unknown_type_data (array of chars), cp->unknown_type_len (array of ints)
+  if(cp->unknown_type != 1)
+	  return; /* Not present */
+
+  for(i = 0; i < cp->unknown_type_count; i++)
+  {
+    fprintf(xmlout,      "            <UnknownType BoxType=\"%s\">\n", cp->unknown_type_boxtype[i]);
+    /* Can be anything, including binary, so do a dump */
+    /* Is it better to indent or not indent this content?  Indent is better for reading, but
+    worse for cut/paste. */
+    xml_out_dump_hex_and_ascii(xmlout, cp->unknown_type_data[i], cp->unknown_type_len[i]);
+    fprintf(xmlout,      "            </UnknownType>\n");
+  }
+}
+
+#endif
diff --git a/src/bin/mj2/meta_out.h b/src/bin/mj2/meta_out.h
new file mode 100644
index 00000000..293316d1
--- /dev/null
+++ b/src/bin/mj2/meta_out.h
@@ -0,0 +1,13 @@
+/* meta_out.h */
+/* Dump MJ2, JP2 metadata (partial so far) to xml file */
+/* Callable from mj2_to_metadata */
+/* Contributed to Open JPEG by Glenn Pearson, U.S. National Library of Medicine */
+
+#define BOOL int
+#define FALSE 0
+#define TRUE 1
+
+void xml_write_init(BOOL n, BOOL t, BOOL r, BOOL d);
+
+int xml_write_struct(FILE *file, FILE *xmlout, opj_mj2_t * movie, unsigned int sampleframe, char* stringDTD, opj_event_mgr_t *event_mgr);
+
diff --git a/src/bin/mj2/mj2.c b/src/bin/mj2/mj2.c
new file mode 100644
index 00000000..f5ab5f3f
--- /dev/null
+++ b/src/bin/mj2/mj2.c
@@ -0,0 +1,2915 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * 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 OWNER 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.
+ */
+
+#include "opj_includes.h"
+#include "mj2.h"
+
+/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+/*
+* 
+* Read box headers
+*
+*/
+
+int mj2_read_boxhdr(mj2_box_t * box, opj_cio_t *cio)
+{
+  box->init_pos = cio_tell(cio);
+  box->length = cio_read(cio, 4);
+  box->type = cio_read(cio, 4);
+  if (box->length == 1) {
+    if (cio_read(cio, 4) != 0) {
+      opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Cannot handle box sizes higher than 2^32\n");
+      return 1;
+    };
+    box->length = cio_read(cio, 4);
+    if (box->length == 0) 
+      box->length = cio_numbytesleft(cio) + 12;
+  }
+  else if (box->length == 0) {
+    box->length = cio_numbytesleft(cio) + 8;
+  }
+  return 0;
+}
+
+/*
+* 
+* Initialisation of a Standard Movie, given a simple movie structure defined by the user 
+* The movie will have one sample per chunk
+* 
+* Arguments: opj_mj2_t * movie
+* Several variables of "movie" must be defined in order to enable a correct execution of 
+* this function:
+*   - The number of tracks of each type (movie->num_vtk, movie->num_stk, movie->num_htk)
+*   - The memory for each must be allocated (movie->tk)
+*   - For each track:
+*	  The track type (tk->track_type)
+*	  The number of sample (tk->num_samples)
+*	  The sample rate (tk->sample_rate)
+*
+*/
+
+int mj2_init_stdmovie(opj_mj2_t * movie)
+{
+  mj2_tk_t *tk0;
+  int i, w, h, prec;
+  unsigned int j;
+  time_t ltime;
+	
+  movie->brand = MJ2_MJ2;
+  movie->minversion = 0;
+  movie->num_cl = 2;
+  movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
+
+  movie->cl[0] = MJ2_MJ2;
+  movie->cl[1] = MJ2_MJ2S;
+  time(&ltime);			/* Time since 1/1/70 */
+  movie->creation_time = (unsigned int) ltime + 2082844800;	/* Seconds between 1/1/04 and 1/1/70 */
+  movie->timescale = 1000;
+	
+  movie->rate = 1 << 16;		/* Rate to play presentation  (default = 0x00010000)          */
+  movie->volume = 1 << 8;		/* Movie volume (default = 0x0100)                            */
+  movie->trans_matrix[0] = 0x00010000;	/* Transformation matrix for video                            */
+  movie->trans_matrix[1] = 0;	/* Unity is { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 }  */
+  movie->trans_matrix[2] = 0;
+  movie->trans_matrix[3] = 0;
+  movie->trans_matrix[4] = 0x00010000;
+  movie->trans_matrix[5] = 0;
+  movie->trans_matrix[6] = 0;
+  movie->trans_matrix[7] = 0;
+  movie->trans_matrix[8] = 0x40000000;
+  movie->next_tk_id = 1;
+
+  tk0 = &movie->tk[0];
+  w = tk0->w; h = tk0->h; prec = tk0->depth;
+
+	for (i = 0; i < movie->num_htk + movie->num_stk + movie->num_vtk; i++) 
+   {
+    mj2_tk_t *tk = &movie->tk[i];
+
+    movie->next_tk_id++;
+    tk->jp2_struct.comps = NULL;
+    tk->jp2_struct.cl = NULL;
+  
+    if (tk->track_type == 0) /* no sound or hint track */
+   {
+    if (tk->num_samples == 0)
+				return 1;
+			
+    tk->w = w; tk->h = h; tk->depth = prec;
+      tk->Dim[0] = 0;
+      tk->Dim[1] = 0;
+			
+      tk->timescale = 1000;	/* Timescale = 1 ms                                          */
+			
+      tk->chunk[0].num_samples = 1;
+      tk->chunk[0].sample_descr_idx = 1;
+			
+      tk->same_sample_size = 0;
+			
+      tk->num_samplestochunk = 1;	/* One sample per chunk  */
+		tk->sampletochunk = (mj2_sampletochunk_t*) opj_malloc(tk->num_samplestochunk * sizeof(mj2_sampletochunk_t));
+      tk->sampletochunk[0].first_chunk = 1;
+      tk->sampletochunk[0].samples_per_chunk = 1;
+      tk->sampletochunk[0].sample_descr_idx = 1;
+      
+      if (tk->sample_rate == 0) 
+  {
+	opj_event_msg(tk->cinfo, EVT_ERROR,
+	"Error while initializing MJ2 movie: Sample rate of track"
+	" %d must be different from zero\n", tk->track_ID);
+	return 1;
+  }
+			
+      for (j = 0; j < tk->num_samples; j++) 
+  {
+	tk->sample[j].sample_delta = tk->timescale / tk->sample_rate;
+  }
+			
+      tk->num_tts = 1;
+		tk->tts = (mj2_tts_t*) opj_malloc(tk->num_tts * sizeof(mj2_tts_t));
+      tk->tts[0].sample_count = tk->num_samples;
+      tk->tts[0].sample_delta = tk->timescale / tk->sample_rate;
+			
+      tk->horizresolution = 0x00480000;	/* Horizontal resolution (typically 72)                       */
+      tk->vertresolution = 0x00480000;	/* Vertical resolution (typically 72)                         */
+      tk->compressorname[0] = 0x0f4d6f74;	/* Compressor Name[]: Motion JPEG2000                         */
+      tk->compressorname[1] = 0x696f6e20;
+      tk->compressorname[2] = 0x4a504547;
+      tk->compressorname[3] = 0x32303030;
+      tk->compressorname[4] = 0x00120000;
+      tk->compressorname[5] = 0;
+      tk->compressorname[6] = 0x00000042;
+      tk->compressorname[7] = 0x000000DC;
+      tk->num_url = 0;		/* Number of URL                                              */
+      tk->num_urn = 0;		/* Number of URN                                              */
+      tk->graphicsmode = 0;	/* Graphicsmode                                               */
+      tk->opcolor[0] = 0;	/* OpColor                                                    */
+      tk->opcolor[1] = 0;	/* OpColor                                                    */
+      tk->opcolor[2] = 0;	/* OpColor                                                    */
+      tk->creation_time = movie->creation_time;	/* Seconds between 1/1/04 and 1/1/70          */
+      tk->language = 0;		/* Language (undefined)					      */
+      tk->layer = 0;
+      tk->volume = 1 << 8;		/* Movie volume (default = 0x0100) */
+      tk->trans_matrix[0] = 0x00010000;	/* Transformation matrix for track */
+      tk->trans_matrix[1] = 0;	/* Unity is { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 }  */
+      tk->trans_matrix[2] = 0;
+      tk->trans_matrix[3] = 0;
+      tk->trans_matrix[4] = 0x00010000;
+      tk->trans_matrix[5] = 0;
+      tk->trans_matrix[6] = 0;
+      tk->trans_matrix[7] = 0;
+      tk->trans_matrix[8] = 0x40000000;
+      tk->fieldcount = 1;
+      tk->fieldorder = 0;
+      tk->or_fieldcount = 1;
+      tk->or_fieldorder = 0;
+      tk->num_br = 2;
+		tk->br = (unsigned int*) opj_malloc(tk->num_br * sizeof(unsigned int));
+      tk->br[0] = MJ2_JP2;
+      tk->br[1] = MJ2_J2P0;
+      tk->num_jp2x = 0;
+      tk->hsub = 2;		/* 4:2:0                                                      */
+      tk->vsub = 2;		/* 4:2:0                                                      */
+      tk->hoff = 0;
+      tk->voff = 0;
+      tk->visual_w = tk->w << 16;
+      tk->visual_h = tk->h << 16;
+    }
+    else {
+      tk->num_br = 0;
+      tk->jp2xdata = NULL;
+    }
+  }
+  return 0;
+}
+
+/*
+* Time To Sample box Decompact
+*
+*/
+void mj2_tts_decompact(mj2_tk_t * tk)
+{
+  int i, j;
+  tk->num_samples = 0;
+  for (i = 0; i < tk->num_tts; i++) {
+    tk->num_samples += tk->tts[i].sample_count;
+  }
+
+  tk->sample = (mj2_sample_t*) opj_malloc(tk->num_samples * sizeof(mj2_sample_t));
+
+  for (i = 0; i < tk->num_tts; i++) {
+    for (j = 0; j < tk->tts[i].sample_count; j++) {
+      tk->sample[j].sample_delta = tk->tts[i].sample_delta;
+    }
+  }
+}
+
+/*
+* Sample To Chunk box Decompact
+*
+*/
+void mj2_stsc_decompact(mj2_tk_t * tk)
+{
+  unsigned int i, j, k, sampleno = 0;
+  
+  if (tk->num_samplestochunk == 1) {
+    tk->num_chunks =
+      (unsigned int) ceil((double) tk->num_samples /
+      (double) tk->sampletochunk[0].samples_per_chunk);
+	 tk->chunk = (mj2_chunk_t*) opj_malloc(tk->num_chunks * sizeof(mj2_chunk_t));
+    for (k = 0; k < tk->num_chunks; k++) {
+      tk->chunk[k].num_samples = tk->sampletochunk[0].samples_per_chunk;
+    }
+    
+  } else {
+    tk->chunk = (mj2_chunk_t*) opj_malloc(tk->num_samples * sizeof(mj2_chunk_t));
+    tk->num_chunks = 0;
+    for (i = 0; i < tk->num_samplestochunk -1 ; i++) {
+      for (j = tk->sampletochunk[i].first_chunk - 1;
+      j < tk->sampletochunk[i + 1].first_chunk - 1; j++) {
+				tk->chunk[j].num_samples = tk->sampletochunk[i].samples_per_chunk;
+				tk->num_chunks++;
+				sampleno += tk->chunk[j].num_samples;
+      }
+    }
+    tk->num_chunks += (int)(tk->num_samples  - sampleno) / tk->sampletochunk[tk->num_samplestochunk - 1].samples_per_chunk;
+    for (k = tk->sampletochunk[tk->num_samplestochunk - 1].first_chunk - 1;
+    k < tk->num_chunks; k++) {
+      tk->chunk[k].num_samples =
+				tk->sampletochunk[tk->num_samplestochunk - 1].samples_per_chunk;
+    }
+    tk->chunk = (mj2_chunk_t*)
+	 opj_realloc(tk->chunk, tk->num_chunks * sizeof(mj2_chunk_t));
+  }
+  
+}
+
+
+/*
+* Chunk offset box Decompact
+*
+*/
+void mj2_stco_decompact(mj2_tk_t * tk)
+{
+  unsigned int i, j, k = 0;
+  unsigned int intra_chunk_offset;
+	
+  for (i = 0; i < tk->num_chunks; i++) {
+    intra_chunk_offset = 0;
+    for (j = 0; j < tk->chunk[i].num_samples; j++) {
+      tk->sample[k].offset = intra_chunk_offset + tk->chunk[i].offset;
+      intra_chunk_offset += tk->sample[k].sample_size;
+      k++;
+    }
+  }
+}
+
+/*
+* Write the JP box
+*
+* JP Signature box
+*
+*/
+void mj2_write_jp(opj_cio_t *cio)
+{
+  mj2_box_t box;
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+	
+  cio_write(cio, MJ2_JP, 4);		/* JP */
+  cio_write(cio, 0x0d0a870a, 4);	/* 0x0d0a870a required in a JP box */
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the JP box
+*
+* JPEG 2000 signature
+*
+*/
+int mj2_read_jp(opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_JP != box.type) {	/* Check Marker */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP Marker\n");
+    return 1;
+  }
+  if (0x0d0a870a != cio_read(cio, 4)) {	/* read the 0x0d0a870a required in a JP box */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP Marker\n");
+    return 1;
+  }
+  if (cio_tell(cio) - box.init_pos != box.length) {	/* Check box length */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP Box size \n");
+    return 1;
+  }
+  return 0;
+	
+}
+
+/*
+* Write the FTYP box
+*
+* File type box
+*
+*/
+void mj2_write_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
+{
+  int i;
+  mj2_box_t box;
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+	
+  cio_write(cio, MJ2_FTYP, 4);	/* FTYP       */
+  cio_write(cio, movie->brand, 4);	/* BR         */
+  cio_write(cio, movie->minversion, 4);	/* MinV       */
+	
+  for (i = 0; i < movie->num_cl; i++)
+    cio_write(cio, movie->cl[i], 4);	/* CL         */
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* Length     */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the FTYP box
+*
+* File type box
+*
+*/
+int mj2_read_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
+{
+  int i;
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);	/* Box Size */
+  if (MJ2_FTYP != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected FTYP Marker\n");
+    return 1;
+  }
+	
+  movie->brand = cio_read(cio, 4);	/* BR              */
+  movie->minversion = cio_read(cio, 4);	/* MinV            */
+  movie->num_cl = (box.length - 16) / 4;
+  movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
+
+  for (i = movie->num_cl - 1; i > -1; i--)
+    movie->cl[i] = cio_read(cio, 4);	/* CLi */
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with FTYP Box\n");
+    return 1;
+  }
+  return 0;
+}
+
+
+/*
+* Write the STCO box
+*
+* Chunk Offset Box
+*
+*/
+void mj2_write_stco(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+  unsigned int i;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_STCO, 4);	/* STCO       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, tk->num_chunks, 4);	/* Entry Count */
+	
+  for (i = 0; i < tk->num_chunks; i++) {
+    cio_write(cio, tk->chunk[i].offset, 4);	/* Entry offset */
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the STCO box
+*
+* Chunk Offset Box
+*
+*/
+int mj2_read_stco(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  unsigned int i;
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);	/* Box Size */
+  if (MJ2_STCO != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STCO Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STCO box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STCO box. Expected flag 0\n");
+    return 1;
+  }
+	
+	
+  if (cio_read(cio, 4) != tk->num_chunks) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, 
+			"Error in STCO box: expecting same amount of entry-count as chunks \n");
+  } else {
+    for (i = 0; i < tk->num_chunks; i++) {
+      tk->chunk[i].offset = cio_read(cio, 4);	/* Entry offset */
+    }
+  }
+	
+  mj2_stco_decompact(tk);
+	
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STCO Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the STSZ box
+*
+* Sample size box
+*
+*/
+void mj2_write_stsz(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+  unsigned int i;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_STSZ, 4);	/* STSZ       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  if (tk->same_sample_size == 1) {	/* If they all have the same size */
+    cio_write(cio, tk->sample[0].sample_size, 4);	/* Size */
+		
+    cio_write(cio, 1, 4);		/* Entry count = 1 */
+  }
+	
+  else {
+    cio_write(cio, 0, 4);		/* Sample Size = 0 becase they all have different sizes */
+		
+    cio_write(cio, tk->num_samples, 4);	/* Sample Count */
+		
+    for (i = 0; i < tk->num_samples; i++) {
+      cio_write(cio, tk->sample[i].sample_size, 4);
+    }
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the STSZ box
+*
+* Sample size box
+*
+*/
+int mj2_read_stsz(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  int sample_size;
+  unsigned int i;
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);	/* Box Size */
+  if (MJ2_STSZ != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSZ Marker\n");
+    return 1;
+  }
+	
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSZ box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSZ box. Expected flag 0\n");
+    return 1;
+  }
+	
+  sample_size = cio_read(cio, 4);
+	
+  if (sample_size != 0) {	/* Samples do have the same size */
+    tk->same_sample_size = 1;
+    for (i = 0; i < tk->num_samples; i++) {
+      tk->sample[i].sample_size = sample_size;
+    }
+    cio_skip(cio,4);		/* Sample count = 1 */
+  } else {
+    tk->same_sample_size = 0;
+    if (tk->num_samples != cio_read(cio, 4)) {	/* Sample count */
+      opj_event_msg(cio->cinfo, EVT_ERROR,
+				"Error in STSZ box. Expected that sample-count is number of samples in track\n");
+      return 1;
+    }
+    for (i = 0; i < tk->num_samples; i++) {
+      tk->sample[i].sample_size = cio_read(cio, 4);	/* Sample Size */
+    }
+		
+    if (cio_tell(cio) - box.init_pos != box.length) {
+      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSZ Box size\n");
+      return 1;
+    }
+  }
+  return 0;
+	
+}
+
+/*
+* Write the STSC box
+*
+* Sample to Chunk
+*
+*/
+void mj2_write_stsc(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  unsigned int i;
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_STSC, 4);	/* STSC       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, tk->num_samplestochunk, 4);	/* Entry Count */
+	
+  for (i = 0; i < tk->num_samplestochunk; i++) {
+    cio_write(cio, tk->sampletochunk[i].first_chunk, 4);	/* First Chunk */
+    cio_write(cio, tk->sampletochunk[i].samples_per_chunk, 4);	/* Samples per chunk */
+    cio_write(cio, tk->sampletochunk[i].sample_descr_idx, 4);	/* Samples description index */
+  }
+	
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the STSC box
+*
+* Sample to Chunk
+*
+*/
+int mj2_read_stsc(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  unsigned int i;
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);	/* Box Size */
+  if (MJ2_STSC != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSC Marker\n");
+    return 1;
+  }
+	
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSC box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSC box. Expected flag 0\n");
+    return 1;
+  }
+	
+  tk->num_samplestochunk = cio_read(cio, 4);
+
+  tk->sampletochunk = (mj2_sampletochunk_t*) opj_malloc(tk->num_samplestochunk * sizeof(mj2_sampletochunk_t));
+
+  for (i = 0; i < tk->num_samplestochunk; i++) {
+    tk->sampletochunk[i].first_chunk = cio_read(cio, 4);
+    tk->sampletochunk[i].samples_per_chunk = cio_read(cio, 4);
+    tk->sampletochunk[i].sample_descr_idx = cio_read(cio, 4);
+  }
+	
+  mj2_stsc_decompact(tk);	/* decompact sample to chunk box */
+	
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSC Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the STTS box
+*
+* Time to Sample Box
+*
+*/
+void mj2_write_stts(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  int i;
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_STTS, 4);	/* STTS       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, tk->num_tts, 4);	/* entry_count */
+  for (i = 0; i < tk->num_tts; i++) {
+    cio_write(cio, tk->tts[i].sample_count, 4);	/* Sample-count */
+    cio_write(cio, tk->tts[i].sample_delta, 4);	/* Sample-Delta */
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the STTS box
+*
+* 
+*
+*/
+int mj2_read_stts(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  int i;
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_STTS != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STTS Marker\n");
+    return 1;
+  }
+	
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STTS box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STTS box. Expected flag 0\n");
+    return 1;
+  }
+	
+  tk->num_tts = cio_read(cio, 4);
+
+  tk->tts = (mj2_tts_t*) opj_malloc(tk->num_tts * sizeof(mj2_tts_t));
+
+  for (i = 0; i < tk->num_tts; i++) {
+    tk->tts[i].sample_count = cio_read(cio, 4);
+    tk->tts[i].sample_delta = cio_read(cio, 4);
+  }
+	
+  mj2_tts_decompact(tk);
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STTS Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the FIEL box
+*
+* Field coding Box
+*
+*/
+void mj2_write_fiel(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_FIEL, 4);	/* STTS       */
+	
+  cio_write(cio, tk->fieldcount, 1);	/* Field count */
+  cio_write(cio, tk->fieldorder, 1);	/* Field order */
+	
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the FIEL box
+*
+* Field coding Box
+*
+*/
+int mj2_read_fiel(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_FIEL != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected FIEL Marker\n");
+    return 1;
+  }
+	
+	
+  tk->fieldcount = cio_read(cio, 1);
+  tk->fieldorder = cio_read(cio, 1);
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with FIEL Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the ORFO box
+*
+* Original Format Box
+*
+*/
+void mj2_write_orfo(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_ORFO, 4);
+	
+  cio_write(cio, tk->or_fieldcount, 1);	/* Original Field count */
+  cio_write(cio, tk->or_fieldorder, 1);	/* Original Field order */
+	
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the ORFO box
+*
+* Original Format Box
+*
+*/
+int mj2_read_orfo(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_ORFO != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected ORFO Marker\n");
+    return 1;
+  }
+	
+	
+  tk->or_fieldcount = cio_read(cio, 1);
+  tk->or_fieldorder = cio_read(cio, 1);
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with ORFO Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the JP2P box
+*
+* MJP2 Profile Box
+*
+*/
+void mj2_write_jp2p(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  int i;
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_JP2P, 4);
+	
+  cio_write(cio, 0, 4);		/* Version 0, flags =0 */
+	
+  for (i = 0; i < tk->num_br; i++) {
+    cio_write(cio, tk->br[i], 4);
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the JP2P box
+*
+* MJP2 Profile Box
+*
+*/
+int mj2_read_jp2p(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  int i;
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_JP2P != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP2P Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in JP2P box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in JP2P box. Expected flag 0\n");
+    return 1;
+  }
+	
+	
+  tk->num_br = (box.length - 12) / 4;
+  tk->br = (unsigned int*) opj_malloc(tk->num_br * sizeof(unsigned int));
+
+  for (i = 0; i < tk->num_br; i++) {
+    tk->br[i] = cio_read(cio, 4);
+  }
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP2P Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the JP2X box
+*
+* MJP2 Prefix Box
+*
+*/
+void mj2_write_jp2x(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  int i;
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_JP2X, 4);
+	
+  for (i = 0; i < tk->num_jp2x; i++) {
+    cio_write(cio, tk->jp2xdata[i], 1);
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the JP2X box
+*
+* MJP2 Prefix Box
+*
+*/
+int mj2_read_jp2x(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  unsigned int i;
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_JP2X != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP2X Marker\n");
+    return 1;
+  }
+	
+	
+  tk->num_jp2x = (box.length - 8);
+  tk->jp2xdata = (unsigned char*) opj_malloc(tk->num_jp2x * sizeof(unsigned char));
+
+  for (i = 0; i < tk->num_jp2x; i++) {
+    tk->jp2xdata[i] = cio_read(cio, 1);
+  }
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP2X Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the JSUB box
+*
+* MJP2 Subsampling Box
+*
+*/
+void mj2_write_jsub(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_JSUB, 4);
+	
+  cio_write(cio, tk->hsub, 1);
+  cio_write(cio, tk->vsub, 1);
+  cio_write(cio, tk->hoff, 1);
+  cio_write(cio, tk->voff, 1);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the JSUB box
+*
+* MJP2 Subsampling Box
+*
+*/
+int mj2_read_jsub(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_JSUB != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JSUB Marker\n");
+    return 1;
+  }
+	
+  tk->hsub = cio_read(cio, 1);
+  tk->vsub = cio_read(cio, 1);
+  tk->hoff = cio_read(cio, 1);;
+  tk->voff = cio_read(cio, 1);
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JSUB Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the SMJ2 box
+*
+* Visual Sample Entry Description
+*
+*/
+void mj2_write_smj2(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_MJ2, 4);	/* MJ2       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, 1, 4);
+	
+  cio_write(cio, 0, 2);		/* Pre-defined */
+	
+  cio_write(cio, 0, 2);		/* Reserved */
+	
+  cio_write(cio, 0, 4);		/* Pre-defined */
+  cio_write(cio, 0, 4);		/* Pre-defined */
+  cio_write(cio, 0, 4);		/* Pre-defined */
+	
+  cio_write(cio, tk->w, 2);		/* Width  */
+  cio_write(cio, tk->h, 2);		/* Height */
+	
+  cio_write(cio, tk->horizresolution, 4);	/* Horizontal resolution */
+  cio_write(cio, tk->vertresolution, 4);	/* Vertical resolution   */
+	
+  cio_write(cio, 0, 4);		/* Reserved */
+	
+  cio_write(cio, 1, 2);		/* Pre-defined = 1 */
+	
+  cio_write(cio, tk->compressorname[0], 4);	/* Compressor Name */
+  cio_write(cio, tk->compressorname[1], 4);
+  cio_write(cio, tk->compressorname[2], 4);
+  cio_write(cio, tk->compressorname[3], 4);
+  cio_write(cio, tk->compressorname[4], 4);
+  cio_write(cio, tk->compressorname[5], 4);
+  cio_write(cio, tk->compressorname[6], 4);
+  cio_write(cio, tk->compressorname[7], 4);
+	
+  cio_write(cio, tk->depth, 2);	/* Depth */
+	
+  cio_write(cio, 0xffff, 2);		/* Pre-defined = -1 */
+	
+  jp2_write_jp2h(&tk->jp2_struct, cio);
+	
+  mj2_write_fiel(tk, cio);
+	
+  if (tk->num_br != 0)
+    mj2_write_jp2p(tk, cio);
+  if (tk->num_jp2x != 0)
+    mj2_write_jp2x(tk, cio);
+	
+  mj2_write_jsub(tk, cio);
+  mj2_write_orfo(tk, cio);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the SMJ2 box
+*
+* Visual Sample Entry Description
+*
+*/
+int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+  mj2_box_t box2;
+  opj_jp2_color_t color;
+  int i;
+  opj_bool ok;
+
+  mj2_read_boxhdr(&box, cio);
+	
+  if (MJ2_MJ2 != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error in SMJ2 box: Expected MJ2 Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MJP2 box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in MJP2 box. Expected flag 0\n");
+    return 1;
+  }
+	
+  cio_skip(cio,4);
+	
+  cio_skip(cio,2);			/* Pre-defined */
+	
+  cio_skip(cio,2);			/* Reserved */
+	
+  cio_skip(cio,4);			/* Pre-defined */
+  cio_skip(cio,4);			/* Pre-defined */
+  cio_skip(cio,4);			/* Pre-defined */
+	
+  tk->w = cio_read(cio, 2);		/* Width  */
+  tk->h = cio_read(cio, 2);		/* Height */
+	
+  tk->horizresolution = cio_read(cio, 4);	/* Horizontal resolution */
+  tk->vertresolution = cio_read(cio, 4);	/* Vertical resolution   */
+	
+  cio_skip(cio,4);			/* Reserved */
+	
+  cio_skip(cio,2);			/* Pre-defined = 1 */
+	
+  tk->compressorname[0] = cio_read(cio, 4);	/* Compressor Name */
+  tk->compressorname[1] = cio_read(cio, 4);
+  tk->compressorname[2] = cio_read(cio, 4);
+  tk->compressorname[3] = cio_read(cio, 4);
+  tk->compressorname[4] = cio_read(cio, 4);
+  tk->compressorname[5] = cio_read(cio, 4);
+  tk->compressorname[6] = cio_read(cio, 4);
+  tk->compressorname[7] = cio_read(cio, 4);
+	
+  tk->depth = cio_read(cio, 2);	/* Depth */
+	
+  /* Init std value */
+  tk->num_jp2x = 0;
+  tk->fieldcount = 1;
+  tk->fieldorder = 0;
+  tk->or_fieldcount = 1;
+  tk->or_fieldorder = 0;
+	
+  cio_skip(cio,2);			/* Pre-defined = -1 */
+  memset(&color, 0, sizeof(opj_jp2_color_t));
+  tk->jp2_struct.cinfo = tk->cinfo;
+
+  ok = jp2_read_jp2h(&tk->jp2_struct, cio, &color);
+
+  tk->jp2_struct.cinfo = NULL;
+
+  if(ok == OPJ_FALSE)
+ {
+	opj_event_msg(tk->cinfo, EVT_ERROR, "Error reading JP2H Box\n");
+    return 1;
+ }
+
+  tk->jp2_struct.comps = (opj_jp2_comps_t*) opj_malloc(tk->jp2_struct.numcomps * sizeof(opj_jp2_comps_t));
+  tk->jp2_struct.cl = (unsigned int*) opj_malloc(sizeof(unsigned int));
+
+  tk->num_br = 0;
+  tk->num_jp2x = 0;
+	
+  for (i = 0; cio_tell(cio) - box.init_pos < box.length; i++) {
+    mj2_read_boxhdr(&box2, cio);
+    cio_seek(cio, box2.init_pos);
+    switch (box2.type) {
+    case MJ2_FIEL:
+      if (mj2_read_fiel(tk, cio))
+				return 1;
+      break;
+			
+    case MJ2_JP2P:
+      if (mj2_read_jp2p(tk, cio))
+				return 1;
+      break;
+			
+    case MJ2_JP2X:
+      if (mj2_read_jp2x(tk, cio))
+				return 1;
+      break;
+			
+    case MJ2_JSUB:
+      if (mj2_read_jsub(tk, cio))
+				return 1;
+      break;
+			
+    case MJ2_ORFO:
+      if (mj2_read_orfo(tk, cio))
+				return 1;
+      break;
+			
+    default:
+      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MJP2 Box size\n");
+      return 1;
+      break;
+			
+    }
+  }
+  return 0;
+}
+
+
+/*
+* Write the STSD box
+*
+* Sample Description
+*
+*/
+void mj2_write_stsd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_STSD, 4);	/* STSD       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, 1, 4);		/* entry_count = 1 (considering same JP2 headerboxes) */
+	
+  if (tk->track_type == 0) {
+    mj2_write_smj2(tk, cio);
+  } else if (tk->track_type == 1) {
+    /* Not implemented*/
+  }
+  if (tk->track_type == 2) {
+    /* Not implemented*/
+  }
+	
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the STSD box
+*
+* Sample Description
+*
+*/
+int mj2_read_stsd(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
+{
+  int i;
+  int entry_count, len_2skip;
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+	
+  if (MJ2_STSD != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSD Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSD box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSD box. Expected flag 0\n");
+    return 1;
+  }
+	
+  entry_count = cio_read(cio, 4);
+	
+  if (tk->track_type == 0) {
+    for (i = 0; i < entry_count; i++) {
+      if (mj2_read_smj2(img, tk, cio))
+				return 1;
+    }
+  } else if (tk->track_type == 1) {
+    len_2skip = cio_read(cio, 4);	/* Not implemented -> skipping box*/
+    cio_skip(cio,len_2skip - 4);
+  } else if (tk->track_type == 2) {
+    len_2skip = cio_read(cio, 4);	/* Not implemented -> skipping box*/
+    cio_skip(cio,len_2skip - 4);
+  }
+	
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSD Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the STBL box
+*
+* Sample table box box
+*
+*/
+void mj2_write_stbl(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_STBL, 4);	/* STBL       */
+	
+  mj2_write_stsd(tk, cio);
+  mj2_write_stts(tk, cio);
+  mj2_write_stsc(tk, cio);
+  mj2_write_stsz(tk, cio);
+  mj2_write_stco(tk, cio);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the STBL box
+*
+* Sample table box box
+*
+*/
+int mj2_read_stbl(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_STBL != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STBL Marker\n");
+    return 1;
+  }
+	
+  if (mj2_read_stsd(tk, img, cio))
+    return 1;
+  if (mj2_read_stts(tk, cio))
+    return 1;
+  if (mj2_read_stsc(tk, cio))
+    return 1;
+  if (mj2_read_stsz(tk, cio))
+    return 1;
+  if (mj2_read_stco(tk, cio))
+    return 1;
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STBL Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the URL box
+*
+* URL box
+*
+*/
+void mj2_write_url(mj2_tk_t * tk, int url_num, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_URL, 4);	/* URL       */
+	
+  if (url_num == 0)
+    cio_write(cio, 1, 4);		/* Version = 0, flags = 1 because stored in same file */
+  else {
+    cio_write(cio, 0, 4);		/* Version = 0, flags =  0 */
+    cio_write(cio, tk->url[url_num - 1].location[0], 4);
+    cio_write(cio, tk->url[url_num - 1].location[1], 4);
+    cio_write(cio, tk->url[url_num - 1].location[2], 4);
+    cio_write(cio, tk->url[url_num - 1].location[3], 4);
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the URL box
+*
+* URL box
+*
+*/
+int mj2_read_url(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_URL != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected URL Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in URL box\n");
+    return 1;
+  }
+	
+  if (1 != cio_read(cio, 3)) {	/* If flags = 1 --> media data in file */
+    tk->url[urn_num].location[0] = cio_read(cio, 4);
+    tk->url[urn_num].location[1] = cio_read(cio, 4);
+    tk->url[urn_num].location[2] = cio_read(cio, 4);
+    tk->url[urn_num].location[3] = cio_read(cio, 4);
+  } else {
+    tk->num_url--;
+  }
+	
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with URL Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the URN box
+*
+* URN box
+*
+*/
+void mj2_write_urn(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_URN, 4);	/* URN       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags =  0 */
+	
+  cio_write(cio, tk->urn[urn_num].name[0], 4);
+  cio_write(cio, tk->urn[urn_num].name[1], 4);
+  cio_write(cio, tk->urn[urn_num].name[2], 4);
+  cio_write(cio, tk->urn[urn_num].name[3], 4);
+  cio_write(cio, tk->urn[urn_num].location[0], 4);
+  cio_write(cio, tk->urn[urn_num].location[1], 4);
+  cio_write(cio, tk->urn[urn_num].location[2], 4);
+  cio_write(cio, tk->urn[urn_num].location[3], 4);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the URN box
+*
+* URN box
+*
+*/
+int mj2_read_urn(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
+{
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_URN != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected URN Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in URN box\n");
+    return 1;
+  }
+	
+  if (1 != cio_read(cio, 3)) {	/* If flags = 1 --> media data in file */
+    tk->urn[urn_num].name[0] = cio_read(cio, 4);
+    tk->urn[urn_num].name[1] = cio_read(cio, 4);
+    tk->urn[urn_num].name[2] = cio_read(cio, 4);
+    tk->urn[urn_num].name[3] = cio_read(cio, 4);
+    tk->urn[urn_num].location[0] = cio_read(cio, 4);
+    tk->urn[urn_num].location[1] = cio_read(cio, 4);
+    tk->urn[urn_num].location[2] = cio_read(cio, 4);
+    tk->urn[urn_num].location[3] = cio_read(cio, 4);
+  }
+	
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with URN Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+
+/*
+* Write the DREF box
+*
+* Data reference box
+*
+*/
+void mj2_write_dref(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  int i;
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_DREF, 4);	/* DREF       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  if (tk->num_url + tk->num_urn == 0) {	/* Media data in same file */
+    cio_write(cio, 1, 4);		/* entry_count = 1 */
+    mj2_write_url(tk, 0, cio);
+  } else {
+    cio_write(cio, tk->num_url + tk->num_urn, 4);	/* entry_count */
+		
+    for (i = 0; i < tk->num_url; i++)
+      mj2_write_url(tk, i + 1, cio);
+		
+    for (i = 0; i < tk->num_urn; i++)
+      mj2_write_urn(tk, i, cio);
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the DREF box
+*
+* Data reference box
+*
+*/
+int mj2_read_dref(mj2_tk_t * tk, opj_cio_t *cio)
+{
+	
+  int i;
+  int entry_count, marker;
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_DREF != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected DREF Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in DREF box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in DREF box. Expected flag 0\n");
+    return 1;
+  }
+	
+  entry_count = cio_read(cio, 4);
+  tk->num_url = 0;
+  tk->num_urn = 0;
+	
+  for (i = 0; i < entry_count; i++) {
+    cio_skip(cio,4);
+    marker = cio_read(cio, 4);
+    if (marker == MJ2_URL) {
+      cio_skip(cio,-8);
+      tk->num_url++;
+      if (mj2_read_url(tk, tk->num_url, cio))
+				return 1;
+    } else if (marker == MJ2_URN) {
+      cio_skip(cio,-8);
+      tk->num_urn++;
+      if (mj2_read_urn(tk, tk->num_urn, cio))
+				return 1;
+    } else {
+      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with in DREF box. Expected URN or URL box\n");
+      return 1;
+    }
+		
+  }
+	
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with DREF Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the DINF box
+*
+* Data information box
+*
+*/
+void mj2_write_dinf(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_DINF, 4);	/* DINF       */
+	
+  mj2_write_dref(tk, cio);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the DINF box
+*
+* Data information box
+*
+*/
+int mj2_read_dinf(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_DINF != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected DINF Marker\n");
+    return 1;
+  }
+	
+  if (mj2_read_dref(tk, cio))
+    return 1;
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with DINF Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the VMHD box
+*
+* Video Media information box
+*
+*/
+void mj2_write_vmhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_VMHD, 4);	/* VMHD       */
+	
+  cio_write(cio, 1, 4);		/* Version = 0, flags = 1 */
+	
+  cio_write(cio, tk->graphicsmode, 2);
+  cio_write(cio, tk->opcolor[0], 2);
+  cio_write(cio, tk->opcolor[1], 2);
+  cio_write(cio, tk->opcolor[2], 2);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the VMHD box
+*
+* Video Media information box
+*
+*/
+int mj2_read_vmhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_VMHD != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected VMHD Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in VMHD box\n");
+    return 1;
+  }
+	
+  if (1 != cio_read(cio, 3)) {	/* Flags = 1  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in VMHD box. Expected flag 1\n");
+    return 1;
+  }
+	
+  tk->track_type = 0;
+  tk->graphicsmode = cio_read(cio, 2);
+  tk->opcolor[0] = cio_read(cio, 2);
+  tk->opcolor[1] = cio_read(cio, 2);
+  tk->opcolor[2] = cio_read(cio, 2);
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with VMHD Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the SMHD box
+*
+* Sound Media information box
+*
+*/
+void mj2_write_smhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_SMHD, 4);	/* SMHD       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, tk->balance, 2);
+	
+  cio_write(cio, 0, 2);		/* Reserved */
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the SMHD box
+*
+* Sound Media information box
+*
+*/
+int mj2_read_smhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_SMHD != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected SMHD Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in SMHD box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in SMHD box. Expected flag 0\n");
+    return 1;
+  }
+	
+  tk->track_type = 1;
+  tk->balance = cio_read(cio, 2);
+	
+  /* Init variables to zero to avoid problems when freeeing memory
+  The values will possibly be overidded when decoding the track structure */
+  tk->num_br = 0;
+  tk->num_url = 0;
+  tk->num_urn = 0;
+  tk->num_chunks = 0;
+  tk->num_tts = 0;
+  tk->num_samplestochunk = 0;
+  tk->num_samples = 0;
+	
+  cio_skip(cio,2);			/* Reserved */
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with SMHD Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the HMHD box
+*
+* Hint Media information box
+*
+*/
+void mj2_write_hmhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_HMHD, 4);	/* HMHD       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, tk->maxPDUsize, 2);
+  cio_write(cio, tk->avgPDUsize, 2);
+  cio_write(cio, tk->maxbitrate, 4);
+  cio_write(cio, tk->avgbitrate, 4);
+  cio_write(cio, tk->slidingavgbitrate, 4);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the HMHD box
+*
+* Hint Media information box
+*
+*/
+int mj2_read_hmhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_HMHD != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected HMHD Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in HMHD box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in HMHD box. Expected flag 0\n");
+    return 1;
+  }
+	
+  tk->track_type = 2;
+  tk->maxPDUsize = cio_read(cio, 2);
+  tk->avgPDUsize = cio_read(cio, 2);
+  tk->maxbitrate = cio_read(cio, 4);
+  tk->avgbitrate = cio_read(cio, 4);
+  tk->slidingavgbitrate = cio_read(cio, 4);
+	
+  /* Init variables to zero to avoid problems when freeeing memory
+  The values will possibly be overidded when decoding the track structure */
+  tk->num_br = 0;
+  tk->num_url = 0;
+  tk->num_urn = 0;
+  tk->num_chunks = 0;
+  tk->num_tts = 0;
+  tk->num_samplestochunk = 0;
+  tk->num_samples = 0;
+	
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with HMHD Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the MINF box
+*
+* Media information box
+*
+*/
+void mj2_write_minf(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_MINF, 4);	/* MINF       */
+	
+  if (tk->track_type == 0) {
+    mj2_write_vmhd(tk, cio);
+  } else if (tk->track_type == 1) {
+    mj2_write_smhd(tk, cio);
+  } else if (tk->track_type == 2) {
+    mj2_write_hmhd(tk, cio);
+  }
+	
+  mj2_write_dinf(tk, cio);
+  mj2_write_stbl(tk, cio);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the MINF box
+*
+* Media information box
+*
+*/
+int mj2_read_minf(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
+{
+	
+  unsigned int box_type;
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_MINF != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MINF Marker\n");
+    return 1;
+  }
+	
+  cio_skip(cio,4);
+  box_type = cio_read(cio, 4);
+  cio_skip(cio,-8);
+	
+  if (box_type == MJ2_VMHD) {
+    if (mj2_read_vmhd(tk, cio))
+      return 1;
+  } else if (box_type == MJ2_SMHD) {
+    if (mj2_read_smhd(tk, cio))
+      return 1;
+  } else if (box_type == MJ2_HMHD) {
+    if (mj2_read_hmhd(tk, cio))
+      return 1;
+  } else {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error in MINF box expected vmhd, smhd or hmhd\n");
+    return 1;
+  }
+	
+  if (mj2_read_dinf(tk, cio))
+    return 1;
+	
+  if (mj2_read_stbl(tk, img, cio))
+    return 1;
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MINF Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the HDLR box
+*
+* Handler reference box
+*
+*/
+void mj2_write_hdlr(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_HDLR, 4);	/* HDLR       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, 0, 4);		/* Predefine */
+	
+  tk->name = 0;			/* The track name is immediately determined by the track type */
+	
+  if (tk->track_type == 0) {
+    tk->handler_type = 0x76696465;	/* Handler type: vide */
+    cio_write(cio, tk->handler_type, 4);
+		
+    cio_write(cio, 0, 4);
+    cio_write(cio, 0, 4);
+    cio_write(cio, 0, 4);		/* Reserved */
+		
+    cio_write(cio, 0x76696465, 4);
+    cio_write(cio, 0x6F206d65, 4);
+    cio_write(cio, 0x64696120, 4);
+    cio_write(cio, 0x74726163, 4);
+    cio_write(cio, 0x6b00, 2);	/* String: video media track */
+  } else if (tk->track_type == 1) {
+    tk->handler_type = 0x736F756E;	/* Handler type: soun */
+    cio_write(cio, tk->handler_type, 4);
+		
+    cio_write(cio, 0, 4);
+    cio_write(cio, 0, 4);
+    cio_write(cio, 0, 4);		/* Reserved */
+		
+    cio_write(cio, 0x536F756E, 4);
+    cio_write(cio, 0x6400, 2);	/* String: Sound */
+  } else if (tk->track_type == 2) {
+    tk->handler_type = 0x68696E74;	/* Handler type: hint */
+    cio_write(cio, tk->handler_type, 4);
+		
+    cio_write(cio, 0, 4);
+    cio_write(cio, 0, 4);
+    cio_write(cio, 0, 4);		/* Reserved */
+		
+    cio_write(cio, 0x48696E74, 4);
+    cio_write(cio, 0, 2);		/* String: Hint */
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the HDLR box
+*
+* Handler reference box
+*
+*/
+int mj2_read_hdlr(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  int i;
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_HDLR != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected HDLR Marker\n");
+    return 1;
+  }
+	
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in HDLR box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in HDLR box. Expected flag 0\n");
+    return 1;
+  }
+	
+  cio_skip(cio,4);			/* Reserved */
+	
+  tk->handler_type = cio_read(cio, 4);
+  cio_skip(cio,12);			/* Reserved */
+	
+  tk->name_size = box.length - 32;
+
+  tk->name = (char*) opj_malloc(tk->name_size * sizeof(char));
+  for (i = 0; i < tk->name_size; i++) {
+    tk->name[i] = cio_read(cio, 1);	/* Name */
+  }
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with HDLR Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the MDHD box
+*
+* Media Header Box
+*
+*/
+void mj2_write_mdhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+  unsigned int i;
+  time_t ltime;
+  unsigned int modification_time;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_MDHD, 4);	/* MDHD       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  cio_write(cio, tk->creation_time, 4);	/* Creation Time */
+	
+  time(&ltime);			/* Time since 1/1/70 */
+  modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
+	
+  cio_write(cio, modification_time, 4);	/* Modification Time */
+	
+  cio_write(cio, tk->timescale, 4);	/* Timescale */
+	
+  tk->duration = 0;
+	
+  for (i = 0; i < tk->num_samples; i++)
+    tk->duration += tk->sample[i].sample_delta;
+	
+  cio_write(cio, tk->duration, 4);	/* Duration */
+	
+  cio_write(cio, tk->language, 2);	/* Language */
+	
+  cio_write(cio, 0, 2);		/* Predefined */
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the MDHD box
+*
+* Media Header Box
+*
+*/
+int mj2_read_mdhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (!(MJ2_MHDR == box.type || MJ2_MDHD == box.type)) {	/* Kakadu writes MHDR instead of MDHD*/
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MDHD Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MDHD box\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 3)) {	/* Flags = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in MDHD box. Expected flag 0\n");
+    return 1;
+  }
+	
+	
+  tk->creation_time = cio_read(cio, 4);	/* Creation Time */
+	
+  tk->modification_time = cio_read(cio, 4);	/* Modification Time */
+	
+  tk->timescale = cio_read(cio, 4);	/* Timescale */
+	
+  tk->duration = cio_read(cio, 4);	/* Duration */
+	
+  tk->language = cio_read(cio, 2);	/* Language */
+	
+  cio_skip(cio,2);			/* Predefined */
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MDHD Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the MDIA box
+*
+* Media box
+*
+*/
+void mj2_write_mdia(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_MDIA, 4);	/* MDIA       */
+	
+  mj2_write_mdhd(tk, cio);
+  mj2_write_hdlr(tk, cio);
+  mj2_write_minf(tk, cio);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the MDIA box
+*
+* Media box
+*
+*/
+int mj2_read_mdia(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_MDIA != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MDIA Marker\n");
+    return 1;
+  }
+	
+  if (mj2_read_mdhd(tk, cio))
+    return 1;
+  if (mj2_read_hdlr(tk, cio))
+    return 1;
+  if (mj2_read_minf(tk, img, cio))
+    return 1;
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MDIA Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the TKHD box
+*
+* Track Header box
+*
+*/
+void mj2_write_tkhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+  unsigned int i;
+  time_t ltime;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+	
+  cio_write(cio, MJ2_TKHD, 4);	/* TKHD       */
+	
+  cio_write(cio, 3, 4);		/* Version=0, flags=3 */
+	
+  time(&ltime);			/* Time since 1/1/70 */
+  tk->modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
+	
+  cio_write(cio, tk->creation_time, 4);	/* Creation Time */
+	
+  cio_write(cio, tk->modification_time, 4);	/* Modification Time */
+	
+  cio_write(cio, tk->track_ID, 4);	/* Track ID */
+	
+  cio_write(cio, 0, 4);		/* Reserved */
+	
+  tk->duration = 0;
+	
+  for (i = 0; i < tk->num_samples; i++)
+    tk->duration += tk->sample[i].sample_delta;
+	
+  cio_write(cio, tk->duration, 4);	/* Duration */
+	
+  cio_write(cio, 0, 4);		/* Reserved */
+  cio_write(cio, 0, 4);		/* Reserved */
+	
+  cio_write(cio, tk->layer, 2);	/* Layer    */
+	
+  cio_write(cio, 0, 2);		/* Predefined */
+	
+  cio_write(cio, tk->volume, 2);	/* Volume       */
+	
+  cio_write(cio, 0, 2);		/* Reserved */
+	
+  cio_write(cio, tk->trans_matrix[0], 4);	/* Transformation matrix for track */
+  cio_write(cio, tk->trans_matrix[1], 4);
+  cio_write(cio, tk->trans_matrix[2], 4);
+  cio_write(cio, tk->trans_matrix[3], 4);
+  cio_write(cio, tk->trans_matrix[4], 4);
+  cio_write(cio, tk->trans_matrix[5], 4);
+  cio_write(cio, tk->trans_matrix[6], 4);
+  cio_write(cio, tk->trans_matrix[7], 4);
+  cio_write(cio, tk->trans_matrix[8], 4);
+	
+  cio_write(cio, tk->visual_w, 4);	/* Video Visual Width  */
+	
+  cio_write(cio, tk->visual_h, 4);	/* Video Visual Height */
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the TKHD box
+*
+* Track Header box
+*
+*/
+int mj2_read_tkhd(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  int flag;
+	
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+	
+  if (MJ2_TKHD != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected TKHD Marker\n");
+    return 1;
+  }
+	
+  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in TKHD box\n");
+    return 1;
+  }
+	
+  flag = cio_read(cio, 3);
+	
+  if (!(flag == 1 || flag == 2 || flag == 3 || flag == 4)) {	/* Flags = 1,2,3 or 4 */
+    opj_event_msg(cio->cinfo, EVT_ERROR,
+			"Error with flag in TKHD box: Expected flag 1,2,3 or 4\n");
+    return 1;
+  }
+	
+  tk->creation_time = cio_read(cio, 4);	/* Creation Time */
+	
+  tk->modification_time = cio_read(cio, 4);	/* Modification Time */
+	
+  tk->track_ID = cio_read(cio, 4);	/* Track ID */
+	
+  cio_skip(cio,4);			/* Reserved */
+	
+  tk->duration = cio_read(cio, 4);	/* Duration */
+	
+  cio_skip(cio,8);			/* Reserved */
+	
+  tk->layer = cio_read(cio, 2);	/* Layer    */
+	
+  cio_read(cio, 2);			/* Predefined */
+	
+  tk->volume = cio_read(cio, 2);	/* Volume       */
+	
+  cio_skip(cio,2);			/* Reserved */
+	
+  tk->trans_matrix[0] = cio_read(cio, 4);	/* Transformation matrix for track */
+  tk->trans_matrix[1] = cio_read(cio, 4);
+  tk->trans_matrix[2] = cio_read(cio, 4);
+  tk->trans_matrix[3] = cio_read(cio, 4);
+  tk->trans_matrix[4] = cio_read(cio, 4);
+  tk->trans_matrix[5] = cio_read(cio, 4);
+  tk->trans_matrix[6] = cio_read(cio, 4);
+  tk->trans_matrix[7] = cio_read(cio, 4);
+  tk->trans_matrix[8] = cio_read(cio, 4);
+	
+  tk->visual_w = cio_read(cio, 4);	/* Video Visual Width  */
+	
+  tk->visual_h = cio_read(cio, 4);	/* Video Visual Height */
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with TKHD Box size\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the TRAK box
+*
+* Track box
+*
+*/
+void mj2_write_trak(mj2_tk_t * tk, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+	
+  cio_write(cio, MJ2_TRAK, 4);	/* TRAK       */
+	
+  mj2_write_tkhd(tk, cio);
+  mj2_write_mdia(tk, cio);
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the TRAK box
+*
+* Track box
+*
+*/
+int mj2_read_trak(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_TRAK != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected TRAK Marker\n");
+    return 1;
+  }
+  if (mj2_read_tkhd(tk, cio))
+    return 1;
+  if (mj2_read_mdia(tk, img, cio))
+    return 1;
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with TRAK Box\n");
+    return 1;
+  }
+  return 0;
+}
+
+/*
+* Write the MVHD box
+*
+* Movie header Box
+*
+*/
+void mj2_write_mvhd(opj_mj2_t * movie, opj_cio_t *cio)
+{
+  int i;
+  mj2_box_t box;
+  unsigned j;
+  time_t ltime;
+  int max_tk_num = 0;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_MVHD, 4);	/* MVHD       */
+	
+  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+	
+  time(&ltime);			/* Time since 1/1/70 */
+  movie->modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
+	
+  cio_write(cio, movie->creation_time, 4);	/* Creation Time */
+	
+  cio_write(cio, movie->modification_time, 4);	/* Modification Time */
+	
+  cio_write(cio, movie->timescale, 4);	/* Timescale */
+	
+  movie->duration = 0;
+	
+  for (i = 0; i < (movie->num_stk + movie->num_htk + movie->num_vtk); i++) {
+    mj2_tk_t *tk = &movie->tk[i];
+		
+    for (j = 0; j < tk->num_samples; j++) {
+      movie->duration += tk->sample[j].sample_delta;
+    }
+  }
+	
+  cio_write(cio, movie->duration, 4);
+	
+  cio_write(cio, movie->rate, 4);	/* Rate to play presentation    */
+	
+  cio_write(cio, movie->volume, 2);	/* Volume       */
+	
+  cio_write(cio, 0, 2);		/* Reserved */
+  cio_write(cio, 0, 4);		/* Reserved */
+  cio_write(cio, 0, 4);		/* Reserved */
+	
+  cio_write(cio, movie->trans_matrix[0], 4);	/* Transformation matrix for video */
+  cio_write(cio, movie->trans_matrix[1], 4);
+  cio_write(cio, movie->trans_matrix[2], 4);
+  cio_write(cio, movie->trans_matrix[3], 4);
+  cio_write(cio, movie->trans_matrix[4], 4);
+  cio_write(cio, movie->trans_matrix[5], 4);
+  cio_write(cio, movie->trans_matrix[6], 4);
+  cio_write(cio, movie->trans_matrix[7], 4);
+  cio_write(cio, movie->trans_matrix[8], 4);
+	
+  cio_write(cio, 0, 4);		/* Pre-defined */
+  cio_write(cio, 0, 4);		/* Pre-defined */
+  cio_write(cio, 0, 4);		/* Pre-defined */
+  cio_write(cio, 0, 4);		/* Pre-defined */
+  cio_write(cio, 0, 4);		/* Pre-defined */
+  cio_write(cio, 0, 4);		/* Pre-defined */
+	
+	
+  for (i = 0; i < movie->num_htk + movie->num_stk + movie->num_vtk; i++) {
+    if (max_tk_num < movie->tk[i].track_ID)
+      max_tk_num = movie->tk[i].track_ID;
+  }
+	
+  movie->next_tk_id = max_tk_num + 1;
+	
+  cio_write(cio, movie->next_tk_id, 4);	/* ID of Next track to be added */
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);
+}
+
+/*
+* Read the MVHD box
+*
+* Movie header Box
+*
+*/
+int mj2_read_mvhd(opj_mj2_t * movie, opj_cio_t *cio)
+{
+  mj2_box_t box;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_MVHD != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MVHD Marker\n");
+    return 1;
+  }
+	
+	
+  if (0 != cio_read(cio, 4)) {	/* Version = 0, flags = 0 */
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MVHD box\n");
+  }
+	
+  movie->creation_time = cio_read(cio, 4);	/* Creation Time */
+	
+  movie->modification_time = cio_read(cio, 4);	/* Modification Time */
+	
+  movie->timescale = cio_read(cio, 4);	/* Timescale */
+	
+  movie->duration = cio_read(cio, 4);	/* Duration */
+	
+  movie->rate = cio_read(cio, 4);		/* Rate to play presentation    */
+	
+  movie->volume = cio_read(cio, 2);		/* Volume       */
+	
+  cio_skip(cio,10);				/* Reserved */
+	
+  movie->trans_matrix[0] = cio_read(cio, 4);	/* Transformation matrix for video */
+  movie->trans_matrix[1] = cio_read(cio, 4);
+  movie->trans_matrix[2] = cio_read(cio, 4);
+  movie->trans_matrix[3] = cio_read(cio, 4);
+  movie->trans_matrix[4] = cio_read(cio, 4);
+  movie->trans_matrix[5] = cio_read(cio, 4);
+  movie->trans_matrix[6] = cio_read(cio, 4);
+  movie->trans_matrix[7] = cio_read(cio, 4);
+  movie->trans_matrix[8] = cio_read(cio, 4);
+	
+  cio_skip(cio,24);			/* Pre-defined */
+	
+  movie->next_tk_id = cio_read(cio, 4);	/* ID of Next track to be added */
+	
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MVHD Box Size\n");
+    return 1;
+  }
+  return 0;
+}
+
+
+/*
+* Write the MOOV box
+*
+* Movie Box
+*
+*/
+void mj2_write_moov(opj_mj2_t * movie, opj_cio_t *cio)
+{
+  int i;
+  mj2_box_t box;
+	
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio,4);
+  cio_write(cio, MJ2_MOOV, 4);	/* MOOV       */
+	
+  mj2_write_mvhd(movie, cio);
+	
+  for (i = 0; i < (movie->num_stk + movie->num_htk + movie->num_vtk); i++) {
+    mj2_write_trak(&movie->tk[i], cio);
+  }
+	
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);	/* L          */
+  cio_seek(cio, box.init_pos + box.length);	
+}
+
+/*
+* Read the MOOV box
+*
+* Movie Box
+*
+*/
+int mj2_read_moov(opj_mj2_t * movie, opj_image_t * img, opj_cio_t *cio)
+{
+  unsigned int i;
+  mj2_box_t box;
+  mj2_box_t box2;
+	
+  mj2_read_boxhdr(&box, cio);
+  if (MJ2_MOOV != box.type) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MOOV Marker\n");
+    return 1;
+  }
+	
+  if (mj2_read_mvhd(movie, cio))
+    return 1;
+
+  movie->tk = (mj2_tk_t*) opj_malloc((movie->next_tk_id - 1) * sizeof(mj2_tk_t));
+
+  for (i = 0; cio_tell(cio) - box.init_pos < box.length; i++) {
+		mj2_tk_t *tk = &movie->tk[i];
+		tk->cinfo = movie->cinfo;
+    mj2_read_boxhdr(&box2, cio);
+    if (box2.type == MJ2_TRAK) {
+      cio_seek(cio, box2.init_pos);
+      if (mj2_read_trak(tk, img, cio))
+				return 1;
+			
+      if (tk->track_type == 0) {
+				movie->num_vtk++;
+      } else if (tk->track_type == 1) {
+				movie->num_stk++;
+      } else if (tk->track_type == 2) {
+				movie->num_htk++;
+      }
+    } else if (box2.type == MJ2_MVEX) {
+      cio_seek(cio, box2.init_pos);
+      cio_skip(cio,box2.length);
+      i--;
+    } else {
+      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MOOV Box: Expected TRAK or MVEX box\n");
+      return 1;
+    }
+  }
+  return 0;
+}
+
+int mj2_read_struct(FILE *file, opj_mj2_t *movie) {
+  mj2_box_t box;
+  opj_image_t img;
+  unsigned char * src;
+  int fsresult;
+  int foffset;
+	opj_cio_t *cio;
+	
+	/* open a byte stream for reading */	
+	src = (unsigned char*) opj_malloc(300 * sizeof(unsigned char));	
+
+	/* Assuming that jp and ftyp markers size do
+     not exceed 300 bytes */
+  fread(src,300,1, file);  
+  
+  cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 300);
+  
+  if (mj2_read_jp(cio))
+    return 1;
+  if (mj2_read_ftyp(movie, cio))
+    return 1;
+	
+  fsresult = fseek(file,cio_tell(cio),SEEK_SET);
+  if( fsresult ) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read data after FTYP box\n" );
+    return 1;
+  }
+	
+  foffset = cio_tell(cio);
+  
+  box.type = 0;
+  
+  fread(src,30,1,file);
+  cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 300);
+  mj2_read_boxhdr(&box, cio);
+  
+  while(box.type != MJ2_MOOV) {
+    
+    switch(box.type)
+    {
+    case MJ2_MDAT:
+      fsresult = fseek(file,foffset+box.length,SEEK_SET);
+      if( fsresult ) {
+				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MDAT box\n" );
+				return 1;
+      }
+      foffset += box.length;
+      break;
+      
+    case MJ2_MOOF:
+      fsresult = fseek(file,foffset+box.length,SEEK_SET);
+      if( fsresult ) {
+				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MOOF box\n" );
+				return 1;
+      }
+      foffset += box.length;
+      break;      
+    case MJ2_FREE:
+      fsresult = fseek(file,foffset+box.length,SEEK_SET);
+      if( fsresult ) {
+				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read FREE box\n" );
+				return 1;
+      }
+      foffset += box.length;
+      break;      
+    case MJ2_SKIP:
+      fsresult = fseek(file,foffset+box.length,SEEK_SET);
+      if( fsresult ) {
+				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read SKIP box\n" );
+				return 1;
+      }
+      foffset += box.length;
+      break;      
+    default:
+      opj_event_msg(cio->cinfo, EVT_ERROR, "Unknown box in MJ2 stream\n");
+      fsresult = fseek(file,foffset+box.length,SEEK_SET);
+      if( fsresult ) {
+				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read end of unknown box\n"); 
+				return 1;
+      }      
+      foffset += box.length;
+      break;
+    }
+    fsresult = fread(src,8,1,file);
+    if (fsresult != 1) {
+      opj_event_msg(cio->cinfo, EVT_ERROR, "MOOV box not found in file\n"); 
+      return 1;
+    }
+		cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 8);    		
+    mj2_read_boxhdr(&box, cio);
+  }	
+
+  fseek(file,foffset,SEEK_SET);
+  src = (unsigned char*)opj_realloc(src,box.length);
+  fsresult = fread(src,box.length,1,file);
+  if (fsresult != 1) {
+    opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MOOV box\n"); 
+    return 1;
+  }
+	
+	cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, box.length);
+  
+  if (mj2_read_moov(movie, &img, cio))
+    return 1;
+
+  opj_free(src);
+  return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+/* MJ2 decoder interface															                     */
+/* ----------------------------------------------------------------------- */
+
+opj_dinfo_t* mj2_create_decompress() {
+	opj_mj2_t* mj2;
+	opj_dinfo_t *dinfo = (opj_dinfo_t*) opj_calloc(1, sizeof(opj_dinfo_t));
+	if(!dinfo) return NULL;
+
+	dinfo->is_decompressor = OPJ_TRUE;	
+
+	mj2 = (opj_mj2_t*) opj_calloc(1, sizeof(opj_mj2_t));
+	dinfo->mj2_handle = mj2;
+	if(mj2) {
+		mj2->cinfo = (opj_common_ptr)dinfo;
+	}
+	mj2->j2k = j2k_create_decompress((opj_common_ptr)dinfo);
+	dinfo->j2k_handle = mj2->j2k;
+
+	return dinfo;
+}
+
+void mj2_setup_decoder(opj_mj2_t *movie, mj2_dparameters_t *mj2_parameters) {
+	movie->num_vtk=0;
+  movie->num_stk=0;
+  movie->num_htk=0;	
+
+	/* setup the J2K decoder parameters */
+	j2k_setup_decoder((opj_j2k_t*)movie->cinfo->j2k_handle, 
+		&mj2_parameters->j2k_parameters);
+
+}
+
+void mj2_destroy_decompress(opj_mj2_t *movie) {
+	if(movie) {
+		int i;
+		mj2_tk_t *tk=NULL;
+
+		if (movie->cinfo->j2k_handle) 
+			j2k_destroy_compress(movie->j2k);
+		
+		if (movie->num_cl != 0)
+			opj_free(movie->cl);
+		
+		for (i = 0; i < movie->num_vtk + movie->num_stk + movie->num_htk; i++) {
+			tk = &movie->tk[i];
+			if (tk->name_size != 0)
+				opj_free(tk->name);
+			if (tk->track_type == 0)  {/* Video track*/
+				if (tk->jp2_struct.comps != NULL)
+					opj_free(tk->jp2_struct.comps);
+				if (tk->jp2_struct.cl != NULL)
+					opj_free(tk->jp2_struct.cl);
+				if (tk->num_jp2x != 0)
+					opj_free(tk->jp2xdata);
+				
+			}
+			if (tk->num_url != 0)
+				opj_free(tk->url);
+			if (tk->num_urn != 0)
+				opj_free(tk->urn);
+			if (tk->num_br != 0)
+				opj_free(tk->br);
+			if (tk->num_tts != 0)
+				opj_free(tk->tts);
+			if (tk->num_chunks != 0)
+				opj_free(tk->chunk);
+			if (tk->num_samplestochunk != 0)
+				opj_free(tk->sampletochunk);
+			if (tk->num_samples != 0)
+				opj_free(tk->sample);
+		}
+		
+		opj_free(movie->tk);
+	}	
+	opj_free(movie);
+}
+
+/* ----------------------------------------------------------------------- */
+/* MJ2 encoder interface															                     */
+/* ----------------------------------------------------------------------- */
+
+
+opj_cinfo_t* mj2_create_compress() {
+	opj_mj2_t* mj2;
+	opj_cinfo_t *cinfo = (opj_cinfo_t*) opj_calloc(1, sizeof(opj_cinfo_t));
+	if(!cinfo) return NULL;
+
+	mj2 = (opj_mj2_t*) opj_calloc(1, sizeof(opj_mj2_t));
+	cinfo->mj2_handle = mj2;
+	if(mj2) {
+		mj2->cinfo = (opj_common_ptr)cinfo;
+	}
+
+	mj2->j2k = j2k_create_compress(mj2->cinfo);
+	cinfo->j2k_handle = mj2->j2k;
+
+	return cinfo;
+}
+
+void mj2_setup_encoder(opj_mj2_t *movie, mj2_cparameters_t *parameters) {
+	if(movie && parameters) {
+		opj_jp2_t *jp2_struct;
+			
+		movie->num_htk = 0;	  /* No hint tracks*/
+		movie->num_stk = 0;	  /* No sound tracks*/
+		movie->num_vtk = 1;	  /* One video track*/
+
+		movie->brand = MJ2_MJ2;  /* One brand: MJ2*/
+		movie->num_cl = 2;	  /* Two compatible brands: MJ2 and MJ2S*/
+		movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
+		movie->cl[0] = MJ2_MJ2;
+		movie->cl[1] = MJ2_MJ2S;
+		movie->minversion = 0;	  /* Minimum version: 0	*/
+
+		movie->tk = (mj2_tk_t*) opj_malloc(sizeof(mj2_tk_t)); /*Memory allocation for the video track*/
+		movie->tk[0].track_ID = 1;	  /* Track ID = 1 */
+		movie->tk[0].track_type = 0;	  /* Video track */
+		movie->tk[0].Dim[0] = parameters->Dim[0];
+		movie->tk[0].Dim[1] = parameters->Dim[1];
+		movie->tk[0].w = parameters->w;
+		movie->tk[0].h = parameters->h;
+		movie->tk[0].CbCr_subsampling_dx = parameters->CbCr_subsampling_dx;
+		movie->tk[0].CbCr_subsampling_dy = parameters->CbCr_subsampling_dy;
+		movie->tk[0].sample_rate = parameters->frame_rate;
+		movie->tk[0].name_size = 0;
+		movie->tk[0].chunk = (mj2_chunk_t*) opj_malloc(sizeof(mj2_chunk_t));  
+		movie->tk[0].sample = (mj2_sample_t*) opj_malloc(sizeof(mj2_sample_t));
+		movie->tk[0].depth = parameters->prec;
+
+		jp2_struct = &movie->tk[0].jp2_struct;
+		jp2_struct->numcomps = parameters->numcomps;	/* NC */
+		jp2_struct->comps = (opj_jp2_comps_t*) opj_malloc(jp2_struct->numcomps * sizeof(opj_jp2_comps_t));
+		jp2_struct->precedence = 0;   /* PRECEDENCE*/
+		jp2_struct->approx = 0;   /* APPROX*/		
+		jp2_struct->brand = JP2_JP2;	/* BR         */
+		jp2_struct->minversion = 0;	/* MinV       */
+		jp2_struct->numcl = 1;
+		jp2_struct->cl = (unsigned int*) opj_malloc(jp2_struct->numcl * sizeof(unsigned int));
+		jp2_struct->cl[0] = JP2_JP2;	/* CL0 : JP2  */		
+		jp2_struct->C = 7;      /* C : Always 7*/
+		jp2_struct->UnkC = 0;      /* UnkC, colorspace specified in colr box*/
+		jp2_struct->IPR = 0;      /* IPR, no intellectual property*/						
+		jp2_struct->w = parameters->w;
+		jp2_struct->h = parameters->h;
+		jp2_struct->bpc = 7;  
+		jp2_struct->meth = parameters->meth;
+		jp2_struct->enumcs = parameters->enumcs;
+  }
+}
+
+void mj2_destroy_compress(opj_mj2_t *movie) {
+	if(movie) {
+		int i;
+		mj2_tk_t *tk=NULL;
+
+		if (movie->cinfo->j2k_handle) {
+			j2k_destroy_compress(movie->j2k);
+		}
+		
+		if (movie->num_cl != 0)
+			opj_free(movie->cl);
+		
+		for (i = 0; i < movie->num_vtk + movie->num_stk + movie->num_htk; i++) {
+			tk = &movie->tk[i];
+			if (tk->name_size != 0)
+				opj_free(tk->name);
+			if (tk->track_type == 0)  {/* Video track*/
+				if (tk->jp2_struct.comps != NULL)
+					opj_free(tk->jp2_struct.comps);
+				if (tk->jp2_struct.cl != NULL)
+					opj_free(tk->jp2_struct.cl);
+				if (tk->num_jp2x != 0)
+					opj_free(tk->jp2xdata);
+				
+			}
+			if (tk->num_url != 0)
+				opj_free(tk->url);
+			if (tk->num_urn != 0)
+				opj_free(tk->urn);
+			if (tk->num_br != 0)
+				opj_free(tk->br);
+			if (tk->num_tts != 0)
+				opj_free(tk->tts);
+			if (tk->num_chunks != 0)
+				opj_free(tk->chunk);
+			if (tk->num_samplestochunk != 0)
+				opj_free(tk->sampletochunk);
+			if (tk->num_samples != 0)
+				opj_free(tk->sample);
+		}
+		
+		opj_free(movie->tk);
+	}	
+	opj_free(movie);
+}
diff --git a/src/bin/mj2/mj2.h b/src/bin/mj2/mj2.h
new file mode 100644
index 00000000..c0255707
--- /dev/null
+++ b/src/bin/mj2/mj2.h
@@ -0,0 +1,393 @@
+/*
+* Copyright (c) 2003-2004, Francois-Olivier Devaux
+* Copyright (c) 2003-2004,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+* All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * 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 OWNER 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.
+ */
+
+#ifndef __MJ2_H
+#define __MJ2_H
+/**
+@file mj2.h
+@brief The Motion JPEG 2000 file format Reader/Writer (MJ22)
+
+*/
+
+/** @defgroup MJ2 MJ2 - Motion JPEG 2000 file format reader/writer */
+/*@{*/
+
+#define MJ2_JP    0x6a502020
+#define MJ2_FTYP  0x66747970
+#define MJ2_MJ2   0x6d6a7032
+#define MJ2_MJ2S  0x6d6a3273
+#define MJ2_MDAT  0x6d646174
+#define MJ2_MOOV  0x6d6f6f76
+#define MJ2_MVHD  0x6d766864
+#define MJ2_TRAK  0x7472616b
+#define MJ2_TKHD  0x746b6864
+#define MJ2_MDIA  0x6d646961
+#define MJ2_MDHD  0x6d646864
+#define MJ2_MHDR  0x6d686472
+#define MJ2_HDLR  0x68646C72
+#define MJ2_MINF  0x6d696e66
+#define MJ2_VMHD  0x766d6864
+#define MJ2_SMHD  0x736d6864
+#define MJ2_HMHD  0x686d6864
+#define MJ2_DINF  0x64696e66
+#define MJ2_DREF  0x64726566
+#define MJ2_URL   0x75726c20
+#define MJ2_URN   0x75726e20
+#define MJ2_STBL  0x7374626c
+#define MJ2_STSD  0x73747364
+#define MJ2_STTS  0x73747473
+#define MJ2_STSC  0x73747363
+#define MJ2_STSZ  0x7374737a
+#define MJ2_STCO  0x7374636f
+#define MJ2_MOOF  0x6d6f6f66
+#define MJ2_FREE  0x66726565
+#define MJ2_SKIP  0x736b6970
+#define MJ2_JP2C  0x6a703263
+#define MJ2_FIEL  0x6669656c
+#define MJ2_JP2P  0x6a703270
+#define MJ2_JP2X  0x6a703278
+#define MJ2_JSUB  0x6a737562
+#define MJ2_ORFO  0x6f72666f
+#define MJ2_MVEX  0x6d766578
+#define MJ2_JP2   0x6a703220
+#define MJ2_J2P0  0x4a325030
+
+/**
+Decompressed format used in parameters
+YUV = 0
+*/
+#define YUV_DFMT 1 
+
+/**
+Compressed format used in parameters
+MJ2 = 0
+*/
+#define MJ2_CFMT 2
+
+
+/* ----------------------------------------------------------------------- */
+
+/**
+Time To Sample
+*/
+typedef struct mj2_tts {
+  int sample_count;
+  int sample_delta;
+} mj2_tts_t;
+
+/**
+Chunk
+*/
+typedef struct mj2_chunk {		
+  unsigned int num_samples;
+  int sample_descr_idx;
+  int offset;
+} mj2_chunk_t;
+
+/**
+Sample to chunk
+*/
+typedef struct mj2_sampletochunk {		
+  unsigned int first_chunk;
+  unsigned int samples_per_chunk;
+  int sample_descr_idx;
+} mj2_sampletochunk_t;
+
+/**
+Sample
+*/
+typedef struct mj2_sample {		
+  unsigned int sample_size;
+  unsigned int offset;
+  unsigned int sample_delta;
+} mj2_sample_t;
+
+/**
+URL
+*/
+typedef struct mj2_url {
+  int location[4];
+} mj2_url_t;
+
+/**
+URN
+*/
+typedef struct mj2_urn {		
+  int name[2];
+  int location[4];
+} mj2_urn_t;
+
+/**
+Video Track Parameters
+*/
+typedef struct mj2_tk {
+	/** codec context */
+	opj_common_ptr cinfo;
+  int track_ID;
+  int track_type;
+  unsigned int creation_time;
+  unsigned int modification_time;
+  int duration;
+  int timescale;
+  int layer;
+  int volume;
+  int language;
+  int balance;
+  int maxPDUsize;
+  int avgPDUsize;
+  int maxbitrate;
+  int avgbitrate;
+  int slidingavgbitrate;
+  int graphicsmode;
+  int opcolor[3];
+  int num_url;
+  mj2_url_t *url;
+  int num_urn;
+  mj2_urn_t *urn;
+  int Dim[2];
+  int w;
+  int h;
+  int visual_w;
+  int visual_h;
+  int CbCr_subsampling_dx;
+  int CbCr_subsampling_dy;
+  int sample_rate;
+  int sample_description;
+  int horizresolution;
+  int vertresolution;
+  int compressorname[8];
+  int depth;
+  unsigned char fieldcount;
+  unsigned char fieldorder;
+  unsigned char or_fieldcount;
+  unsigned char or_fieldorder;
+  int num_br;
+  unsigned int *br;
+  unsigned char num_jp2x;
+  unsigned char *jp2xdata;
+  unsigned char hsub;
+  unsigned char vsub;
+  unsigned char hoff;
+  unsigned char voff;
+  int trans_matrix[9];
+	/** Number of samples */
+  unsigned int num_samples;	
+  int transorm;
+  int handler_type;
+  int name_size;
+  unsigned char same_sample_size;
+  int num_tts;
+	/** Time to sample    */
+  mj2_tts_t *tts;		
+  unsigned int num_chunks;
+  mj2_chunk_t *chunk;
+  unsigned int num_samplestochunk;
+  mj2_sampletochunk_t *sampletochunk;
+  char *name;
+  opj_jp2_t jp2_struct;
+	/** Sample parameters */
+  mj2_sample_t *sample;		
+} mj2_tk_t;			
+
+/**
+MJ2 box
+*/
+typedef struct mj2_box {
+  int length;
+  int type;
+  int init_pos;
+} mj2_box_t;
+
+/**
+MJ2 Movie
+*/
+typedef struct opj_mj2 {		
+	/** codec context */
+	opj_common_ptr cinfo;
+	/** handle to the J2K codec  */
+	opj_j2k_t *j2k;
+  unsigned int brand;
+  unsigned int minversion;
+  int num_cl;
+  unsigned int *cl;
+  unsigned int creation_time;
+  unsigned int modification_time;
+  int timescale;
+  unsigned int duration;
+  int rate;
+  int num_vtk;
+  int num_stk;
+  int num_htk;
+  int volume;
+  int trans_matrix[9];
+  int next_tk_id;
+	/** Track Parameters  */
+  mj2_tk_t *tk;			
+} opj_mj2_t;
+
+/**
+Decompression parameters
+*/
+typedef struct mj2_dparameters {
+	/**@name command line encoder parameters (not used inside the library) */
+	/*@{*/
+	/** input file name */
+	char infile[OPJ_PATH_LEN];
+	/** output file name */
+	char outfile[OPJ_PATH_LEN];	
+	/** J2K decompression parameters */
+	opj_dparameters_t j2k_parameters;	
+} mj2_dparameters_t;
+
+/**
+Compression parameters
+*/
+typedef struct mj2_cparameters {
+	/**@name command line encoder parameters (not used inside the library) */
+	/*@{*/
+	/** J2K compression parameters */
+	opj_cparameters_t j2k_parameters;	
+	/** input file name */
+	char infile[OPJ_PATH_LEN];
+	/** output file name */
+	char outfile[OPJ_PATH_LEN];	
+	/** input file format 0:MJ2 */
+	int decod_format;
+	/** output file format 0:YUV */
+	int cod_format;
+	/** Portion of the image coded */
+	int Dim[2];
+	/** YUV Frame width */
+	int w;
+	/** YUV Frame height */
+	int h;
+	/*   Sample rate of YUV 4:4:4, 4:2:2 or 4:2:0 */
+	int CbCr_subsampling_dx;	
+	/*   Sample rate of YUV 4:4:4, 4:2:2 or 4:2:0 */
+  int CbCr_subsampling_dy;	
+	/*   Video Frame Rate  */
+  int frame_rate;		
+	/*   In YUV files, numcomps always considered as 3 */
+  int numcomps;			
+	/*   In YUV files, precision always considered as 8 */
+  int prec;		
+  unsigned int meth;
+  unsigned int enumcs;
+} mj2_cparameters_t;
+
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Write the JP box 
+*/
+void mj2_write_jp(opj_cio_t *cio);
+/**
+Write the FTYP box
+@param movie MJ2 movie
+@param cio Output buffer stream
+*/
+void mj2_write_ftyp(opj_mj2_t *movie, opj_cio_t *cio);
+/**
+Creates an MJ2 decompression structure
+@return Returns a handle to a MJ2 decompressor if successful, returns NULL otherwise
+*/
+opj_dinfo_t* mj2_create_decompress();
+/**
+Destroy a MJ2 decompressor handle
+@param movie MJ2 decompressor handle to destroy
+*/
+void mj2_destroy_decompress(opj_mj2_t *movie);
+/**
+Setup the decoder decoding parameters using user parameters.
+Decoding parameters are returned in mj2->j2k->cp. 
+@param movie MJ2 decompressor handle
+@param parameters decompression parameters
+*/
+void mj2_setup_decoder(opj_mj2_t *movie, mj2_dparameters_t *mj2_parameters);
+/**
+Decode an image from a JPEG-2000 file stream
+@param movie MJ2 decompressor handle
+@param cio Input buffer stream
+@return Returns a decoded image if successful, returns NULL otherwise
+*/
+opj_image_t* mj2_decode(opj_mj2_t *movie, opj_cio_t *cio);
+/**
+Creates a MJ2 compression structure
+@return Returns a handle to a MJ2 compressor if successful, returns NULL otherwise
+*/
+opj_cinfo_t* mj2_create_compress();
+/**
+Destroy a MJ2 compressor handle
+@param movie MJ2 compressor handle to destroy
+*/
+void mj2_destroy_compress(opj_mj2_t *movie);
+/**
+Setup the encoder parameters using the current image and using user parameters. 
+Coding parameters are returned in mj2->j2k->cp. 
+@param movie MJ2 compressor handle
+@param parameters compression parameters
+*/
+void mj2_setup_encoder(opj_mj2_t *movie, mj2_cparameters_t *parameters);
+/**
+Encode an image into a JPEG-2000 file stream
+@param movie MJ2 compressor handle
+@param cio Output buffer stream
+@param image Image to encode
+@param index Name of the index file if required, NULL otherwise
+@return Returns true if successful, returns false otherwise
+*/
+opj_bool mj2_encode(opj_mj2_t *movie, opj_cio_t *cio, opj_image_t *image, char *index);
+
+/**
+Init a Standard MJ2 movie
+@param movie MJ2 Movie
+@return Returns 0 if successful, returns 1 otherwise
+*/
+int mj2_init_stdmovie(opj_mj2_t *movie);
+/**
+Read the structure of an MJ2 file
+@param File MJ2 input File
+@param movie J2 movie structure 
+@return Returns 0 if successful, returns 1 otherwise
+*/
+int mj2_read_struct(FILE *file, opj_mj2_t *mj2);
+/**
+Write the the MOOV box to an output buffer stream
+@param movie MJ2 movie structure 
+@param cio Output buffer stream
+*/
+void mj2_write_moov(opj_mj2_t *movie, opj_cio_t *cio);
+
+
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __MJ2_H */
diff --git a/src/bin/mj2/mj2_convert.c b/src/bin/mj2/mj2_convert.c
new file mode 100644
index 00000000..ed823f8b
--- /dev/null
+++ b/src/bin/mj2/mj2_convert.c
@@ -0,0 +1,372 @@
+/*
+* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+* Copyright (c) 2002-2007, Professor Benoit Macq
+* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. 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.
+*
+* 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 OWNER 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.
+*/
+
+#include "opj_includes.h"
+#include "mj2.h"
+
+/*  -----------------------	      */
+/*				      */
+/*				      */
+/*  Count the number of frames	      */
+/*  in a YUV file		      */
+/*				      */
+/*  -----------------------	      */
+
+unsigned int yuv_num_frames(mj2_tk_t * tk, char *infile)
+{
+  unsigned int prec_size;
+  long end_of_f, frame_size;
+	FILE *f;
+
+  f = fopen(infile,"rb");
+  if (!f) {  
+    fprintf(stderr, "failed to open %s for reading\n",infile);
+    return 0;
+  }
+	prec_size = (tk->depth + 7)/8;/* bytes of precision */
+
+  frame_size = (long) (tk->w * tk->h * (1.0 + (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy)));	/* Calculate frame size */
+	frame_size *= prec_size; 
+	
+  fseek(f, 0, SEEK_END);
+  end_of_f = ftell(f);		/* Calculate file size */
+	
+  if (end_of_f < frame_size) {
+    fprintf(stderr,
+			"YUV does not contains any frame of %d x %d size\n", tk->w,
+			tk->h);
+    return 0;
+  }
+  fclose(f);
+	
+  return (unsigned int)(end_of_f / frame_size);
+}
+
+/*  ----------------------- */
+/* */
+/* */
+/*  YUV to IMAGE */
+/* */
+/*  ----------------------- */
+
+opj_image_t *mj2_image_create(mj2_tk_t * tk, opj_cparameters_t *parameters)
+{
+	opj_image_cmptparm_t cmptparm[3];
+	opj_image_t * img;
+	int i;
+	int numcomps = 3;
+	int subsampling_dx = parameters->subsampling_dx;
+	int subsampling_dy = parameters->subsampling_dy;
+
+	/* initialize image components */
+	memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
+	for(i = 0; i < numcomps; i++) {
+		cmptparm[i].prec = tk->depth;
+		cmptparm[i].bpp = tk->depth;
+		cmptparm[i].sgnd = 0;		
+		cmptparm[i].dx = i ? subsampling_dx * tk->CbCr_subsampling_dx : subsampling_dx;
+		cmptparm[i].dy = i ? subsampling_dy * tk->CbCr_subsampling_dy : subsampling_dy;
+		cmptparm[i].w = tk->w;
+		cmptparm[i].h = tk->h;
+	}
+	/* create the image */
+	img = opj_image_create(numcomps, cmptparm, CLRSPC_SRGB);
+	return img;
+}
+
+char yuvtoimage(mj2_tk_t * tk, opj_image_t * img, int frame_num, opj_cparameters_t *parameters, char* infile)
+{
+  int i, compno;
+  int offset, size, max, prec_bytes, is_16, v;
+  long end_of_f, position;
+	int numcomps = 3;
+	int subsampling_dx = parameters->subsampling_dx;
+	int subsampling_dy = parameters->subsampling_dy;
+	FILE *yuvfile;
+	int *data;
+	unsigned char uc;
+
+  yuvfile = fopen(infile,"rb");
+  if (!yuvfile) {  
+    fprintf(stderr, "failed to open %s for readings\n",parameters->infile);
+    return 1;
+  }
+	is_16 = (tk->depth > 8);
+	prec_bytes = (is_16?2:1);
+
+  offset = (int) ((double) (frame_num * tk->w * tk->h) * (1.0 +
+		1.0 * (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy)));
+  offset *= prec_bytes;
+
+  fseek(yuvfile, 0, SEEK_END);
+  end_of_f = ftell(yuvfile);
+  fseek(yuvfile, sizeof(unsigned char) * offset, SEEK_SET);
+  position = ftell(yuvfile);
+  if (position >= end_of_f) {
+    fprintf(stderr, "Cannot reach frame number %d in yuv file !!\n",
+			frame_num);
+		fclose(yuvfile);
+    return 1;
+  }
+	
+  img->x0 = tk->Dim[0];
+  img->y0 = tk->Dim[1];
+  img->x1 = !tk->Dim[0] ? (tk->w - 1) * subsampling_dx + 1 : tk->Dim[0] +
+    (tk->w - 1) * subsampling_dx + 1;
+  img->y1 = !tk->Dim[1] ? (tk->h - 1) * subsampling_dy + 1 : tk->Dim[1] +
+    (tk->h - 1) * subsampling_dy + 1;
+
+	size = tk->w * tk->h * prec_bytes;
+	
+	for(compno = 0; compno < numcomps; compno++) 
+   {
+	max = size/(img->comps[compno].dx * img->comps[compno].dy);
+	data = img->comps[compno].data;
+
+	for (i = 0; i < max && !feof(yuvfile); i++)
+  {
+	v = 0;
+	fread(&uc, 1, 1, yuvfile);
+	v = uc;
+
+	if(is_16)
+ {
+	fread(&uc, 1, 1, yuvfile);
+	v |= (uc<<8);
+ }
+	*data++ = v;
+  }
+   }
+	fclose(yuvfile);
+	
+  return 0;
+}
+
+
+
+/*  ----------------------- */
+/* */
+/* */
+/*  IMAGE to YUV */
+/* */
+/*  ----------------------- */
+
+
+opj_bool imagetoyuv(opj_image_t * img, char *outfile)
+{
+  FILE *f;
+  int *data;
+  int i, v, is_16, prec_bytes;
+  unsigned char buf[2];
+
+  if (img->numcomps == 3) {
+    if (img->comps[0].dx != img->comps[1].dx / 2
+      || img->comps[1].dx != img->comps[2].dx) {
+      fprintf(stderr,
+				"Error with the input image components size: cannot create yuv file)\n");
+      return OPJ_FALSE;
+    }
+  } else if (!(img->numcomps == 1)) {
+    fprintf(stderr,
+      "Error with the number of image components(must be one or three)\n");
+    return OPJ_FALSE;
+  }
+  
+  f = fopen(outfile, "a+b");
+  if (!f) {
+    fprintf(stderr, "failed to open %s for writing\n", outfile);
+    return OPJ_FALSE;
+  }
+  is_16 = (img->comps[0].prec > 8);
+  prec_bytes = (is_16?2:1);
+  data = img->comps[0].data;
+  
+  for (i = 0; i < (img->comps[0].w * img->comps[0].h); i++) {
+    v = *data++;
+    buf[0] = (unsigned char)v;
+
+	if(is_16) buf[1] = (unsigned char)(v>>8);
+
+    fwrite(buf, 1, prec_bytes, f);
+  }
+  
+  
+  if (img->numcomps == 3) {
+	data = img->comps[1].data;
+
+    for (i = 0; i < (img->comps[1].w * img->comps[1].h); i++) {
+      v = *data++;
+      buf[0] = (unsigned char)v;
+
+      if(is_16) buf[1] = (unsigned char)(v>>8);
+
+      fwrite(buf, 1, prec_bytes, f);
+    }
+    data = img->comps[2].data;
+    
+    for (i = 0; i < (img->comps[2].w * img->comps[2].h); i++) {
+      v = *data++;
+      buf[0] = (unsigned char)v;
+
+      if(is_16) buf[1] = (unsigned char)(v>>8);
+
+      fwrite(buf, 1, prec_bytes, f);
+    }
+  } else if (img->numcomps == 1) {
+/* fake CbCr values */
+	if(is_16) 
+  { 
+	buf[0] = 255;
+	if(img->comps[0].prec == 10) buf[1] = 1;
+	else
+	if(img->comps[0].prec == 12) buf[1] = 3;
+	else
+	 buf[1] = 125;
+  } 
+	else buf[0] = 125;
+
+    for (i = 0; i < (img->comps[0].w * img->comps[0].h * 0.25); i++) {
+      fwrite(buf, 1, prec_bytes, f);
+    }
+    
+    
+    for (i = 0; i < (img->comps[0].w * img->comps[0].h * 0.25); i++) {
+      fwrite(buf, 1, prec_bytes, f);
+    }
+  }  
+  fclose(f);
+  return OPJ_TRUE;
+}
+
+/*  ----------------------- */
+/* */
+/* */
+/*  IMAGE to BMP */
+/* */
+/*  ----------------------- */
+
+int imagetobmp(opj_image_t * img, char *outfile) {
+  int w,wr,h,hr,i,pad;
+  FILE *f;
+  
+  if (img->numcomps == 3 && img->comps[0].dx == img->comps[1].dx
+    && img->comps[1].dx == img->comps[2].dx
+    && img->comps[0].dy == img->comps[1].dy
+    && img->comps[1].dy == img->comps[2].dy
+    && img->comps[0].prec == img->comps[1].prec
+    && img->comps[1].prec == img->comps[2].prec) {
+    /* -->> -->> -->> -->>
+    
+      24 bits color
+      
+    <<-- <<-- <<-- <<-- */
+    
+    f = fopen(outfile, "wb");
+    if (!f) {
+      fprintf(stderr, "failed to open %s for writing\n", outfile);
+      return 1;
+    }   
+    
+    w = img->comps[0].w;
+    wr = int_ceildivpow2(img->comps[0].w, img->comps[0].factor);
+    
+    h = img->comps[0].h;
+    hr = int_ceildivpow2(img->comps[0].h, img->comps[0].factor);
+    
+    fprintf(f, "BM");
+    
+    /* FILE HEADER */
+    /* ------------- */
+    fprintf(f, "%c%c%c%c",
+      (unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) +
+      54) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
+      >> 8) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
+      >> 16) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
+      >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
+      ((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
+    
+    /* INFO HEADER   */
+    /* ------------- */
+    fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
+      ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
+      (unsigned char) ((wr) >> 8) & 0xff,
+      (unsigned char) ((wr) >> 16) & 0xff,
+      (unsigned char) ((wr) >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
+      (unsigned char) ((hr) >> 8) & 0xff,
+      (unsigned char) ((hr) >> 16) & 0xff,
+      (unsigned char) ((hr) >> 24) & 0xff);
+    fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
+    fprintf(f, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
+    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c",
+      (unsigned char) (3 * hr * wr +
+      3 * hr * (wr % 2)) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
+      8) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
+      16) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
+      24) & 0xff);
+    fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    
+    for (i = 0; i < wr * hr; i++) {
+      unsigned char R, G, B;
+      /* a modifier */
+      /* R = img->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
+      R = img->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+      /* G = img->comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
+      G = img->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+      /* B = img->comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
+      B = img->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+      fprintf(f, "%c%c%c", B, G, R);
+      
+      if ((i + 1) % wr == 0) {
+				for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--)	/* ADD */
+					fprintf(f, "%c", 0);
+      }
+    }
+    fclose(f);
+  }
+  return 0;
+}
diff --git a/src/bin/mj2/mj2_convert.h b/src/bin/mj2/mj2_convert.h
new file mode 100644
index 00000000..736ef80c
--- /dev/null
+++ b/src/bin/mj2/mj2_convert.h
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2003-2004, Francois-Olivier Devaux
+* Copyright (c) 2002-2004,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. 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.
+*
+* 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 OWNER 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.
+*/
+
+
+#include "mj2.h"
+
+#ifndef __MJ2_CONVERT_H
+#define __MJ2_CONVERT_H
+
+int imagetoyuv(opj_image_t * img, char *outfile);
+
+int imagetobmp(opj_image_t * img, char *outfile);
+
+opj_image_t *mj2_image_create(mj2_tk_t * tk, opj_cparameters_t *parameters);
+
+char yuvtoimage(mj2_tk_t * tk, opj_image_t * img, int frame_num, opj_cparameters_t *parameters, char* infile);
+
+unsigned int yuv_num_frames(mj2_tk_t * tk, char *infile);
+
+
+#endif
diff --git a/src/bin/mj2/mj2_to_frames.c b/src/bin/mj2/mj2_to_frames.c
new file mode 100644
index 00000000..32679198
--- /dev/null
+++ b/src/bin/mj2/mj2_to_frames.c
@@ -0,0 +1,252 @@
+/*
+* Copyright (c) 2003-2004, Francois-Olivier Devaux
+* Copyright (c) 2002-2004,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. 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.
+*
+* 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 OWNER 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.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "opj_config.h"
+#include "openjpeg.h"
+#include "j2k_lib.h"
+#include "cio.h"
+#include "j2k.h"
+#include "jp2.h"
+#include "mj2.h"
+#include "mj2_convert.h"
+
+#ifdef HAVE_LIBLCMS2
+#include <lcms2.h>
+#endif
+#ifdef HAVE_LIBLCMS1
+#include <lcms.h>
+#endif
+#include "color.h"
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting a FILE* client object
+*/
+void info_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+int main(int argc, char *argv[]) {
+	mj2_dparameters_t mj2_parameters;			/* decompression parameters */
+	opj_dinfo_t* dinfo; 
+	opj_event_mgr_t event_mgr;		/* event manager */	
+	opj_cio_t *cio = NULL;
+  unsigned int tnum, snum;
+  opj_mj2_t *movie;
+  mj2_tk_t *track;
+  mj2_sample_t *sample;
+  unsigned char* frame_codestream;
+  FILE *file, *outfile;
+  char outfilename[50];
+  opj_image_t *img = NULL;
+	unsigned int max_codstrm_size = 0;
+	double total_time = 0;
+	unsigned int numframes = 0;
+			
+  if (argc != 3) {
+    printf("Usage: %s inputfile.mj2 outputfile.yuv\n",argv[0]); 
+    return 1;
+  }
+  
+  file = fopen(argv[1], "rb");
+  
+  if (!file) {
+    fprintf(stderr, "failed to open %s for reading\n", argv[1]);
+    return 1;
+  }
+	
+  // Checking output file
+  outfile = fopen(argv[2], "w");
+  if (!file) {
+    fprintf(stderr, "failed to open %s for writing\n", argv[2]);
+    return 1;
+  }
+  fclose(outfile);
+	
+	/*
+	configure the event callbacks (not required)
+	setting of each callback is optionnal
+	*/
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = NULL;
+	
+	/* get a MJ2 decompressor handle */
+	dinfo = mj2_create_decompress();
+	movie = (opj_mj2_t*)dinfo->mj2_handle;
+	
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);		
+
+	memset(&mj2_parameters, 0, sizeof(mj2_dparameters_t));
+	/* set J2K decoding parameters to default values */
+	opj_set_default_decoder_parameters(&mj2_parameters.j2k_parameters);
+	
+	/* setup the decoder decoding parameters using user parameters */
+	mj2_setup_decoder(movie, &mj2_parameters);
+			
+  if (mj2_read_struct(file, movie)) // Creating the movie structure
+    return 1;	
+	
+  // Decode first video track 
+	for (tnum=0; tnum < (unsigned int)(movie->num_htk + movie->num_stk + movie->num_vtk); tnum++) {
+		if (movie->tk[tnum].track_type == 0) 
+			break;
+	}
+	
+	if (movie->tk[tnum].track_type != 0) {
+		printf("Error. Movie does not contain any video track\n");
+		return 1;
+	}
+	
+  track = &movie->tk[tnum];
+	
+  // Output info on first video tracl
+  fprintf(stdout,"The first video track contains %d frames.\nWidth: %d, Height: %d \n\n",
+    track->num_samples, track->w, track->h);
+	
+	max_codstrm_size = track->sample[0].sample_size-8;
+	frame_codestream = (unsigned char*) malloc(max_codstrm_size * sizeof(unsigned char)); 
+
+	numframes = track->num_samples;
+	
+  for (snum=0; snum < numframes; snum++)
+  {
+		double init_time = opj_clock();
+		double elapsed_time;
+
+    sample = &track->sample[snum];
+		if (sample->sample_size-8 > max_codstrm_size) {
+			max_codstrm_size =  sample->sample_size-8;
+			if ((frame_codestream = (unsigned char*)
+				realloc(frame_codestream, max_codstrm_size)) == NULL) {
+				printf("Error reallocation memory\n");
+				return 1;
+			}; 		
+		}
+    fseek(file,sample->offset+8,SEEK_SET);
+    fread(frame_codestream, sample->sample_size-8, 1, file);  // Assuming that jp and ftyp markers size do
+		
+		/* open a byte stream */
+		cio = opj_cio_open((opj_common_ptr)dinfo, frame_codestream, sample->sample_size-8);
+		
+		img = opj_decode(dinfo, cio); // Decode J2K to image
+
+#ifdef WANT_SYCC_TO_RGB
+	if(img->color_space == CLRSPC_SYCC)
+  {
+	color_sycc_to_rgb(img);
+  }
+#endif
+
+	if(img->icc_profile_buf)
+  {
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+	color_apply_icc_profile(img);
+#endif
+
+	free(img->icc_profile_buf);
+	img->icc_profile_buf = NULL; img->icc_profile_len = 0;
+  }
+
+    if (((img->numcomps == 3) && (img->comps[0].dx == img->comps[1].dx / 2) 
+      && (img->comps[0].dx == img->comps[2].dx / 2 ) && (img->comps[0].dx == 1)) 
+      || (img->numcomps == 1)) {
+      
+      if (!imagetoyuv(img, argv[2]))	// Convert image to YUV
+				return 1;
+    }
+    else if ((img->numcomps == 3) && 
+      (img->comps[0].dx == 1) && (img->comps[1].dx == 1)&&
+      (img->comps[2].dx == 1))// If YUV 4:4:4 input --> to bmp
+    {
+      fprintf(stdout,"The frames will be output in a bmp format (output_1.bmp, ...)\n");
+      sprintf(outfilename,"output_%d.bmp",snum);
+      if (imagetobmp(img, outfilename))	// Convert image to BMP
+				return 1;
+      
+    }
+    else {
+      fprintf(stdout,"Image component dimensions are unknown. Unable to output image\n");
+      fprintf(stdout,"The frames will be output in a j2k file (output_1.j2k, ...)\n");
+			
+      sprintf(outfilename,"output_%d.j2k",snum);
+      outfile = fopen(outfilename, "wb");
+      if (!outfile) {
+				fprintf(stderr, "failed to open %s for writing\n",outfilename);
+				return 1;
+      }
+      fwrite(frame_codestream,sample->sample_size-8,1,outfile);
+      fclose(outfile);
+    }
+		/* close the byte stream */
+		opj_cio_close(cio);	
+		/* free image data structure */
+		opj_image_destroy(img);
+		elapsed_time = opj_clock()-init_time;
+		fprintf(stderr, "Frame number %d/%d decoded in %.2f mseconds\n", snum + 1, numframes, elapsed_time*1000);
+		total_time += elapsed_time;
+
+  }
+	
+	free(frame_codestream);	
+  fclose(file);	
+
+	/* free remaining structures */
+	if(dinfo) {
+		mj2_destroy_decompress((opj_mj2_t*)dinfo->mj2_handle);
+	}
+	free(dinfo);
+	
+	fprintf(stdout, "%d frame(s) correctly decompressed\n", snum);
+	fprintf(stdout,"Total decoding time: %.2f seconds (%.1f fps)\n", total_time, (float)numframes/total_time);
+		
+  return 0;
+}
diff --git a/src/bin/mj2/mj2_to_metadata.c b/src/bin/mj2/mj2_to_metadata.c
new file mode 100644
index 00000000..489f19cb
--- /dev/null
+++ b/src/bin/mj2/mj2_to_metadata.c
@@ -0,0 +1,312 @@
+/* mj2_to_metadata.c */
+/* Dump MJ2, JP2 metadata (partial so far) to xml file */
+/* Contributed to Open JPEG by Glenn Pearson, contract software developer, U.S. National Library of Medicine.
+
+The base code in this file was developed by the author as part of a video archiving
+project for the U.S. National Library of Medicine, Bethesda, MD. 
+It is the policy of NLM (and U.S. government) to not assert copyright.
+
+A non-exclusive copy of this code has been contributed to the Open JPEG project.
+Except for copyright, inclusion of the code within Open JPEG for distribution and use
+can be bound by the Open JPEG open-source license and disclaimer, expressed elsewhere.
+*/
+
+#include "opj_includes.h"
+#include "mj2.h"
+
+#include "mj2_to_metadata.h"
+#include <string.h>
+#include "opj_getopt.h"
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting a FILE* client object
+*/
+void info_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* ------------- */
+
+void help_display()
+{
+  /*             "1234567890123456789012345678901234567890123456789012345678901234567890123456789" */
+  fprintf(stdout,"                Help for the 'mj2_to_metadata' Program\n");
+  fprintf(stdout,"                ======================================\n");
+  fprintf(stdout,"The -h option displays this information on screen.\n\n");
+  
+  fprintf(stdout,"mj2_to_metadata generates an XML file from a Motion JPEG 2000 file.\n");
+  fprintf(stdout,"The generated XML shows the structural, but not (yet) curatorial,\n");
+  fprintf(stdout,"metadata from the movie header and from the JPEG 2000 image and tile\n");
+  fprintf(stdout,"headers of a sample frame.  Excluded: low-level packed-bits image data.\n\n");
+
+  fprintf(stdout,"By Default\n");
+  fprintf(stdout,"----------\n");
+  fprintf(stdout,"The metadata includes the jp2 image and tile headers of the first frame.\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"Metadata values are shown in 'raw' form (e.g., hexidecimal) as stored in the\n");
+  fprintf(stdout,"file, and, if apt, in a 'derived' form that is more quickly grasped.\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"Notes explaining the XML are embedded as terse comments.  These include\n");
+  fprintf(stdout,"   meaning of non-obvious tag abbreviations;\n");
+  fprintf(stdout,"   range and precision of valid values;\n");
+  fprintf(stdout,"   interpretations of values, such as enumerations; and\n");
+  fprintf(stdout,"   current implementation limitations.\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"The sample-size and chunk-offset tables, each with 1 row per frame, are not reported.\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"The file is self-contained and no verification (e.g., against a DTD) is requested.\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"Required Parameters (except with -h)\n");
+  fprintf(stdout,"------------------------------------\n");
+  fprintf(stdout,"[Caution: file strings that contain spaces should be wrapped with quotes.]\n");
+  fprintf(stdout,"-i input.mj2  : where 'input' is any source file name or path.\n");
+  fprintf(stdout,"                MJ2 files created with 'frames_to_mj2' are supported so far.\n");
+  fprintf(stdout,"                These are silent, single-track, 'MJ2 Simple Profile' videos.\n");
+  fprintf(stdout,"-o output.xml : where 'output' is any destination file name or path.\n");
+  fprintf(stdout,"\n");
+  fprintf(stdout,"Optional Parameters\n");
+  fprintf(stdout,"-------------------\n");
+  fprintf(stdout,"-h            : Display this help information.\n");
+  fprintf(stdout,"-n            : Suppress all mj2_to_metadata notes.\n");
+  fprintf(stdout,"-t            : Include sample-size and chunk-offset tables.\n");
+  fprintf(stdout,"-f n          : where n > 0.  Include jp2 header info for frame n [default=1].\n");
+  fprintf(stdout,"-f 0          : No jp2 header info.\n");
+  fprintf(stdout,"-r            : Suppress all 'raw' data for which a 'derived' form exists.\n");
+  fprintf(stdout,"-d            : Suppress all 'derived' data.\n");
+  fprintf(stdout,"                (If both -r and -d given, -r will be ignored.)\n");
+  fprintf(stdout,"-v string     : Verify against the DTD file located by the string.\n");
+  fprintf(stdout,"                Prepend quoted 'string' with either SYSTEM or PUBLIC keyword.\n");
+  fprintf(stdout,"                Thus, for the distributed DTD placed in the same directory as\n");
+  fprintf(stdout,"                the output file: -v \"SYSTEM mj2_to_metadata.dtd\"\n");
+  fprintf(stdout,"                \"PUBLIC\" is used with an access protocol (e.g., http:) + URL.\n");
+  /* More to come */
+  fprintf(stdout,"\n");
+  /*             "1234567890123456789012345678901234567890123456789012345678901234567890123456789" */
+}
+
+/* ------------- */
+
+int main(int argc, char *argv[]) {
+
+	opj_dinfo_t* dinfo; 
+	opj_event_mgr_t event_mgr;		/* event manager */
+
+  FILE *file, *xmlout;
+/*  char xmloutname[50]; */
+  opj_mj2_t *movie;
+
+  char* infile = 0;
+  char* outfile = 0;
+  char* s, S1, S2, S3;
+  int len;
+  unsigned int sampleframe = 1; /* First frame */
+  char* stringDTD = NULL;
+  BOOL notes = TRUE;
+  BOOL sampletables = FALSE;
+  BOOL raw = TRUE;
+  BOOL derived = TRUE;
+	mj2_dparameters_t parameters;
+
+  while (TRUE) {
+	/* ':' after letter means it takes an argument */
+    int c = getopt(argc, argv, "i:o:f:v:hntrd");
+	/* FUTURE:  Reserve 'p' for pruning file (which will probably make -t redundant) */
+    if (c == -1)
+      break;
+    switch (c) {
+    case 'i':			/* IN file */
+      infile = optarg;
+      s = optarg;
+      while (*s) { s++; } /* Run to filename end */
+      s--;
+      S3 = *s;
+      s--;
+      S2 = *s;
+      s--;
+      S1 = *s;
+      
+      if ((S1 == 'm' && S2 == 'j' && S3 == '2')
+      || (S1 == 'M' && S2 == 'J' && S3 == '2')) {
+       break;
+      }
+      fprintf(stderr, "Input file name must have .mj2 extension, not .%c%c%c.\n", S1, S2, S3);
+      return 1;
+
+      /* ----------------------------------------------------- */
+    case 'o':			/* OUT file */
+      outfile = optarg;
+      while (*outfile) { outfile++; } /* Run to filename end */
+      outfile--;
+      S3 = *outfile;
+      outfile--;
+      S2 = *outfile;
+      outfile--;
+      S1 = *outfile;
+      
+      outfile = optarg;
+      
+      if ((S1 == 'x' && S2 == 'm' && S3 == 'l')
+	  || (S1 == 'X' && S2 == 'M' && S3 == 'L'))
+        break;
+    
+      fprintf(stderr,
+	  "Output file name must have .xml extension, not .%c%c%c\n", S1, S2, S3);
+	  return 1;
+
+      /* ----------------------------------------------------- */
+    case 'f':			/* Choose sample frame.  0 = none */
+      sscanf(optarg, "%u", &sampleframe);
+      break;
+
+      /* ----------------------------------------------------- */
+    case 'v':			/* Verification by DTD. */
+      stringDTD = optarg;
+	  /* We will not insist upon last 3 chars being "dtd", since non-file
+	  access protocol may be used. */
+	  if(strchr(stringDTD,'"') != NULL) {
+        fprintf(stderr, "-D's string must not contain any embedded double-quote characters.\n");
+	    return 1;
+	  }
+
+      if (strncmp(stringDTD,"PUBLIC ",7) == 0 || strncmp(stringDTD,"SYSTEM ",7) == 0)
+        break;
+    
+      fprintf(stderr, "-D's string must start with \"PUBLIC \" or \"SYSTEM \"\n");
+	  return 1;
+
+    /* ----------------------------------------------------- */
+    case 'n':			/* Suppress comments */
+      notes = FALSE;
+      break;
+
+    /* ----------------------------------------------------- */
+    case 't':			/* Show sample size and chunk offset tables */
+      sampletables = TRUE;
+      break;
+
+    /* ----------------------------------------------------- */
+    case 'h':			/* Display an help description */
+      help_display();
+      return 0;
+
+    /* ----------------------------------------------------- */
+    case 'r':			/* Suppress raw data */
+      raw = FALSE;
+      break;
+
+    /* ----------------------------------------------------- */
+    case 'd':			/* Suppress derived data */
+      derived = FALSE;
+      break;
+
+   /* ----------------------------------------------------- */
+    default:
+      return 1;
+    } /* switch */
+  } /* while */
+
+  if(!raw && !derived)
+	  raw = TRUE; /* At least one of 'raw' and 'derived' must be true */
+
+    /* Error messages */
+  /* -------------- */
+  if (!infile || !outfile) {
+    fprintf(stderr,"Correct usage: mj2_to_metadata -i mj2-file -o xml-file (plus options)\n");
+    return 1;
+  }
+
+/* was:
+  if (argc != 3) {
+    printf("Bad syntax: Usage: MJ2_to_metadata inputfile.mj2 outputfile.xml\n"); 
+    printf("Example: MJ2_to_metadata foreman.mj2 foreman.xml\n");
+    return 1;
+  }
+*/
+  len = strlen(infile);
+  if(infile[0] == ' ')
+  {
+    infile++; /* There may be a leading blank if user put space after -i */
+  }
+  
+  file = fopen(infile, "rb"); /* was: argv[1] */
+  
+  if (!file) {
+    fprintf(stderr, "Failed to open %s for reading.\n", infile); /* was: argv[1] */
+    return 1;
+  }
+
+  len = strlen(outfile);
+  if(outfile[0] == ' ')
+  {
+    outfile++; /* There may be a leading blank if user put space after -o */
+  }
+
+  // Checking output file
+  xmlout = fopen(outfile, "w"); /* was: argv[2] */
+  if (!xmlout) {
+    fprintf(stderr, "Failed to open %s for writing.\n", outfile); /* was: argv[2] */
+    return 1;
+  }
+  // Leave it open
+
+	/*
+	configure the event callbacks (not required)
+	setting of each callback is optionnal
+	*/
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = info_callback;
+
+	/* get a MJ2 decompressor handle */
+	dinfo = mj2_create_decompress();
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);		
+
+	/* setup the decoder decoding parameters using user parameters */
+	movie = (opj_mj2_t*) dinfo->mj2_handle;
+	mj2_setup_decoder(dinfo->mj2_handle, &parameters);
+
+  if (mj2_read_struct(file, movie)) // Creating the movie structure
+  {
+    fclose(xmlout);
+    return 1;
+  }
+
+  xml_write_init(notes, sampletables, raw, derived);
+  xml_write_struct(file, xmlout, movie, sampleframe, stringDTD, &event_mgr);
+  fclose(xmlout);
+
+	fprintf(stderr,"Metadata correctly extracted to XML file \n");;	
+
+	/* free remaining structures */
+	if(dinfo) {
+		mj2_destroy_decompress((opj_mj2_t*)dinfo->mj2_handle);
+	}
+
+  return 0;
+}
+
+
diff --git a/src/bin/mj2/mj2_to_metadata.dtd b/src/bin/mj2/mj2_to_metadata.dtd
new file mode 100644
index 00000000..249de1a0
--- /dev/null
+++ b/src/bin/mj2/mj2_to_metadata.dtd
@@ -0,0 +1,425 @@
+<!--
+Preliminary DTD for Open JPEG "mj2_to_metadata" function.
+Last revised: April 20, 2005
+Author:  Glenn Pearson, at U.S. National Library of Medicine.
+See mj2_to_metadata.c regarding copyright, license, disclaimer status.
+
+While the vocabulary of this DTD is based on the relevant portions of the
+ISO/IEC JPEG 200 standard, the detailed representation is the author's own.
+It is neither an ISO/IEC nor NLM official or consensus representation.
+Furthermore, it deviates from a pure representation of the ISO/IEC standard
+in these aspects:
+
+  - it is incomplete in a number of ways (which to some extent may be
+    addressed over time);
+  - it has extensions for "derived" data and "statistics";
+  - it is more flexible.  That is, some elements are marked as optional
+    not because they are optional in an MJ2 file, but because reporting
+    of them is optional based on current or projected mj2_to_metadata
+    command-line flags.
+-->
+<!ELEMENT MJ2_File (JP2?, FileType?, MovieBox?)>
+<!ELEMENT JP2 EMPTY>
+<!ATTLIST JP2 BoxType CDATA #FIXED "jP[space][space]">
+<!ATTLIST JP2 Signature CDATA #FIXED "0x0d0a870a">
+<!ELEMENT FileType (Brand, MinorVersion, CompatibilityList)>
+<!ATTLIST FileType BoxType CDATA #FIXED "ftyp">
+<!ELEMENT Brand (#PCDATA)> <!-- 4 characters max -->
+<!ELEMENT MinorVersion (#PCDATA)> <!-- 4 chararcters max -->
+<!ELEMENT CompatibilityList (CompatibleBrand)*>
+<!ATTLIST CompatibilityList Count CDATA #REQUIRED>  <!-- Count >= 0 -->
+<!ELEMENT CompatibleBrand (#PCDATA)> <!-- 4 characters max -->
+<!ELEMENT MovieBox (MovieHeader, Statistics?, Track*)>
+<!ATTLIST MovieBox BoxType CDATA #FIXED "moov">
+<!ELEMENT MovieHeader (CreationTime, ModificationTime, Timescale, Rate, Duration, Volume, TransformationMatrix)>
+<!ATTLIST MovieHeader BoxType CDATA #FIXED "mvhd">
+<!ELEMENT CreationTime (InSeconds?,AsLocalTime?)>
+<!ELEMENT InSeconds (#PCDATA)>
+<!ELEMENT AsLocalTime (#PCDATA)>
+<!ELEMENT ModificationTime (InSeconds?,AsLocalTime?)>
+<!ELEMENT Timescale (#PCDATA)> <!-- Timescale defines time units in one second -->
+<!ELEMENT Rate (AsHex | (AsHex, AsDecimal) | AsDecimal)>  <!-- Decimal is Approximation; Optional on input. -->
+<!ELEMENT AsHex (#PCDATA)>
+<!ELEMENT AsDecimal (#PCDATA)> 
+<!ELEMENT Duration (InTimeUnits | (InTimeUnits, InSeconds) | InSeconds)>  <!-- InSeconds Optional on input. -->
+<!ELEMENT InTimeUnits (#PCDATA)>
+<!ELEMENT Volume (AsHex | (AsHex, AsDecimal) | AsDecimal)>   <!-- hex default = 0x0100 -->
+<!-- Fixed 8.8 value of audio volume.  Full, normal value is 1.0 (0x0100) -->
+<!ELEMENT TransformationMatrix (TMa,TMb,TMu,TMc,TMd,TMv,TMx,TMy,TMw)> <!-- for video -->
+<!-- 3 x 3 Video Transformation Matrix {a,b,u,c,d,v,x,y,w}.  Required: u=0, v=0, w=1 -->
+<!-- Maps decompressed point (p,q) to rendered point (ap + cq + x, bp + dq + y) -->
+<!-- Stored as Fixed Point Hex: all are 16.16, except u,v,w are 2.30 -->
+<!-- Unity = 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 -->
+<!ELEMENT TMa (#PCDATA)>    
+<!ELEMENT TMb (#PCDATA)>  
+<!ELEMENT TMu (#PCDATA)> <!--Always "0x00000000" -->
+<!ELEMENT TMc (#PCDATA)>
+<!ELEMENT TMd (#PCDATA)>
+<!ELEMENT TMv (#PCDATA)> <!--Always "0x00000000" -->
+<!ELEMENT TMx (#PCDATA)>
+<!ELEMENT TMy (#PCDATA)>
+<!ELEMENT TMw (#PCDATA)> <!--Always "0x40000000" -->
+
+<!ELEMENT Statistics (TracksFound)>
+<!ELEMENT TracksFound (Video,Audio,Hint)>
+<!ELEMENT Video (#PCDATA)>
+<!ELEMENT Audio (#PCDATA)>
+<!ELEMENT Hint (#PCDATA)>
+ 
+
+<!-- For now, output info on at most one video track -->
+
+
+<!ELEMENT Track (TrackHeader, TrackReferenceContainer?, EditListContainer?, Media, JP2_Frame?)>  <!-- JP2_Frame is mj2_to_metadata extension -->
+<!ATTLIST Track BoxType CDATA #FIXED "trak">
+<!ATTLIST Track Instance CDATA #REQUIRED>
+<!ELEMENT TrackHeader (TrackID, TrackLayer?, Volume?, TransformationMatrix?, Width?, Height?)>
+<!ATTLIST TrackHeader BoxType CDATA #FIXED "tkhd">
+<!-- Not shown here: CreationTime, ModificationTime, Duration. -->
+<!-- These 3 fields are reported under MediaHeader below.   When reading these 3, -->
+<!-- m2j_to_metadata currently doesn't distinguish between TrackHeader and MediaHeader source. -->
+<!-- If both found, value read from MediaHeader is used. -->
+<!ELEMENT TrackID (#PCDATA)>
+<!ELEMENT TrackLayer (#PCDATA)>  <!-- front-to-back ordering of video tracks. 0 = normal, -1 is closer, etc. -->
+<!-- "Volume" element described above; here it is for particular audio track.  Full, normal (default = 0x0100) -->
+<!-- "TransformationMatrix" element described above; matrix here is applied before MovieHeader one. -->
+<!ELEMENT Width (AsHex | (AsHex, AsDecimal) | AsDecimal)>
+<!ELEMENT Height (AsHex | (AsHex, AsDecimal) | AsDecimal)>
+<!-- AsHex, AsDecimal already defined above -->
+ <!-- Width and Height are for the presentation; frames will be scaled to this -->
+<!-- /TrackHeader -->
+<!ELEMENT TrackReferenceContainer ANY>  <!-- TO DO: TrackReferenceContainer 'tref'  just used in hint track -->
+<!ELEMENT EditListContainer ANY>  <!-- TO DO: EditListContainer 'edts', contains EditList 'elst' with media-time, segment-duration, media-rate -->
+<!ELEMENT Media (MediaHeader, HandlerReference,MediaInfoContainer)>
+<!ATTLIST Media BoxType CDATA #FIXED "mdia">
+<!ELEMENT MediaHeader (CreationTime,ModificationTime,Timescale,Duration,Language)>
+<!ATTLIST MediaHeader BoxType CDATA #FIXED "mdhd">
+<!-- Elements already defined above: CreationTime, ModificationTime, Timescale, Duration -->
+<!ELEMENT Language (#PCDATA)> <!-- 3 chars max.  There's an enumeration available -->
+<!ELEMENT HandlerReference (HandlerType)>
+<!ATTLIST HandlerReference BoxType CDATA #FIXED "hdlr">
+<!ELEMENT HandlerType (#PCDATA)>
+<!ATTLIST HandlerType Code ( vide | soun | hint ) "vide">
+
+<!-- make the media headers multiple? -->
+<!ELEMENT MediaInfoContainer ((VideoMediaHeader | SoundMediaHeader | HintMediaHeader), DataInfo, SampleTable)>
+<!ATTLIST MediaInfoContainer BoxType CDATA #FIXED "minf">
+<!ELEMENT VideoMediaHeader (GraphicsMode, Opcolor)>
+<!ATTLIST VideoMediaHeader BoxType CDATA #FIXED "vmhd">
+<!ELEMENT GraphicsMode (#PCDATA)>
+          <!-- Enumerated values of graphics mode: -->
+          <!--  0x00 = copy (over existing image); -->
+          <!--  0x24 = transparent; 'blue-screen' this image using opcolor; -->
+          <!--  0x100 = alpha; alpha-blend this image -->
+          <!--  0x101 = whitealpha; alpha-blend this image, which has been blended with white; -->
+          <!--  0x102 = blackalpha; alpha-blend this image, which has been blended with black. -->
+<!ELEMENT Opcolor (Red,Green,Blue)>
+<!ELEMENT Red (#PCDATA)>
+<!ELEMENT Green (#PCDATA)>
+<!ELEMENT Blue (#PCDATA)>
+<!ELEMENT SoundMediaHeader (Balance)>
+<!ATTLIST SoundMediaHeader BoxType CDATA #FIXED "smhd">
+<!ELEMENT Balance (#PCDATA)>
+          <!-- Fixed Point 8.8, fixes mono track in stereo space. -->
+          <!-- 0.0 = center, -1.0 = full left, 1.0 = full right -->
+<!ELEMENT HintMediaHeader (MaxPDU_Size, AvgPDU_Size, MaxBitRate, AvgBitRate, SlidingAvgBitRate)>
+<!ATTLIST HintMediaHeader BoxType CDATA #FIXED "hmhd">
+<!ELEMENT MaxPDU_Size (#PCDATA)>
+          <!-- Size in bytes of largest PDU in this hint stream. -->
+<!ELEMENT AvgPDU_Size (#PCDATA)>
+           <!-- Average size in bytes of a PDU over the entire presentation. -->
+<!ELEMENT MaxBitRate (#PCDATA)>
+          <!-- Maximum rate in bits per second over any window of 1 second. -->
+<!ELEMENT AvgBitRate (#PCDATA)>
+          <!-- Averate rate in bits per second over the entire presentation. -->
+<!ELEMENT SlidingAvgBit (#PCDATA)>
+          <!-- Maximum rate in bits per second over any window of one minute. -->
+ 
+<!ELEMENT DataInfo (DataReference)>
+<!ATTLIST DataInfo BoxType CDATA #FIXED "dinf">
+<!ELEMENT DataReference (DataEntryUrlBox | DataEntryUrnBox )*>
+<!ATTLIST DataReference BoxType CDATA #FIXED "dref">
+<!ATTLIST DataReference URL_Count CDATA #REQUIRED>
+<!ATTLIST DataReference URN_Count CDATA #REQUIRED> <!-- table w. flags, URLs, URNs -->
+<!--  // Data structure does not distinguish between single URL, single URN, or DREF table or URLs & URNs.
+  // We could infer those, but for now just present everything as a DREF table.
+-->
+              <!-- No entries here mean that file is self-contained, as required by Simple Profile. -->
+
+<!ELEMENT DataEntryUrlBox (Location)>
+<!ATTLIST DataEntryUrlBox BoxType CDATA #FIXED "url[space]"> <!-- table w. flags, URLs, URNs -->
+            <!-- Only the first 16 bytes of URL location are recorded in mj2_to_metadata data structure. -->
+<!ELEMENT DataEntryUrnBox (Name, Location?)>
+<!ATTLIST DataEntryUrnBox BoxType CDATA #FIXED "urn[space]\">
+            <!-- Only the first 16 bytes each of URN name and optional location are recorded in mj2_to_metadata data structure. -->
+
+<!ELEMENT SampleTable (VisualSampleEntry,TimeToSample,SampleToChunk,SampleSize,ChunkOffset)>  <!-- structure doesn't do non-visual sample entry yet -->
+<!ATTLIST SampleTable BoxType CDATA #FIXED "stbl">  <!-- to add: entry count -->
+            <!-- Next are instances of generic SampleDescription BoxType=\"stsd\" -->
+ 
+    <!-- There could be multiple instances of this, but "entry_count" is just a local at read-time.
+       And it's used wrong, too, as count of just visual type, when it's really all 3 types.
+       This is referred to as "smj2" within mj2.c -->
+<!ELEMENT VisualSampleEntry (WidthAsInteger, HeightAsInteger, HorizontalRes, VerticalRes, CompressorName, Depth, JP2Header?, FieldCoding?, MJP2_Profile?, MJP2_Prefix?, MJP2_SubSampling?, MJP2_OriginalFormat?)>
+<!ATTLIST VisualSampleEntry BoxType CDATA #FIXED "mjp2">
+          <!-- If multiple instances of this, only first is shown here. -->
+<!ELEMENT WidthAsInteger (#PCDATA)>
+<!ELEMENT HeightAsInteger (#PCDATA)>
+<!ELEMENT HorizontalRes (AsHex | (AsHex, AsDecimal) | AsDecimal)>
+<!ELEMENT VerticalRes (AsHex | (AsHex, AsDecimal) | AsDecimal)>
+<!-- Typical value for both resolution is 72 (0x00480000) -->
+<!ELEMENT CompressorName (#PCDATA)>
+          <!-- Compressor name for debugging.  Standard restricts max length to 31 bytes. -->
+          <!-- Usually blank or \"Motion JPEG2000\" -->
+<!ELEMENT Depth (#PCDATA)>
+          <!-- Depth is: -->
+          <!--   0x20: alpha channels present (color or grayscale) -->
+          <!--   0x28: grayscale without alpha -->
+          <!--   0x18: color without alpha -->
+
+<!-- TODO somewhere: tk->jp2_struct.numcomps -->
+<!ELEMENT JP2Header (ImageHeader, ColourSpecification)>
+<!ATTLIST JP2Header BoxType CDATA #FIXED "jp2h">
+<!ELEMENT ImageHeader (HEIGHT, WIDTH, NC, BPC, C, UnkC, IPR)>
+<!ATTLIST ImageHeader BoxType CDATA #FIXED "ihdr">
+<!ELEMENT HEIGHT (#PCDATA)>  <!-- If 2 fields/frame, total deinterlaced height -->
+<!ELEMENT WIDTH (#PCDATA)>
+<!ELEMENT NC (#PCDATA)>  <!-- number of components -->
+<!ELEMENT BPC (AsHex | (AsHex,BitsPerPixel,Signed) | (BitsPerPixel,Signed))>
+<!ELEMENT BitsPerPixel (#PCDATA)>
+<!ELEMENT Signed (#PCDATA)>
+<!ELEMENT C (#PCDATA)>  <!-- Compression type.  Only "7" defined -->
+<!ELEMENT UnkC (#PCDATA)>  <!-- Colourspace Unknown. 1 = unknown, 0 = known -->
+<!ELEMENT IPR (#PCDATA)>  <!-- 1 = frame has Intellectual Prop. box; otherwise 0 -->
+<!ELEMENT ColourSpecification (METH, PREC, APPROX, EnumCS)>
+<!ATTLIST ColourSpecification BoxType CDATA #FIXED "colr">
+<!ELEMENT METH (#PCDATA)>  <!-- 1 = EnumCS field; 2 = PROFILE field (not yet generated) -->
+<!ELEMENT PREC (#PCDATA)> <!-- precedence must be 0 so far -->
+<!ELEMENT APPROX (#PCDATA)>  <!-- colourspace approximation must be 0 so far -->
+<!ELEMENT EnumCS (#PCDATA)> <!-- Valid enumerated MJ2 colourspaces: 16 (sRGB), 17 (grey sRGB), 18 (YCC) -->
+
+<!-- Following subboxes are optional -->
+<!ELEMENT FieldCoding (FieldCount, FieldOrder)>
+<!ATTLIST FieldCoding BoxType CDATA #FIXED "fiel">
+<!ELEMENT FieldCount (#PCDATA)>
+            <!-- Must be either 1 or 2 -->
+<!ELEMENT FieldOrder (#PCDATA)>
+            <!-- When FieldCount=2, FieldOrder means: -->
+            <!--   0: Field coding unknown -->
+            <!--   1: Field with topmost line is stored first in sample; fields are in temporal order -->
+            <!--   6: Field with topmost line is stored second in sample; fields are in temporal order -->
+            <!-- Defaults: FieldCount=1, FieldOrder=0 if FieldCoding box not present -->
+            <!-- Current implementation doesn't retain whether box was actually present. -->
+
+<!ELEMENT MJP2_Profile (CompatibleBrand*)>
+<!ATTLIST MJP2_Profile BoxType CDATA #FIXED "jp2p">
+<!ATTLIST MJP2_Profile Count CDATA #REQUIRED>
+
+<!ELEMENT MJP2_Prefix (Data*)>
+<!ATTLIST MJP2_Prefix BoxType CDATA #FIXED "jp2x">
+<!ATTLIST MJP2_Prefix Count CDATA #REQUIRED>
+<!-- We'll probably need better formatting than this  -->
+<!ELEMENT Data (#PCDATA)>    <!-- Multiple. Each entry is single byte -->
+
+<!ELEMENT MJP2_SubSampling (HorizontalSub, VerticalSub, HorizontalOffset, VerticalOffset)>
+<!ATTLIST MJP2_SubSampling BoxType CDATA #FIXED "jsub">
+<!-- These values are all 1 byte -->
+            <!-- Typical subsample value is 2 for 4:2:0 -->
+<!ELEMENT HorizontalSub (#PCDATA)>
+<!ELEMENT VerticalSub (#PCDATA)>
+<!ELEMENT HorizontalOffset (#PCDATA)>
+<!ELEMENT VerticalOffset (#PCDATA)>
+
+<!ELEMENT MJP2_OriginalFormat (OriginalFieldCount, OriginalFieldOrder)>
+<!ATTLIST MJP2_OriginalFormat BoxType CDATA #FIXED "orfo"> <!-- Part III Appx. 2 -->
+<!ELEMENT OriginalFieldCount (#PCDATA)>
+            <!-- In original material before encoding.  Must be either 1 or 2 -->
+<!ELEMENT OriginalFieldOrder (#PCDATA)>
+            <!-- When FieldCount=2, FieldOrder means: -->
+            <!--   0: Field coding unknown -->
+            <!--   11: Topmost line came from the earlier field; -->
+            <!--   16:  Topmost line came form the later field. -->
+            <!-- Defaults: FieldCount=1, FieldOrder=0 if FieldCoding box not present -->
+            <!-- Current implementation doesn't retain whether box was actually present. -->
+
+
+            <!-- mj2_to_metadata's data structure doesn't record Audio and Hint sample data currently. -->
+
+<!-- Within SampleTable: -->
+<!ELEMENT TimeToSample (SampleStatistics, SampleEntries)>
+<!ATTLIST TimeToSample BoxType CDATA #FIXED "stts">  
+<!ELEMENT SampleStatistics (TotalSamples)>  <!-- Not part of standard -->  
+<!ELEMENT TotalSamples (#PCDATA)>
+                <!-- For video, gives the total frames in the track, by summing all entries in the Sample Table -->
+
+<!ELEMENT SampleEntries (Table*)>
+<!ATTLIST SampleEntries EntryCount CDATA #REQUIRED>
+<!ELEMENT Table EMPTY> <!-- Multiple.  Attributes have values -->
+<!ATTLIST Table Entry CDATA #REQUIRED>
+<!ATTLIST Table SampleCount CDATA #REQUIRED>
+<!ATTLIST Table SampleDelta CDATA #REQUIRED>
+
+<!-- Within SampleTable: -->
+<!ELEMENT SampleToChunk (FirstChunk,SamplesPerChunk,SampleDescrIndex)>
+<!ATTLIST SampleToChunk BoxType CDATA #FIXED "stsc">
+<!ATTLIST SampleToChunk Count CDATA #REQUIRED>
+<!ELEMENT FirstChunk (#PCDATA)>
+<!ELEMENT SamplesPerChunk (#PCDATA)>
+<!ELEMENT SampleDescrIndex (#PCDATA)>
+<!ELEMENT SampleSize (Sample_Size,Sample_Count,EntrySize*)>
+<!ATTLIST SampleSize BoxType CDATA #FIXED "stsz">
+<!ELEMENT Sample_Size (#PCDATA)>
+<!ELEMENT Sample_Count (#PCDATA)>
+<!ELEMENT EntrySize (#PCDATA)>  <!-- appears multiply, but only with mj2_to_metadata option -t -->
+<!ATTLIST EntrySize Num CDATA #REQUIRED>
+<!ELEMENT ChunkOffset (EntryCount, Chunk_Offset*)>
+<!ATTLIST ChunkOffset BoxType CDATA #FIXED "stco">
+<!ELEMENT EntryCount (#PCDATA)>
+<!ELEMENT Chunk_Offset (#PCDATA)>  <!-- appears multiply, but only with mj2_to_metadata option -t -->
+<!ATTLIST Chunk_Offset Num CDATA #REQUIRED>
+<!-- </SampleTable> </MediaInfoContainer> </Media> -->
+
+<!-- TO DO: optional UserData 'udat', can contain multiple Copyright 'cprt' -->
+
+
+<!-- Optional, and only for Visual Track: given individual frame -->
+<!ELEMENT JP2_Frame (MainHeader, TilePartHeaders)>
+<!ATTLIST JP2_Frame Num CDATA #REQUIRED>
+<!ELEMENT MainHeader (StartOfCodestream,ImageAndFileSize,CodingStyleDefault,QuantizationDefault,QuantizationComponent*,RegionOfInterest?,ProgressionOrderChange*)>
+<!ELEMENT StartOfCodestream EMPTY>
+<!ATTLIST StartOfCodestream Marker CDATA #FIXED "SOC">
+<!ELEMENT ImageAndFileSize (Xsiz,Ysiz,XOsiz,YOsiz,XTsiz,YTsiz,XTOsiz,YTOsiz,Csiz,Component+)>
+<!ATTLIST ImageAndFileSize Marker CDATA #FIXED "SIZ">
+<!ELEMENT Xsiz (#PCDATA)>
+<!ELEMENT Ysiz (#PCDATA)>  <!-- Xsiz, Ysiz is the size of the reference grid. -->
+<!ELEMENT XOsiz (#PCDATA)>
+<!ELEMENT YOsiz (#PCDATA)>  <!-- XOsiz, YOsiz are offsets from grid origin to image origin. -->
+<!ELEMENT XTsiz (#PCDATA)>
+<!ELEMENT YTsiz (#PCDATA)>  <!-- XTsiz, YTsiz is the size of one tile with respect to the grid. -->
+<!ELEMENT XTOsiz (#PCDATA)>
+<!ELEMENT YTOsiz (#PCDATA)> <!-- XTOsiz, YTOsiz are offsets from grid origin to first tile origin. -->
+<!ELEMENT Csiz (#PCDATA)>  <!-- Csiz is the number of components in the image. -->
+<!-- For image components next -->
+<!ELEMENT Component (Ssiz,XRsiz,YRsiz,WidthOfData,HeightOfData)>
+<!ATTLIST Component Num CDATA #REQUIRED>
+<!ELEMENT Ssiz (AsHex | (AsHex,Signed,PrecisionInBits) | (Signed,PrecisionInBits))>
+<!-- Signed already defined -->
+<!ELEMENT PrecisionInBits (#PCDATA)>  <!--   Bits per pixel (bpp) or pixel depth. -->
+<!ELEMENT XRsiz (#PCDATA)>
+<!ELEMENT YRsiz (#PCDATA)> <!-- XRsiz, YRsiz denote pixel-sample-spacing on the grid, per Part I Annex B. -->
+<!ELEMENT WidthOfData (#PCDATA)>
+<!ELEMENT HeightOfData (#PCDATA)>  <!-- WidthOfData and HeightOfData are calculated values, e.g.: w = roundup((Xsiz - XOsiz)/ XRsiz) -->
+<!-- -->
+<!ELEMENT CodingStyleDefault (Scod,SGcod,SPcod)>
+<!ATTLIST CodingStyleDefault Marker CDATA #FIXED "COD">
+<!ELEMENT Scod (#PCDATA)>
+          <!-- For Scod, specific bits mean (where bit 0 is lowest or rightmost): -->
+          <!-- bit 0: Defines entropy coder precincts -->
+          <!--        0 = (PPx=15, PPy=15); 1 = precincts defined below. -->
+          <!-- bit 1: 1 = SOP marker may be used; 0 = not. -->
+          <!-- bit 2: 1 = EPH marker may be used; 0 = not. -->
+<!ELEMENT SGcod (ProgressionOrder,NumberOfLayers,MultipleComponentTransformation)>
+<!ELEMENT ProgressionOrder (#PCDATA)>
+            <!-- Defined Progression Order Values are: -->
+            <!-- 0 = LRCP; 1 = RLCP; 2 = RPCL; 3 = PCRL; 4 = CPRL -->
+            <!-- where L = "layer", R = "resolution level", C = "component", P = "position". -->
+<!ELEMENT NumberOfLayers (#PCDATA)>
+<!ELEMENT MultipleComponentTransformation (#PCDATA)>
+            <!-- For MCT, 0 = none, 1 = transform first 3 components for efficiency, per Part I Annex G -->
+<!ELEMENT SPcod (NumberOfDecompositionLevels,CodeblockWidth,CodeblockHeight,CodeblockStyle,Transformation)>
+<!ELEMENT NumberOfDecompositionLevels (#PCDATA)>
+<!ELEMENT CodeblockWidth (#PCDATA)>   <!-- CBW and CBH are non-negative, and summed cannot exceed 8 -->
+<!ELEMENT CodeblockHeight (#PCDATA)>  <!-- Codeblock dimension is 2^(value + 2) -->
+<!ELEMENT CodeblockStyle (#PCDATA)>
+            <!-- For CodeblockStyle, bits mean (with value 1=feature on, 0=off): -->
+            <!-- bit 0: Selective arithmetic coding bypass. -->
+            <!-- bit 1: Reset context probabilities on coding pass boundaries. -->
+            <!-- bit 2: Termination on each coding pass. -->
+            <!-- bit 3: Vertically causal context. -->
+            <!-- bit 4: Predictable termination. -->
+            <!-- bit 5: Segmentation symbols are used. -->
+<!ELEMENT Transformation (#PCDATA)> <!-- For Transformation, 0="9-7 irreversible filter", 1="5-3 reversible filter" -->
+        <!-- mj2_to_metadata implementation always reports component[0] as using default COD, -->
+        <!-- and any other component, with main-header style values different from [0], as COC. -->
+<!ELEMENT QuantizationDefault (Sqcd,SPqcd)>
+<!ATTLIST QuantizationDefault Marker CDATA #FIXED "QCD">
+<!ELEMENT Sqcd (AsHex | (AsHex,QuantizationStyle,NumberOfGuardBits) | (QuantizationStyle,NumberOfGuardBits))>
+<!ELEMENT QuantizationStyle (#PCDATA)>  <!-- Default quantization style for all components. -->
+            <!-- Quantization style (in Sqcd's low 5 bits) may be: -->
+            <!--   0 = No quantization. SPqcd size = 8 bits-->
+            <!--   1 = Scalar derived (values signaled for N(L)LL subband only). Use Eq. E.5. SPqcd size = 16. -->
+            <!--   2 = Scalar expounded (values signaled for each subband). SPqcd size = 16. -->
+<!ELEMENT NumberOfGuardBits (#PCDATA)>  <!-- 0-7 guard bits allowed (stored in Sqcd's high 3 bits) -->
+<!ELEMENT SPqcd (ReversibleStepSizeValue | QuantizationStepSizeValues )>  <!-- TO DO: Irreversible choices -->
+<!ELEMENT ReversibleStepSizeValue (DynamicRangeExponent+)>
+            <!-- Current mj2_to_metadata implementation dumps entire internal table, -->
+            <!-- until an exponent with zero value is reached. -->
+            <!-- Exponent epsilon(b) of reversible dynamic range. -->
+            <!-- Hex value is as stored, in high-order 5 bits. -->
+<!ELEMENT DynamicRangeExponent (AsHex | (AsHex, AsDecimal) | AsDecimal)>
+<!ATTLIST DynamicRangeExponent Subband CDATA #REQUIRED>
+<!ELEMENT QuantizationStepSizeValues (QuantizationValues+, CalculatedExponent*)>  <!-- Calculated exponents iff only subband 0 reported -->
+<!ELEMENT QuantizationValues (AsHex | (AsHex,Exponent,Mantissa) | (Exponent,Mantissa))>
+<!ATTLIST QuantizationValues Subband CDATA #REQUIRED>
+<!ELEMENT Exponent (#PCDATA)>
+<!ELEMENT Mantissa (#PCDATA)>
+<!ELEMENT CalculatedExponent (#PCDATA)>
+<!ATTLIST CalculatedExponent Subband CDATA #REQUIRED>
+<!-- /QuantizationDefault -->
+        <!-- mj2_to_metadata implementation always reports component[0] as using default QCD, -->
+        <!-- and any other component, with main-header quantization values different from [0], as QCC. -->
+<!ELEMENT QuantizationComponent (Sqcc,SPqcc)>
+<!ATTLIST QuantizationComponent Marker CDATA #FIXED "QCC">
+<!ATTLIST QuantizationComponent Component CDATA #REQUIRED>
+<!ELEMENT Sqcc (AsHex | (AsHex,QuantizationStyle,NumberOfGuardBits) | (QuantizationStyle,NumberOfGuardBits))>
+<!ELEMENT SPqcc (ReversibleStepSizeValue | QuantizationStepSizeValues )>  <!-- TO DO: Irreversible choices -->
+<!-- /QuantizationComponent -->
+<!-- Don't know if MJ2 files can have regions of interest.  Assume yes -->
+<!ELEMENT RegionOfInterest (Srgn,Crgn,Sprgn)> <!-- Optional in main header, at most 1 per component -->
+<!ATTLIST RegionOfInterest Marker CDATA #FIXED "RGN">
+<!ELEMENT Srgn (#PCDATA)>  <!-- ROI style.  Only style=0 defined: Implicit ROI (max. shift) -->
+<!ELEMENT Crgn (#PCDATA)>  <!-- Zero-based component number. -->
+<!ELEMENT SPrgn (#PCDATA)> <!-- Implicit ROI shift, i.e., binary shifting of ROI coefficients above background. -->
+<!-- </RegionOfInterest> -->
+<!ELEMENT ProgressionOrderChange (Progression+)> <!-- Optional in main header, at most 1 per component (but impl allows more?) -->
+<!ATTLIST ProgressionOrderChange Marker CDATA #REQUIRED>
+<!ELEMENT Progression (RSpoc,CSpoc,LYEpoc,REpoc,CEpoc,Ppoc)>
+<!ATTLIST Progression Num CDATA #REQUIRED>
+<!ELEMENT RSpoc (#PCDATA)> <!-- Resolution level index (inclusive) for progression start. Range: 0 to 33 -->
+<!ELEMENT CSpoc (#PCDATA)> <!-- Component index (inclusive) for progression start. -->
+<!ELEMENT LYEpoc (#PCDATA)> <!-- Layer index (exclusive) for progression end. -->
+<!ELEMENT REpoc (#PCDATA)> <!-- Resolution level index (exclusive) for progression end. Range: RSpoc to 33 -->
+<!ELEMENT CEpoc (#PCDATA)> <!-- Component index (exclusive) for progression end.  Minimum: CSpoc -->
+<!ELEMENT Ppoc (#PCDATA)> <!-- Defined Progression Order Values are: -->
+                          <!-- 0 = LRCP; 1 = RLCP; 2 = RPCL; 3 = PCRL; 4 = CPRL -->
+                          <!-- where L = "layer", R = "resolution level", C = "component", P = "position". -->
+<!-- </Progression>, </ProgressionOrderChange -->
+<!-- /MainHeader -->
+<!ELEMENT TilePartHeaders (TilePartHeader+)>
+<!ATTLIST TilePartHeaders Count CDATA #REQUIRED>
+<!ELEMENT TilePartHeader (StartOfTilePart,CodingStyleDefault,QuantizationDefault,QuantizationComponent*,RegionOfInterest?,ProgressionOrderChange*,StartOfData)>
+<!ATTLIST TilePartHeader Num CDATA #REQUIRED>
+<!ATTLIST TilePartHeader ID CDATA #REQUIRED>
+<!ELEMENT StartOfTilePart EMPTY>
+<!ATTLIST StartOfTilePart Marker CDATA #FIXED "SOT">
+<!-- CodingStyleDefault, QuantizationDefault, QuantizationComponent already defined -->
+        <!-- mj2_to_metadata implementation always reports component[0] as using default QCD, -->
+        <!-- and any other component, with tile-part-header quantization values different from [0], as QCC. -->
+<!ELEMENT StartOfData EMPTY> <!-- always empty for now -->
+<!ATTLIST StartOfData Marker CDATA #FIXED "SOD">
+          <!-- Tile-part bitstream, not shown, follows tile-part header and SOD marker. -->
+<!-- /TilePartHeader, /TilePartHeaders, /JP2_Frame -->
+<!-- </Track> -->
+
+<!-- to come:
+  <MovieExtends mvek> // possibly not in Simple Profile
+  <UserDataBox udat> contains <CopyrightBox cprt>
+  -->
+<!-- /MovieBox -->
+<!-- To come:
+  <mdat>
+  <moof>  // probably not in Simple Profile
+  <free>
+  <skip>
+  -->
+<!-- </MJ2_File> -->
\ No newline at end of file
diff --git a/src/bin/mj2/mj2_to_metadata.h b/src/bin/mj2/mj2_to_metadata.h
new file mode 100644
index 00000000..f4c34919
--- /dev/null
+++ b/src/bin/mj2/mj2_to_metadata.h
@@ -0,0 +1,9 @@
+/* mj2_to_metadata.h */
+/* Dump MJ2, JP2 metadata (partial so far) to xml file */
+/* Contributed to Open JPEG by Glenn Pearson, U.S. National Library of Medicine */
+
+#define BOOL int
+#define FALSE 0
+#define TRUE 1
+
+#include "meta_out.h"
diff --git a/src/bin/mj2/mj2_to_metadata.sln b/src/bin/mj2/mj2_to_metadata.sln
new file mode 100644
index 00000000..32b926d4
--- /dev/null
+++ b/src/bin/mj2/mj2_to_metadata.sln
@@ -0,0 +1,29 @@
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mj2_to_metadata", "mj2_to_metadata.vcproj", "{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}"

+	ProjectSection(ProjectDependencies) = postProject

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD} = {0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOpenJPEG", "..\LibOpenJPEG.vcproj", "{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Debug|Win32.Build.0 = Debug|Win32

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Release|Win32.ActiveCfg = Release|Win32

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Release|Win32.Build.0 = Release|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Debug|Win32.ActiveCfg = Debug|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Debug|Win32.Build.0 = Debug|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Release|Win32.ActiveCfg = Release|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/src/bin/mj2/mj2_to_metadata.vcproj b/src/bin/mj2/mj2_to_metadata.vcproj
new file mode 100644
index 00000000..b280bfe5
--- /dev/null
+++ b/src/bin/mj2/mj2_to_metadata.vcproj
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8,00"

+	Name="mj2_to_metadata"

+	ProjectGUID="{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\mj2_to_metadata___Win32_Debug0"

+			IntermediateDirectory=".\mj2_to_metadata___Win32_Debug0"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../libopenjpeg"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPJ_STATIC;_CRT_SECURE_NO_DEPRECATE"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.pch"

+				AssemblerListingLocation=".\mj2_to_metadata___Win32_Debug0/"

+				ObjectFile=".\mj2_to_metadata___Win32_Debug0/"

+				ProgramDataBaseFileName=".\mj2_to_metadata___Win32_Debug0/"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="2057"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="LIBCMT"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\Release/mj2_to_metadata.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../libopenjpeg"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPJ_STATIC;_CRT_SECURE_NO_DEPRECATE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=".\Release/mj2_to_metadata.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="2057"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile=".\Release/mj2_to_metadata.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libcmtd"

+				ProgramDatabaseFile=".\Release/mj2_to_metadata.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\Release/mj2_to_metadata.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="MJ2"

+			>

+			<Filter

+				Name="MJ2 Header Files"

+				>

+				<File

+					RelativePath="compat\opj_getopt.h"

+					>

+				</File>

+				<File

+					RelativePath="meta_out.h"

+					>

+				</File>

+				<File

+					RelativePath="mj2.h"

+					>

+				</File>

+				<File

+					RelativePath="mj2_convert.h"

+					>

+				</File>

+				<File

+					RelativePath="mj2_to_metadata.h"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="MJ2 Source Files"

+				>

+				<File

+					RelativePath="compat\opj_getopt.c"

+					>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="meta_out.c"

+					>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="mj2.c"

+					>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="mj2_convert.c"

+					>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="mj2_to_metadata.c"

+					>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+			</Filter>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/src/bin/mj2/mj2_to_metadata_Notes.doc b/src/bin/mj2/mj2_to_metadata_Notes.doc
new file mode 100644
index 00000000..05ccec20
--- /dev/null
+++ b/src/bin/mj2/mj2_to_metadata_Notes.doc
diff --git a/src/bin/mj2/readme.txt b/src/bin/mj2/readme.txt
new file mode 100644
index 00000000..9419d2a2
--- /dev/null
+++ b/src/bin/mj2/readme.txt
@@ -0,0 +1,3 @@
+Attention : the motion jpeg 2000 files currently only work with OpenJPEG v0.97 that you can find here : 
+
+http://www.openjpeg.org/openjpeg_v097.tar.gz
\ No newline at end of file
diff --git a/src/bin/mj2/wrap_j2k_in_mj2.c b/src/bin/mj2/wrap_j2k_in_mj2.c
new file mode 100644
index 00000000..7ce88677
--- /dev/null
+++ b/src/bin/mj2/wrap_j2k_in_mj2.c
@@ -0,0 +1,523 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * 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 OWNER 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "openjpeg.h"
+#include "cio.h"
+#include "j2k.h"
+#include "jp2.h"
+#include "mj2.h"
+
+static int int_ceildiv(int a, int b) {
+	return (a + b - 1) / b;
+}
+
+/**
+Size of memory first allocated for MOOV box
+*/
+#define TEMP_BUF 10000 
+
+#define ENUMCS_GRAY 16
+#define ENUMCS_SRGB 17
+#define ENUMCS_SYCC 18
+
+#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"
+
+/* -------------------------------------------------------------------------- */
+
+static int test_image(const char *fname, mj2_cparameters_t *cp)
+{
+	FILE *reader;
+	opj_image_t *image;
+	unsigned char *src;
+	opj_dinfo_t *dinfo;
+	opj_cio_t *cio;
+	opj_dparameters_t dparameters;
+	int success;
+	long src_len;
+
+	success = 0;
+
+	if((reader = fopen(fname, "rb")) == NULL) return success;
+
+	fseek(reader, 0, SEEK_END);
+	src_len = ftell(reader);
+	fseek(reader, 0, SEEK_SET);
+	src = (unsigned char*) malloc(src_len);
+	fread(src, 1, src_len, reader);
+	fclose(reader);
+
+	if(memcmp(src, J2K_CODESTREAM_MAGIC, 4) != 0)
+   {
+	free(src); return success;
+   }
+	memset(&dparameters, 0, sizeof(opj_dparameters_t));
+
+	opj_set_default_decoder_parameters(&dparameters);
+
+	dinfo = opj_create_decompress(CODEC_J2K);
+
+	opj_setup_decoder(dinfo, &dparameters);
+
+	cio = opj_cio_open((opj_common_ptr)dinfo, src, src_len);
+
+	image = opj_decode(dinfo, cio);
+
+	free(src); cio->buffer = NULL;
+	opj_cio_close(cio);
+
+	if(image == NULL) goto fin;
+
+	cp->numcomps = image->numcomps;
+	cp->w = image->comps[0].w;
+	cp->h = image->comps[0].h;
+	cp->prec = image->comps[0].prec;
+
+	if(image->numcomps > 2 )
+   {
+	if((image->comps[0].dx == 1)
+	&& (image->comps[1].dx == 2)
+	&& (image->comps[2].dx == 2)
+	&& (image->comps[0].dy == 1)
+	&& (image->comps[1].dy == 2)
+	&& (image->comps[2].dy == 2))// horizontal and vertical
+  {
+//   Y420
+	cp->enumcs = ENUMCS_SYCC;
+	cp->CbCr_subsampling_dx = 2;
+	cp->CbCr_subsampling_dy = 2;
+  }
+	else
+	if((image->comps[0].dx == 1)
+	&& (image->comps[1].dx == 2)
+	&& (image->comps[2].dx == 2)
+	&& (image->comps[0].dy == 1)
+	&& (image->comps[1].dy == 1)
+	&& (image->comps[2].dy == 1))// horizontal only
+  {
+//   Y422
+	cp->enumcs = ENUMCS_SYCC;
+	cp->CbCr_subsampling_dx = 2;
+	cp->CbCr_subsampling_dy = 1;
+  }
+	else
+	if((image->comps[0].dx == 1)
+	&& (image->comps[1].dx == 1)
+	&& (image->comps[2].dx == 1)
+	&& (image->comps[0].dy == 1)
+	&& (image->comps[1].dy == 1)
+	&& (image->comps[2].dy == 1))
+  {
+//   Y444 or RGB
+
+	if(image->color_space ==  CLRSPC_SRGB)
+ {
+	cp->enumcs = ENUMCS_SRGB;
+
+//    cp->CbCr_subsampling_dx = 0;
+//    cp->CbCr_subsampling_dy = 0;
+ }
+	else
+ {
+	cp->enumcs = ENUMCS_SYCC;
+
+	cp->CbCr_subsampling_dx = 1;
+	cp->CbCr_subsampling_dy = 1;
+ }
+  }
+	else
+  {
+	goto fin;
+  }
+   }
+	else
+   {
+	cp->enumcs = ENUMCS_GRAY;
+//  cp->CbCr_subsampling_dx = 0;
+//  cp->CbCr_subsampling_dy = 0;
+   }
+	if(image->icc_profile_buf)
+   {
+	cp->meth = 2;
+	free(image->icc_profile_buf); image->icc_profile_buf = NULL;
+   }
+	else cp->meth = 1;
+
+	success = 1;
+fin:
+	if(dinfo)
+	 opj_destroy_decompress(dinfo);
+
+	if(image)
+	 opj_image_destroy(image);
+
+	return success;
+}
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting a FILE* client object
+*/
+void info_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+static void read_siz_marker(FILE *file, opj_image_t *image)
+{
+  int len,i;
+  char buf, buf2[2];
+  unsigned char *siz_buffer;
+	opj_cio_t *cio;
+  
+  fseek(file, 0, SEEK_SET);
+  do {
+    fread(&buf,1,1, file);
+    if (buf==(char)0xff)
+      fread(&buf,1,1, file);
+  }
+  while (!(buf==(char)0x51));
+  
+  fread(buf2,2,1,file);		/* Lsiz                */
+  len = ((buf2[0])<<8) + buf2[1];
+  
+  siz_buffer = (unsigned char*) malloc(len * sizeof(unsigned char));
+  fread(siz_buffer,len, 1, file);
+	cio = opj_cio_open(NULL, siz_buffer, len);
+  
+  cio_read(cio, 2);			/* Rsiz (capabilities) */
+  image->x1 = cio_read(cio, 4);	/* Xsiz                */
+  image->y1 = cio_read(cio, 4);	/* Ysiz                */
+  image->x0 = cio_read(cio, 4);	/* X0siz               */
+  image->y0 = cio_read(cio, 4);	/* Y0siz               */
+  cio_skip(cio, 16);			/* XTsiz, YTsiz, XT0siz, YT0siz        */
+  
+  image->numcomps = cio_read(cio,2);	/* Csiz                */
+  image->comps =
+    (opj_image_comp_t *) malloc(image->numcomps * sizeof(opj_image_comp_t));
+	
+  for (i = 0; i < image->numcomps; i++) {
+    int tmp;
+    tmp = cio_read(cio,1);		/* Ssiz_i          */
+    image->comps[i].prec = (tmp & 0x7f) + 1;
+    image->comps[i].sgnd = tmp >> 7;
+    image->comps[i].dx = cio_read(cio,1);	/* XRsiz_i         */
+    image->comps[i].dy = cio_read(cio,1);	/* YRsiz_i         */
+    image->comps[i].resno_decoded = 0;	/* number of resolution decoded */
+    image->comps[i].factor = 0;	/* reducing factor by component */
+  }
+  fseek(file, 0, SEEK_SET);
+	opj_cio_close(cio);
+  free(siz_buffer);
+}
+
+static void setparams(opj_mj2_t *movie, opj_image_t *image) {
+  int i, depth_0, depth, sign;
+  
+  movie->tk[0].w = int_ceildiv(image->x1 - image->x0, image->comps[0].dx);
+  movie->tk[0].h = int_ceildiv(image->y1 - image->y0, image->comps[0].dy);
+  mj2_init_stdmovie(movie);
+  
+  movie->tk[0].depth = image->comps[0].prec;
+	
+  if (image->numcomps==3) {
+    if ((image->comps[0].dx == 1) 
+	&& (image->comps[1].dx == 1) 
+	&& (image->comps[2].dx == 1)) 
+      movie->tk[0].CbCr_subsampling_dx = 1;
+    else 
+	if ((image->comps[0].dx == 1) 
+	&& (image->comps[1].dx == 2) 
+	&& (image->comps[2].dx == 2))
+      movie->tk[0].CbCr_subsampling_dx = 2;
+    else
+      fprintf(stderr,"Image component sizes are incoherent\n");
+    
+    if ((image->comps[0].dy == 1) 
+	&& (image->comps[1].dy == 1) 
+	&& (image->comps[2].dy == 1)) 
+      movie->tk[0].CbCr_subsampling_dy = 1;
+    else 
+	if ((image->comps[0].dy == 1) 
+	&& (image->comps[1].dy == 2) 
+	&& (image->comps[2].dy == 2))
+      movie->tk[0].CbCr_subsampling_dy = 2;
+    else
+      fprintf(stderr,"Image component sizes are incoherent\n");
+  }
+  
+  movie->tk[0].sample_rate = 25;
+  
+  movie->tk[0].jp2_struct.numcomps = image->numcomps;	// NC  
+	
+	/* Init Standard jp2 structure */
+	
+	movie->tk[0].jp2_struct.comps =
+    (opj_jp2_comps_t *) malloc(movie->tk[0].jp2_struct.numcomps * sizeof(opj_jp2_comps_t));
+  movie->tk[0].jp2_struct.precedence = 0;   /* PRECEDENCE*/
+  movie->tk[0].jp2_struct.approx = 0;   /* APPROX*/
+  movie->tk[0].jp2_struct.brand = JP2_JP2;	/* BR         */
+  movie->tk[0].jp2_struct.minversion = 0;	/* MinV       */
+  movie->tk[0].jp2_struct.numcl = 1;
+  movie->tk[0].jp2_struct.cl = (unsigned int *) malloc(movie->tk[0].jp2_struct.numcl * sizeof(int));
+  movie->tk[0].jp2_struct.cl[0] = JP2_JP2;	/* CL0 : JP2  */
+  movie->tk[0].jp2_struct.C = 7;      /* C : Always 7*/
+  movie->tk[0].jp2_struct.UnkC = 0;      /* UnkC, colorspace specified in colr box*/
+  movie->tk[0].jp2_struct.IPR = 0;      /* IPR, no intellectual property*/
+  movie->tk[0].jp2_struct.w = int_ceildiv(image->x1 - image->x0, image->comps[0].dx);
+  movie->tk[0].jp2_struct.h = int_ceildiv(image->y1 - image->y0, image->comps[0].dy);
+  
+  depth_0 = image->comps[0].prec - 1;
+  sign = image->comps[0].sgnd;
+  movie->tk[0].jp2_struct.bpc = depth_0 + (sign << 7);
+  
+  for (i = 1; i < image->numcomps; i++) {
+    depth = image->comps[i].prec - 1;
+    sign = image->comps[i].sgnd;
+    if (depth_0 != depth)
+      movie->tk[0].jp2_struct.bpc = 255;
+  }
+  
+  for (i = 0; i < image->numcomps; i++)
+    movie->tk[0].jp2_struct.comps[i].bpcc =
+    image->comps[i].prec - 1 + (image->comps[i].sgnd << 7);
+  
+  if ((image->numcomps == 1 || image->numcomps == 3)
+    && (movie->tk[0].jp2_struct.bpc != 255))
+    movie->tk[0].jp2_struct.meth = 1;
+  else
+    movie->tk[0].jp2_struct.meth = 2;
+	
+    if (image->numcomps == 1)
+     movie->tk[0].jp2_struct.enumcs = 17;  // Grayscale
+  
+    else   
+	if ((image->comps[0].dx == 1) 
+	&& (image->comps[1].dx == 1) 
+	&& (image->comps[2].dx == 1) 
+    && (image->comps[0].dy == 1) 
+	&& (image->comps[1].dy == 1) 
+	&& (image->comps[2].dy == 1)) 
+     movie->tk[0].jp2_struct.enumcs = 16;    // RGB
+  
+    else   
+	if ((image->comps[0].dx == 1) 
+	&& (image->comps[1].dx == 2) 
+	&& (image->comps[2].dx == 2) 
+    && (image->comps[0].dy == 1) 
+	&& (image->comps[1].dy == 2) 
+	&& (image->comps[2].dy == 2)) 
+     movie->tk[0].jp2_struct.enumcs = 18;  // YUV
+  
+  else
+    movie->tk[0].jp2_struct.enumcs = 0;	// Unkown profile */
+}
+
+int main(int argc, char *argv[]) {
+	opj_cinfo_t* cinfo; 
+	opj_event_mgr_t event_mgr;		/* event manager */  
+  unsigned int snum;
+  opj_mj2_t *movie;
+  mj2_sample_t *sample;
+  unsigned char* frame_codestream;
+  FILE *mj2file, *j2kfile;
+  char *j2kfilename;
+  unsigned char *buf;
+  int offset, mdat_initpos;
+  opj_image_t img;
+ 	opj_cio_t *cio;
+	mj2_cparameters_t parameters;
+	
+  if (argc != 3) {
+    printf("Usage: %s source_location mj2_filename\n",argv[0]);
+    printf("Example: %s input/input output.mj2\n",argv[0]);
+    return 1;
+  }
+  
+  mj2file = fopen(argv[2], "wb");
+  
+  if (!mj2file) {
+    fprintf(stderr, "failed to open %s for writing\n", argv[2]);
+    return 1;
+  }
+	memset(&img, 0, sizeof(opj_image_t));
+	/*
+	configure the event callbacks (not required)
+	setting of each callback is optionnal
+	*/
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = info_callback;
+
+	/* get a MJ2 decompressor handle */
+	cinfo = mj2_create_compress();
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);	
+	
+	/* setup the decoder encoding parameters using user parameters */
+	memset(&parameters, 0, sizeof(mj2_cparameters_t));
+	movie = (opj_mj2_t*) cinfo->mj2_handle;
+
+	j2kfilename = (char*)malloc(strlen(argv[1]) + 12);/* max. '%6d' */
+	sprintf(j2kfilename, "%s_00001.j2k",argv[1]);
+
+	if(test_image(j2kfilename, &parameters) == 0) goto fin;
+
+	parameters.frame_rate = 25; /* DEFAULT */
+
+	mj2_setup_encoder(movie, &parameters);
+
+  
+	/* Writing JP, FTYP and MDAT boxes 
+	Assuming that the JP and FTYP boxes won't be longer than 300 bytes */
+	
+  buf = (unsigned char*) malloc (300 * sizeof(unsigned char)); 
+  cio = opj_cio_open(movie->cinfo, buf, 300);
+  mj2_write_jp(cio);
+  mj2_write_ftyp(movie, cio);
+  mdat_initpos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio,MJ2_MDAT, 4);	
+  fwrite(buf,cio_tell(cio),1,mj2file);
+  free(buf);
+	
+  // Insert each j2k codestream in a JP2C box  
+  snum=0;
+  offset = 0;  
+  while(1)
+  {
+    sample = &movie->tk[0].sample[snum];
+    sprintf(j2kfilename,"%s_%05d.j2k",argv[1],snum);
+    j2kfile = fopen(j2kfilename, "rb");
+    if (!j2kfile) {
+      if (snum==0) {  // Could not open a single codestream
+				fprintf(stderr, "failed to open %s for reading\n",j2kfilename);
+				return 1;
+      }
+      else {	      // Tried to open a inexistant codestream
+				fprintf(stdout,"%d frames are being added to the MJ2 file\n",snum);
+				break;
+      }
+    }
+
+    // Calculating offset for samples and chunks
+    offset += cio_tell(cio);     
+    sample->offset = offset;
+    movie->tk[0].chunk[snum].offset = offset;  // There will be one sample per chunk
+    
+    // Calculating sample size
+    fseek(j2kfile,0,SEEK_END);	
+    sample->sample_size = ftell(j2kfile) + 8; // Sample size is codestream + JP2C box header
+    fseek(j2kfile,0,SEEK_SET);
+    
+    // Reading siz marker of j2k image for the first codestream
+    if (snum==0)	      
+      read_siz_marker(j2kfile, &img);
+    
+    // Writing JP2C box header			    
+    frame_codestream = (unsigned char*) malloc (sample->sample_size+8); 
+		cio = opj_cio_open(movie->cinfo, frame_codestream, sample->sample_size);    
+    cio_write(cio,sample->sample_size, 4);  // Sample size
+    cio_write(cio,JP2_JP2C, 4);	// JP2C
+    
+    // Writing codestream from J2K file to MJ2 file
+    fread(frame_codestream+8,sample->sample_size-8,1,j2kfile);
+    fwrite(frame_codestream,sample->sample_size,1,mj2file);
+    cio_skip(cio, sample->sample_size-8);
+    
+    // Ending loop
+    fclose(j2kfile);
+    snum++;
+    mj2_sample_t * new_sample = (mj2_sample_t*)
+		realloc(movie->tk[0].sample, (snum+1) * sizeof(mj2_sample_t));
+    mj2_chunk_t * new_chunk = (mj2_chunk_t*)
+		realloc(movie->tk[0].chunk, (snum+1) * sizeof(mj2_chunk_t));
+    if (new_sample && new_chunk) {
+        movie->tk[0].sample = new_sample;
+        movie->tk[0].chunk = new_chunk;
+    } else {
+       fprintf(stderr, "Failed to allocate enough memory to read %s\n", j2kfilename);
+       return 1;
+    }
+    free(frame_codestream);
+  }
+  
+  // Writing the MDAT box length in header
+  offset += cio_tell(cio);
+  buf = (unsigned char*) malloc (4 * sizeof(unsigned char));
+	cio = opj_cio_open(movie->cinfo, buf, 4);
+  cio_write(cio,offset-mdat_initpos,4); 
+  fseek(mj2file,(long)mdat_initpos,SEEK_SET);
+  fwrite(buf,4,1,mj2file);
+  fseek(mj2file,0,SEEK_END);
+  free(buf);
+	
+  // Setting movie parameters
+  movie->tk[0].num_samples=snum;
+  movie->tk[0].num_chunks=snum;
+  setparams(movie, &img);
+	
+  // Writing MOOV box 
+	buf = (unsigned char*) malloc ((TEMP_BUF+snum*20) * sizeof(unsigned char));
+	cio = opj_cio_open(movie->cinfo, buf, (TEMP_BUF+snum*20));
+	mj2_write_moov(movie, cio);
+  fwrite(buf,cio_tell(cio),1,mj2file);
+	
+  // Ending program
+  free(img.comps);
+  opj_cio_close(cio);
+
+fin:
+  fclose(mj2file);
+  mj2_destroy_compress(movie);
+  free(j2kfilename);
+
+  return 0;
+}