Copy asdcplib 2.5.11 into the tree.

1 files changed, 171 insertions, 53 deletions

diff --git a/asdcplib/src/Makefile.am b/asdcplib/src/Makefile.am
index 85c1e9fc..c345e086 100644
--- a/asdcplib/src/Makefile.am
+++ b/asdcplib/src/Makefile.am
@@ -1,7 +1,8 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.53 2012/02/05 21:30:18 jhurst Exp $
-# Copyright (c) 2007-2011 John Hurst. All rights reserved.
+# $Id: Makefile.am,v 1.83 2015/10/07 16:41:23 jhurst Exp $
+#
+# Copyright (c) 2007-2013 John Hurst. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -38,18 +39,65 @@ if ENABLE_RANDOM_UUID
 AM_CPPFLAGS += -DCONFIG_RANDOM_UUID
 endif
 
+AM_CPPFLAGS += -g
+
 # list of all the header files that should be installed
-include_HEADERS = KM_error.h KM_fileio.h KM_log.h KM_memio.h KM_mutex.h \
-		KM_platform.h KM_prng.h KM_util.h KM_tai.h KM_xml.h AS_DCP.h
+include_HEADERS = \
+	KM_error.h \
+	KM_fileio.h \
+	KM_log.h \
+	KM_memio.h \
+	KM_mutex.h \
+	KM_platform.h \
+	KM_prng.h \
+	KM_util.h \
+	KM_tai.h \
+	KM_xml.h \
+	AS_DCP.h
+
 if DEV_HEADERS
-include_HEADERS += S12MTimecode.h MDD.h Metadata.h KLV.h MXFTypes.h MXF.h Wav.h \
-		PCMParserList.h
-nodist_include_HEADERS = TimedText_Transform.h
+include_HEADERS += \
+	S12MTimecode.h \
+	ST2095_PinkNoise.h \
+	MDD.h \
+	Metadata.h \
+	KLV.h \
+	JP2K.h \
+	MXFTypes.h \
+	MXF.h \
+	Wav.h \
+	PCMParserList.h \
+	AtmosSyncChannel_Mixer.h \
+	AtmosSyncChannel_Generator.h \
+	PCMDataProviders.h \
+	SyncCommon.h \
+	SyncEncoder.h \
+	UUIDInformation.h 
+
+
+endif
+
+if USE_AS_02
+include_HEADERS		+= AS_02.h
+endif
+
+if USE_PHDR
+include_HEADERS		+= AS_02_PHDR.h
 endif
 
 # list of the libraries to build and install
+
 lib_LTLIBRARIES = libkumu.la libasdcp.la
-# sources for a library
+
+if USE_AS_02
+lib_LTLIBRARIES		+= libas02.la
+endif
+
+if USE_PHDR
+lib_LTLIBRARIES		+= libphdr.la
+endif
+
+# sources for kumu library
 libkumu_la_SOURCES = KM_error.h KM_fileio.cpp KM_fileio.h KM_log.cpp KM_log.h \
 		KM_memio.h KM_mutex.h KM_platform.h KM_prng.cpp KM_prng.h KM_util.cpp \
 		KM_util.h KM_xml.cpp KM_xml.h KM_tai.h KM_tai.cpp
@@ -57,34 +105,68 @@ libkumu_la_SOURCES = KM_error.h KM_fileio.cpp KM_fileio.h KM_log.cpp KM_log.h \
 # linker flags (*not* including libraries to link against) for a library
 libkumu_la_LDFLAGS = -release @VERSION@
 
-# sources for a library that don't get added to a distribution
+
+# sources for asdcp library that don't get added to a distribution
 nodist_libasdcp_la_SOURCES = Metadata_h.tt2 Metadata_cpp.tt2 \
 		mxfgen.pl MXF_def.pl ullist.pl ULList.xml dict.xml DMS_Crypto.xml
-
+# sources for asdcp library
 libasdcp_la_SOURCES = MPEG2_Parser.cpp MPEG.cpp JP2K_Codestream_Parser.cpp \
-		JP2K_Sequence_Parser.cpp JP2K.cpp PCM_Parser.cpp Wav.cpp \
-		TimedText_Parser.cpp KLV.cpp Dict.cpp MXFTypes.cpp MXF.cpp \
-		Index.cpp Metadata.cpp AS_DCP.cpp AS_DCP_MXF.cpp AS_DCP_AES.cpp \
-		h__Reader.cpp h__Writer.cpp AS_DCP_MPEG2.cpp AS_DCP_JP2K.cpp \
-		AS_DCP_PCM.cpp AS_DCP_TimedText.cpp PCMParserList.cpp \
-		Wav.h WavFileWriter.h MXF.h Metadata.h \
-		JP2K.h AS_DCP.h AS_DCP_internal.h KLV.h MPEG.h MXFTypes.h MDD.h \
-		PCMParserList.h S12MTimecode.h MDD.cpp
+	JP2K_Sequence_Parser.cpp JP2K.cpp PCM_Parser.cpp Wav.cpp \
+	TimedText_Parser.cpp KLV.cpp Dict.cpp MXFTypes.cpp MXF.cpp \
+	Index.cpp Metadata.cpp AS_DCP.cpp AS_DCP_MXF.cpp AS_DCP_AES.cpp \
+	h__Reader.cpp h__Writer.cpp AS_DCP_MPEG2.cpp AS_DCP_JP2K.cpp \
+	AS_DCP_PCM.cpp AS_DCP_TimedText.cpp PCMParserList.cpp \
+	Wav.h WavFileWriter.h MXF.h Metadata.h \
+	JP2K.h AS_DCP.h AS_DCP_internal.h KLV.h MPEG.h MXFTypes.h MDD.h \
+	PCMParserList.h S12MTimecode.h MDD.cpp \
+	AS_DCP_ATMOS.cpp  AS_DCP_DCData.cpp AS_DCP_DCData_internal.h \
+	DCData_ByteStream_Parser.cpp DCData_Sequence_Parser.cpp \
+	AtmosSyncChannel_Generator.cpp AtmosSyncChannel_Generator.h \
+	AtmosSyncChannel_Mixer.cpp AtmosSyncChannel_Mixer.h \
+	PCMDataProviders.cpp PCMDataProviders.h \
+	SyncEncoder.c SyncEncoder.h SyncCommon.h CRC16.c CRC16.h \
+	UUIDInformation.c UUIDInformation.h \
+	ST2095_PinkNoise.cpp
 
-if DEV_HEADERS
-nodist_libasdcp_la_SOURCES += TimedText_Transform.h TimedText_Transform.cpp
-endif
 
 libasdcp_la_LDFLAGS = -release @VERSION@
-
 # additional libraries to link against for a library
 libasdcp_la_LIBADD = libkumu.la
 libasdcp_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
 
+if USE_AS_02
+# sources for as-02 library
+libas02_la_SOURCES	= \
+	AS_02.h \
+	AS_02_internal.h \
+	h__02_Reader.cpp \
+	h__02_Writer.cpp \
+	AS_02_JP2K.cpp \
+	AS_02_PCM.cpp \
+	ST2052_TextParser.cpp \
+	AS_02_TimedText.cpp
+
+libas02_la_LDFLAGS = -release @VERSION@
+libas02_la_LIBADD = libasdcp.la libkumu.la
+libas02_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
+endif
+
+
+if USE_PHDR
+# sources for PHDR library
+libphdr_la_SOURCES	= \
+	AS_02_PHDR.h \
+	PHDR_Sequence_Parser.cpp \
+	AS_02_PHDR.cpp
+
+libphdr_la_LDFLAGS = -release @VERSION@
+libphdr_la_LIBADD = libasdcp.la libkumu.la
+libphdr_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
+endif
+
 # Python extension
 if PYTHON_USE
 lib_LTLIBRARIES += libpyasdcp.la
-#### libnapali.la
 
 nodist_libpyasdcp_la_SOURCES = \
 	kumu_python.cpp \
@@ -96,25 +178,23 @@ nodist_libpyasdcp_la_SOURCES = \
 	asdcp_python_writerinfo.h \
 	asdcp_wrappers.h \
 	asdcp_python_mxf.cpp \
+	asdcp_python_mxf.h \
 	asdcp_python_mxf_text.cpp \
 	asdcp_python_mxf_metadata.cpp
 
-####nodist_libnapali_la_SOURCES = \
-####	napali_python.cpp napali_python.h
 
 libpyasdcp_la_CPPFLAGS = @PYTHON_CPPFLAGS@
 libpyasdcp_la_LDFLAGS = @PYTHON_LSPEC@  -release @VERSION@
 libpyasdcp_la_LIBADD = libkumu.la libasdcp.la
 
-####libnapali_la_CPPFLAGS = @PYTHON_CPPFLAGS@
-####libnapali_la_LDFLAGS = @PYTHON_LSPEC@  -release @VERSION@
-####libnapali_la_LIBADD = libkumu.la libasdcp.la
+if USE_AS_02
+libpyasdcp_la_LIBADD	+= libas02.la
+endif
 
 pyexecdir = @PYTHON_EXECDIR@
 pyexec_includedir = $(PYTHON_PREFIX)/include/python$(PYTHON_SHORTVERSION)
 nodist_pyexec_include_HEADERS = kumu_python.h asdcp_python.h asdcp_wrappers.h
 pyexec_LTLIBRARIES = kumu.la asdcp.la
-#### napali_python.h  napali.la
 
 nodist_kumu_la_SOURCES = pykumu.cpp kumu_python.h
 kumu_la_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -125,55 +205,95 @@ nodist_asdcp_la_SOURCES = pyasdcp.cpp kumu_python.h asdcp_python.h asdcp_wrapper
 asdcp_la_CPPFLAGS = @PYTHON_CPPFLAGS@
 asdcp_la_LDFLAGS = @PYTHON_LSPEC@ -avoid-version -module
 asdcp_la_LIBADD = libpyasdcp.la
-
-####nodist_napali_la_SOURCES = pynapali.cpp kumu_python.h napali_python.h
-####napali_la_CPPFLAGS = @PYTHON_CPPFLAGS@
-####napali_la_LDFLAGS = @PYTHON_LSPEC@ -avoid-version -module
-####napali_la_LIBADD = libnapali.la libpyasdcp.la
 endif
 
 # list of programs to be built and installed
 bin_PROGRAMS = \
-	asdcp-wrap asdcp-unwrap asdcp-util asdcp-info asdcp-test \
-	j2c-test blackwave klvwalk wavesplit \
-	kmfilegen kmrandgen kmuuidgen
+	asdcp-wrap \
+	asdcp-unwrap \
+	asdcp-util \
+	asdcp-info \
+	asdcp-test \
+	j2c-test \
+	blackwave \
+	pinkwave \
+	klvwalk \
+	wavesplit \
+	klvsplit \
+	kmfilegen \
+	kmrandgen \
+	kmuuidgen
+
+if USE_AS_02
+bin_PROGRAMS += \
+	as-02-wrap \
+	as-02-unwrap
+endif
+
+if USE_PHDR
+bin_PROGRAMS += \
+	phdr-wrap \
+	phdr-unwrap
+endif
 
 # sources and linkage for CLI utilities
 asdcp_test_SOURCES = asdcp-test.cpp
-asdcp_test_LDADD = libasdcp.la
+asdcp_test_LDADD = libasdcp.la libkumu.la
 
 asdcp_wrap_SOURCES = asdcp-wrap.cpp
-asdcp_wrap_LDADD = libasdcp.la
+asdcp_wrap_LDADD = libasdcp.la libkumu.la
 
 asdcp_unwrap_SOURCES = asdcp-unwrap.cpp
-asdcp_unwrap_LDADD = libasdcp.la
+asdcp_unwrap_LDADD = libasdcp.la libkumu.la
 
 asdcp_util_SOURCES = asdcp-util.cpp
-asdcp_util_LDADD = libasdcp.la
+asdcp_util_LDADD = libasdcp.la libkumu.la
 
 asdcp_info_SOURCES = asdcp-info.cpp
-asdcp_info_LDADD = libasdcp.la
+asdcp_info_LDADD = libasdcp.la libkumu.la
 
 kmfilegen_SOURCES = kmfilegen.cpp
-kmfilegen_LDADD = libkumu.la
+kmfilegen_LDADD = libkumu.la 
 
 kmrandgen_SOURCES = kmrandgen.cpp
-kmrandgen_LDADD = libkumu.la
+kmrandgen_LDADD = libkumu.la 
 
 kmuuidgen_SOURCES = kmuuidgen.cpp
-kmuuidgen_LDADD = libkumu.la
+kmuuidgen_LDADD = libkumu.la 
 
 blackwave_SOURCES = blackwave.cpp
-blackwave_LDADD = libasdcp.la
+blackwave_LDADD = libasdcp.la  libkumu.la
+
+pinkwave_SOURCES = pinkwave.cpp
+pinkwave_LDADD = libasdcp.la  libkumu.la
 
 klvwalk_SOURCES = klvwalk.cpp
-klvwalk_LDADD = libasdcp.la
+klvwalk_LDADD = libasdcp.la libkumu.la
 
 wavesplit_SOURCES = wavesplit.cpp
-wavesplit_LDADD = libasdcp.la
+wavesplit_LDADD = libasdcp.la libkumu.la
 
 j2c_test_SOURCES = j2c-test.cpp
-j2c_test_LDADD = libasdcp.la
+j2c_test_LDADD = libasdcp.la libkumu.la
+
+klvsplit_SOURCES = klvsplit.cpp
+klvsplit_LDADD = libasdcp.la libkumu.la
+
+if USE_AS_02
+as_02_wrap_SOURCES = as-02-wrap.cpp
+as_02_wrap_LDADD = libas02.la libasdcp.la libkumu.la
+
+as_02_unwrap_SOURCES = as-02-unwrap.cpp
+as_02_unwrap_LDADD = libas02.la libasdcp.la libkumu.la
+endif
+
+if USE_PHDR
+phdr_wrap_SOURCES = phdr-wrap.cpp
+phdr_wrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la
+
+phdr_unwrap_SOURCES = phdr-unwrap.cpp
+phdr_unwrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la
+endif
 
 # list of programs that need to be compiled for use in test suite
 check_PROGRAMS = asdcp-mem-test path-test \
@@ -194,10 +314,10 @@ fips_186_rng_test_SOURCES = fips-186-rng-test.cpp
 fips_186_rng_test_LDADD = libasdcp.la
 
 asdcp_version_SOURCES = asdcp-version.cpp
-asdcp_version_LDADD = libkumu.la
+asdcp_version_LDADD = libkumu.la 
 
 if DEV_HEADERS
-nodist_tt_xform_SOURCES = tt-xform.cpp
+nodist_tt_xform_SOURCES = tt-xform.cpp TimedText_Transform.h
 tt_xform_LDADD = libasdcp.la
 endif
 
@@ -217,11 +337,9 @@ EXTRA_DIST = fips-186-test-harness.pl $(TESTS)
 if !FREEDIST
 if DEV_HEADERS
 EXTRA_DIST += $(nodist_libasdcp_la_SOURCES) $(nodist_tt_xform_SOURCES)
-#### $(nodist_napali_la_SOURCES) $(nodist_libnapali_la_SOURCES)
 endif
 if PYTHON_USE
 EXTRA_DIST += $(nodist_pyexec_include_HEADERS) $(nodist_libpyasdcp_la_SOURCES) $(nodist_kumu_la_SOURCES) $(nodist_asdcp_la_SOURCES)
-#### $(nodist_napali_la_SOURCES) $(nodist_libnapali_la_SOURCES)
 endif
 endif