From 8d7073abf6f79e29db9ae382909001aac6bd1129 Mon Sep 17 00:00:00 2001 From: Kaori Hagihara Date: Tue, 25 Oct 2011 21:10:48 +0000 Subject: [PATCH] patches for cmake and autotool are applied --- applications/jpip/CHANGES | 3 + applications/jpip/CMakeLists.txt | 4 +- applications/jpip/Makefile.am | 2 +- applications/jpip/libopenjpip/CMakeLists.txt | 31 +++++++--- applications/jpip/libopenjpip/Makefile.am | 23 +++++++- applications/jpip/opj_client/CMakeLists.txt | 1 - applications/jpip/opj_client/Makefile.am | 3 - .../opj_client/opj_dec_server/CMakeLists.txt | 29 --------- .../opj_client/opj_dec_server/Makefile.am | 32 ---------- .../opj_client/opj_dec_server/Makefile.nix | 17 ------ applications/jpip/opj_server/CMakeLists.txt | 26 -------- applications/jpip/opj_server/Makefile.am | 20 ------- applications/jpip/tools/CMakeLists.txt | 37 ------------ applications/jpip/tools/Makefile.am | 47 --------------- applications/jpip/tools/Makefile.nix | 22 ------- applications/jpip/util/CMakeLists.txt | 38 ++++++++++++ applications/jpip/util/Makefile.am | 59 +++++++++++++++++++ configure.ac | 5 +- libopenjpeg/phix_manager.c | 47 +++++++++++---- libopenjpeg/ppix_manager.c | 57 ++++++++++++------ 20 files changed, 218 insertions(+), 285 deletions(-) delete mode 100644 applications/jpip/opj_client/CMakeLists.txt delete mode 100644 applications/jpip/opj_client/Makefile.am delete mode 100644 applications/jpip/opj_client/opj_dec_server/CMakeLists.txt delete mode 100644 applications/jpip/opj_client/opj_dec_server/Makefile.am delete mode 100644 applications/jpip/opj_client/opj_dec_server/Makefile.nix delete mode 100644 applications/jpip/opj_server/CMakeLists.txt delete mode 100644 applications/jpip/opj_server/Makefile.am delete mode 100644 applications/jpip/tools/CMakeLists.txt delete mode 100644 applications/jpip/tools/Makefile.am delete mode 100644 applications/jpip/tools/Makefile.nix create mode 100644 applications/jpip/util/CMakeLists.txt create mode 100644 applications/jpip/util/Makefile.am diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES index aaaa3216..c58cc5e7 100644 --- a/applications/jpip/CHANGES +++ b/applications/jpip/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPIP ! : changed + : added +October 25, 2011 +* [kaori] patches for cmake and autotool are applied + October 20, 2011 + [added] API style in openJPIP library ! [kaori] rearranged directories, applications are all under util/ directory, currently only 'make -f Makefile.nix' works diff --git a/applications/jpip/CMakeLists.txt b/applications/jpip/CMakeLists.txt index b6f6e2a5..aa8cf7cc 100644 --- a/applications/jpip/CMakeLists.txt +++ b/applications/jpip/CMakeLists.txt @@ -1,5 +1,3 @@ ADD_SUBDIRECTORY(libopenjpip) -ADD_SUBDIRECTORY(opj_server) -ADD_SUBDIRECTORY(opj_client) -ADD_SUBDIRECTORY(tools) \ No newline at end of file +ADD_SUBDIRECTORY(util) diff --git a/applications/jpip/Makefile.am b/applications/jpip/Makefile.am index 9be07426..94b868eb 100644 --- a/applications/jpip/Makefile.am +++ b/applications/jpip/Makefile.am @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = libopenjpip opj_server opj_client tools +SUBDIRS = libopenjpip util diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/applications/jpip/libopenjpip/CMakeLists.txt index 66d69b48..26631cfe 100644 --- a/applications/jpip/libopenjpip/CMakeLists.txt +++ b/applications/jpip/libopenjpip/CMakeLists.txt @@ -24,10 +24,23 @@ ${CMAKE_CURRENT_SOURCE_DIR}/target_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/cachemodel_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/j2kheader_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/jp2k_encoder.c +${CMAKE_CURRENT_SOURCE_DIR}/openjpip.c +${CMAKE_CURRENT_SOURCE_DIR}/query_parser.c +${CMAKE_CURRENT_SOURCE_DIR}/channel_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/jpip_parser.c +) + +SET(LOCAL_SRCS +${CMAKE_CURRENT_SOURCE_DIR}/jp2k_decoder.c +${CMAKE_CURRENT_SOURCE_DIR}/imgsock_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/cache_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c ) # Build the library -ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS}) +ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS}) ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS}) TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBNAME}) @@ -36,12 +49,12 @@ SET_TARGET_PROPERTIES(openjpip_server # Install library -INSTALL(TARGETS openjpip_local - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -) + INSTALL(TARGETS openjpip_local + EXPORT OpenJPEGTargets + DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries + ) -INSTALL(TARGETS openjpip_server - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -) + INSTALL(TARGETS openjpip_server + EXPORT OpenJPEGTargets + DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries + ) diff --git a/applications/jpip/libopenjpip/Makefile.am b/applications/jpip/libopenjpip/Makefile.am index df32184d..3ddd11e5 100644 --- a/applications/jpip/libopenjpip/Makefile.am +++ b/applications/jpip/libopenjpip/Makefile.am @@ -6,6 +6,11 @@ includes_HEADERS = lib_LTLIBRARIES = libopenjpip_server.la libopenjpip_local.la JPIP_SRC = \ +openjpip.c \ +query_parser.c \ +channel_manager.c \ +session_manager.c \ +jpip_parser.c \ boxheader_manager.c \ codestream_manager.c \ imgreg_manager.c \ @@ -42,7 +47,21 @@ placeholder_manager.h \ target_manager.h \ cachemodel_manager.h \ j2kheader_manager.h \ -jp2k_encoder.h +jp2k_encoder.h \ +query_parser.h \ +channel_manager.h \ +session_manager.h \ +jpip_parser.h + +LOCAL_SRC = jp2k_decoder.c \ +imgsock_manager.c \ +jpipstream_manager.c \ +cache_manager.c \ +dec_clientmsg_handler.c \ +imgsock_manager.h \ +jpipstream_manager.h \ +cache_manager.h \ +dec_clientmsg_handler.h libopenjpip_server_la_CPPFLAGS = \ -I. \ @@ -62,7 +81,7 @@ libopenjpip_local_la_CPPFLAGS = \ libopenjpip_local_la_CFLAGS = libopenjpip_local_la_LIBADD = -lm libopenjpip_local_la_LDFLAGS = -no-undefined -version-info @lt_version@ -libopenjpip_local_la_SOURCES = $(JPIP_SRC) +libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC) install-data-hook: @echo -e " (LA)\t$(libdir)/libopenjpip_server.la" >> $(top_builddir)/report.txt diff --git a/applications/jpip/opj_client/CMakeLists.txt b/applications/jpip/opj_client/CMakeLists.txt deleted file mode 100644 index 8cf71ace..00000000 --- a/applications/jpip/opj_client/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -ADD_SUBDIRECTORY(opj_dec_server) \ No newline at end of file diff --git a/applications/jpip/opj_client/Makefile.am b/applications/jpip/opj_client/Makefile.am deleted file mode 100644 index 455f2d7f..00000000 --- a/applications/jpip/opj_client/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = opj_dec_server diff --git a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt deleted file mode 100644 index 10e9aa5c..00000000 --- a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ - -SET(OPJ_DEC_SERVER_SRCS -${CMAKE_CURRENT_SOURCE_DIR}/cache_manager.c -${CMAKE_CURRENT_SOURCE_DIR}/opj_dec_server.c -${CMAKE_CURRENT_SOURCE_DIR}/jp2k_decoder.c -${CMAKE_CURRENT_SOURCE_DIR}/imgsock_manager.c -${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c -${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c -) - -INCLUDE_DIRECTORIES( - ${OPENJPEG_SOURCE_DIR}/libopenjpeg - ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip -) - -# Build executable - -ADD_EXECUTABLE(opj_dec_server ${OPJ_DEC_SERVER_SRCS}) -TARGET_LINK_LIBRARIES(opj_dec_server openjpip_local ${OPENJPEG_LIBRARY_NAME}) - -# On unix you need to link to the math library: -IF(UNIX) - TARGET_LINK_LIBRARIES(opj_dec_server m) -ENDIF(UNIX) -# Install exe -INSTALL(TARGETS opj_dec_server - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -) diff --git a/applications/jpip/opj_client/opj_dec_server/Makefile.am b/applications/jpip/opj_client/opj_dec_server/Makefile.am deleted file mode 100644 index b9e32c92..00000000 --- a/applications/jpip/opj_client/opj_dec_server/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = opj_dec_server - -opj_dec_server_CPPFLAGS = \ --I. \ --I$(top_srcdir)/applications/jpip/opj_server \ --I$(top_builddir)/applications/jpip/opj_server \ --I$(top_srcdir)/applications/jpip/libopenjpip \ --I$(top_builddir)/applications/jpip/libopenjpip \ --I$(top_srcdir)/libopenjpeg \ --I$(top_builddir)/libopenjpeg \ -@FCGI_CFLAGS@ \ --DSERVER -opj_dec_server_CFLAGS = -opj_dec_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la $(top_builddir)/libopenjpeg/libopenjpeg.la @FCGI_LIBS@ -lm -opj_dec_server_SOURCES = \ -cache_manager.c \ -cache_manager.h \ -imgsock_manager.c \ -imgsock_manager.h \ -jp2k_decoder.c \ -dec_clientmsg_handler.c \ -dec_clientmsg_handler.h \ -jp2k_decoder.h \ -jpipstream_manager.c \ -jpipstream_manager.h \ -opj_dec_server.c - - -install-data-hook: - @echo -e " (B)\t$(bindir)/opj_dec_server$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/applications/jpip/opj_client/opj_dec_server/Makefile.nix b/applications/jpip/opj_client/opj_dec_server/Makefile.nix deleted file mode 100644 index ec8c94bd..00000000 --- a/applications/jpip/opj_client/opj_dec_server/Makefile.nix +++ /dev/null @@ -1,17 +0,0 @@ -J2KINCDIR = ../../../../libopenjpeg -J2KLIBDIR = $(J2KINCDIR)/.libs -JPIPLIBDIR = ../../libopenjpip -LIBFNAME = $(JPIPLIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.a -CFLAGS = -O3 -Wall -I$(JPIPLIBDIR) -LDFLAGS = -L$(JPIPLIBDIR) -L$(J2KLIBDIR) -lm -lopenjpip_local -#-lws2_32 - -ALL = opj_dec_server - -all: $(ALL) - -opj_dec_server: opj_dec_server.o $(LIBFNAME) - $(CC) $(CFLAGS) $< $(LDFLAGS) $(LIBFNAME) -o $@ - -clean: - rm -f $(ALL) *.o *~ diff --git a/applications/jpip/opj_server/CMakeLists.txt b/applications/jpip/opj_server/CMakeLists.txt deleted file mode 100644 index a697f5ec..00000000 --- a/applications/jpip/opj_server/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ - -# Headers file are located here: -INCLUDE_DIRECTORIES( - ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip - ${FCGI_INCLUDE_DIRNAME} -) - -SET(OPJ_SERVER_SRCS -${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c -) - -# Build executable -ADD_DEFINITIONS(-DSERVER) -ADD_EXECUTABLE(opj_server ${OPJ_SERVER_SRCS}) -TARGET_LINK_LIBRARIES(opj_server openjpip_server ${FCGI_LIBNAME}) - -# On unix you need to link to the math library: -IF(UNIX) - TARGET_LINK_LIBRARIES(opj_server m) -ENDIF(UNIX) - -# Install exe -INSTALL(TARGETS opj_server - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -) diff --git a/applications/jpip/opj_server/Makefile.am b/applications/jpip/opj_server/Makefile.am deleted file mode 100644 index 78c7eff1..00000000 --- a/applications/jpip/opj_server/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = opj_server - -opj_server_CPPFLAGS = \ --I. \ --I$(top_srcdir)/applications/jpip/opj_server \ --I$(top_builddir)/applications/jpip/opj_server \ --I$(top_srcdir)/applications/jpip/libopenjpip \ --I$(top_builddir)/applications/jpip/libopenjpip \ -@FCGI_CFLAGS@ \ --DSERVER \ --DQUIT_SIGNAL=\"quitJPIP\" -opj_server_CFLAGS = -opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm -opj_server_SOURCES = \ -opj_server.c - -install-data-hook: - @echo -e " (B)\t$(bindir)/opj_server$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/applications/jpip/tools/CMakeLists.txt b/applications/jpip/tools/CMakeLists.txt deleted file mode 100644 index c04928d7..00000000 --- a/applications/jpip/tools/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ - -INCLUDE_DIRECTORIES( - ../libopenjpip -) - -ADD_EXECUTABLE(jpip_to_j2k jpip_to_j2k.c) -TARGET_LINK_LIBRARIES(jpip_to_j2k openjpip_local) -IF(UNIX) - TARGET_LINK_LIBRARIES(jpip_to_j2k m) -ENDIF(UNIX) -# Install exe -INSTALL(TARGETS jpip_to_j2k - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -) - -ADD_EXECUTABLE(jpip_to_jp2 jpip_to_jp2.c) -TARGET_LINK_LIBRARIES(jpip_to_jp2 openjpip_local) -IF(UNIX) - TARGET_LINK_LIBRARIES(jpip_to_jp2 m) -ENDIF(UNIX) -# Install exe -INSTALL(TARGETS jpip_to_jp2 - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -) - -ADD_EXECUTABLE(test_index test_index.c) -TARGET_LINK_LIBRARIES(test_index openjpip_local) -IF(UNIX) - TARGET_LINK_LIBRARIES(test_index m) -ENDIF(UNIX) -# Install exe -INSTALL(TARGETS test_index - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -) diff --git a/applications/jpip/tools/Makefile.am b/applications/jpip/tools/Makefile.am deleted file mode 100644 index b9959723..00000000 --- a/applications/jpip/tools/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2 - -jpip_to_jp2_CPPFLAGS = \ --I. \ --I$(top_srcdir)/applications/jpip/libopenjpip \ --I$(top_builddir)/applications/jpip/libopenjpip \ --I$(top_srcdir)/applications/jpip/libopenjpip/tools \ --I$(top_builddir)/applications/jpip/libopenjpip/tools -jpip_to_jp2_CFLAGS = -jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la -jpip_to_jp2_SOURCES = jpip_to_jp2.c - -jpip_to_j2k_CPPFLAGS = \ --I. \ --I$(top_srcdir)/applications/jpip/libopenjpip \ --I$(top_builddir)/applications/jpip/libopenjpip \ --I$(top_srcdir)/applications/jpip/libopenjpip/tools \ --I$(top_builddir)/applications/jpip/libopenjpip/tools -jpip_to_j2k_CFLAGS = -jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la -jpip_to_j2k_SOURCES = jpip_to_j2k.c - -test_index_CPPFLAGS = \ --I. \ --I$(top_srcdir)/applications/jpip/libopenjpip \ --I$(top_builddir)/applications/jpip/libopenjpip \ --I$(top_srcdir)/applications/jpip/libopenjpip/tools \ --I$(top_builddir)/applications/jpip/libopenjpip/tools -test_index_CFLAGS = -test_index_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la -test_index_SOURCES = test_index.c - -addXMLinJP2_CPPFLAGS = \ --I. \ --I$(top_srcdir)/applications/jpip/libopenjpip/tools \ --I$(top_builddir)/applications/jpip/libopenjpip/tools -addXMLinJP2_CFLAGS = -addXMLinJP2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la -addXMLinJP2_SOURCES = addXMLinJP2.c - -install-data-hook: - @echo -e " (B)\t$(bindir)/jpip_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t$(bindir)/jpip_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t$(bindir)/test_index$(EXEEXT)" >> $(top_builddir)/report.txt - @echo -e " (B)\t$(bindir)/addXMLinJP2$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/applications/jpip/tools/Makefile.nix b/applications/jpip/tools/Makefile.nix deleted file mode 100644 index 725320b2..00000000 --- a/applications/jpip/tools/Makefile.nix +++ /dev/null @@ -1,22 +0,0 @@ -J2KINCDIR = ../../../libopenjpeg -J2KLIBDIR = $(J2KINCDIR)/.libs -LIBDIR = ../libopenjpip -LIBFNAME = $(LIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.a -CFLAGS = -O3 -Wall -I$(LIBDIR) -I$(J2KINCDIR) -LDFLAGS = -L$(LIBDIR) -L$(J2KLIBDIR) -lm -lopenjpip_local - -ALL = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2 - -all: $(ALL) - -jpip_to_jp2: jpip_to_jp2.o $(LIBFNAME) - $(CC) $(CFLAGS) $< $(LDFLAGS) $(LIBFNAME) -o $@ - -jpip_to_j2k: jpip_to_j2k.o $(LIBFNAME) - $(CC) $(CFLAGS) $< $(LDFLAGS) $(LIBFNAME) -o $@ - -test_index: test_index.o $(LIBFNAME) - $(CC) $(CFLAGS) $< $(LDFLAGS) $(LIBFNAME) -o $@ - -clean: - rm -f $(ALL) *.o *~ diff --git a/applications/jpip/util/CMakeLists.txt b/applications/jpip/util/CMakeLists.txt new file mode 100644 index 00000000..d8bedeeb --- /dev/null +++ b/applications/jpip/util/CMakeLists.txt @@ -0,0 +1,38 @@ +# Headers file are located here: +INCLUDE_DIRECTORIES( + ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip + ${FCGI_INCLUDE_DIRNAME} +) + +SET(OPJ_SERVER_SRCS +${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c +) + +# Build executable +ADD_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP") +# +ADD_EXECUTABLE(opj_server ${OPJ_SERVER_SRCS}) +TARGET_LINK_LIBRARIES(opj_server openjpip_server ${FCGI_LIBNAME}) + +# On unix you need to link to the math library: +IF(UNIX) + TARGET_LINK_LIBRARIES(opj_server m) +ENDIF(UNIX) + +# Install exe + INSTALL(TARGETS opj_server + EXPORT OpenJPEGTargets + DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + ) +# +REMOVE_DEFINITIONS(-DSERVER -DQUIT_SIGNAL="quitJPIP") +# +FOREACH(exe opj_dec_server jpip_to_jp2 jpip_to_j2k test_index) +# + ADD_EXECUTABLE(${exe} ${exe}.c) + TARGET_LINK_LIBRARIES(${exe} openjpip_local ${OPENJPEG_LIBRARY_NAME}) + INSTALL(TARGETS ${exe} + EXPORT OpenJPEGTargets + DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + ) +ENDFOREACH(exe) diff --git a/applications/jpip/util/Makefile.am b/applications/jpip/util/Makefile.am new file mode 100644 index 00000000..e0bca5ff --- /dev/null +++ b/applications/jpip/util/Makefile.am @@ -0,0 +1,59 @@ +MAINTAINERCLEANFILES = Makefile.in + +bin_PROGRAMS = opj_server opj_dec_server jpip_to_jp2 jpip_to_j2k test_index + +opj_server_CPPFLAGS = \ +@FCGI_CFLAGS@ \ +-I. \ +-I$(top_srcdir)/applications/jpip/libopenjpip \ +-I$(top_builddir)/applications/jpip/libopenjpip +# +opj_server_CFLAGS = -m32 -DServer -DQUIT_SIGNAL=\"quitJPIP\" +# +opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm +# +opj_server_SOURCES = \ +opj_server.c +#------------- +opj_dec_server_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/applications/jpip/libopenjpip \ +-I$(top_builddir)/applications/jpip/libopenjpip +# +opj_dec_server_CFLAGS = +opj_dec_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la +opj_dec_server_SOURCES = opj_dec_server.c +#------------- +jpip_to_jp2_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/applications/jpip/libopenjpip \ +-I$(top_builddir)/applications/jpip/libopenjpip +# +jpip_to_jp2_CFLAGS = +jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la +jpip_to_jp2_SOURCES = jpip_to_jp2.c +#------------- +jpip_to_j2k_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/applications/jpip/libopenjpip \ +-I$(top_builddir)/applications/jpip/libopenjpip +# +jpip_to_j2k_CFLAGS = +jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la +jpip_to_j2k_SOURCES = jpip_to_j2k.c +#------------- +test_index_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/applications/jpip/libopenjpip \ +-I$(top_builddir)/applications/jpip/libopenjpip +# +test_index_CFLAGS = +test_index_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la $(top_builddir)/libopenjpeg/libopenjpeg.la +test_index_SOURCES = test_index.c +#------------- +install-data-hook: + @echo -e " (B)\t$(bindir)/opj_server$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/opj_dec_server$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/jpip_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/jpip_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt + @echo -e " (B)\t$(bindir)/test_index$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/configure.ac b/configure.ac index ab80e523..e1de3c3b 100644 --- a/configure.ac +++ b/configure.ac @@ -411,10 +411,7 @@ applications/codec/Makefile applications/mj2/Makefile applications/jpip/Makefile applications/jpip/libopenjpip/Makefile -applications/jpip/opj_server/Makefile -applications/jpip/opj_client/Makefile -applications/jpip/opj_client/opj_dec_server/Makefile -applications/jpip/tools/Makefile +applications/jpip/util/Makefile doc/Makefile ]) diff --git a/libopenjpeg/phix_manager.c b/libopenjpeg/phix_manager.c index ab1b4a94..2d06aaf9 100755 --- a/libopenjpeg/phix_manager.c +++ b/libopenjpeg/phix_manager.c @@ -85,13 +85,11 @@ int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio) { - int len, lenp; - int size_of_coding; // 4 or 8 - int version; - int tileno, resno, precno, layno, num_packet=0; - int i,nmax=0; + int len, lenp, tileno, version, i, nmax, size_of_coding; // 4 or 8 opj_tile_info_t *tile_Idx; opj_packet_info_t packet; + int resno, precno, layno, num_packet; + int numOfres, numOfprec, numOflayers; if( j2klen > pow( 2, 32)){ size_of_coding = 8; @@ -106,7 +104,8 @@ int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b cio_skip( cio, 4); /* L [at the end] */ cio_write( cio, JPIP_FAIX, 4); /* FAIX */ cio_write( cio, version,1); /* Version 0 = 4 bytes */ - + + nmax = 0; for( i=0; i<=cstr_info.numdecompos[compno]; i++) nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers; @@ -114,16 +113,38 @@ int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding); /* M */ for( tileno=0; tilenopw[resno]*tile_Idx->ph[resno]; precno++){ - for( layno=0; laynopacket[num_packet * cstr_info.numcomps + compno]; - cio_write( cio, packet.start_pos-coff, size_of_coding); /* start position */ + for( resno=0; resnopw[resno]*tile_Idx->ph[resno]; + for( precno=0; precnopacket[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RLCP: + packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RPCL: + packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno]; + break; + case PCRL: + packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno]; + break; + case CPRL: + packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno]; + break; + default: + fprintf( stderr, "failed to ppix indexing\n"); + } + + cio_write( cio, packet.start_pos-coff, size_of_coding); /* start position */ cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length */ num_packet++; diff --git a/libopenjpeg/ppix_manager.c b/libopenjpeg/ppix_manager.c index 4106144d..41f6d0b4 100755 --- a/libopenjpeg/ppix_manager.c +++ b/libopenjpeg/ppix_manager.c @@ -87,14 +87,12 @@ int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio) { - int len, lenp; - int tileno, resno, precno, layno, num_packet=0; - int size_of_coding; // 4 or 8 - int version; - int i,nmax=0; + int len, lenp, tileno, version, i, nmax, size_of_coding; // 4 or 8 opj_tile_info_t *tile_Idx; opj_packet_info_t packet; - + int resno, precno, layno, num_packet; + int numOfres, numOfprec, numOflayers; + if( j2klen > pow( 2, 32)){ size_of_coding = 8; version = 1; @@ -109,6 +107,7 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b cio_write( cio, JPIP_FAIX, 4); /* FAIX */ cio_write( cio, version, 1); /* Version 0 = 4 bytes */ + nmax = 0; for( i=0; i<=cstr_info.numdecompos[compno]; i++) nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers; @@ -116,29 +115,50 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding); /* M */ for( tileno=0; tilenopw[resno]*tile_Idx->ph[resno]; precno++){ - for( layno=0; laynopacket[num_packet * cstr_info.numcomps + compno]; - cio_write( cio, packet.start_pos-coff, size_of_coding); /* start position */ + numOfres = cstr_info.numdecompos[compno] + 1; + + for( resno=0; resnopw[resno]*tile_Idx->ph[resno]; + for( precno=0; precnopacket[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RLCP: + packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RPCL: + packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno]; + break; + case PCRL: + packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno]; + break; + case CPRL: + packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno]; + break; + default: + fprintf( stderr, "failed to ppix indexing\n"); + } + + cio_write( cio, packet.start_pos-coff, size_of_coding); /* start position */ cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length */ num_packet++; } } } - - /* PADDING */ - while( num_packet < nmax){ + + while( num_packet < nmax){ /* PADDING */ cio_write( cio, 0, size_of_coding); /* start position */ cio_write( cio, 0, size_of_coding); /* length */ num_packet++; - } + } } len = cio_tell( cio)-lenp; @@ -147,5 +167,4 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b cio_seek( cio, lenp+len); return len; - }