Copy asdcplib 2.5.11 into the tree.

4 files changed, 142 insertions, 24 deletions

diff --git a/asdcplib/win32/Makefile.in b/asdcplib/win32/Makefile.in
index 9f1d64da..4cee193b 100644
--- a/asdcplib/win32/Makefile.in
+++ b/asdcplib/win32/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -41,6 +40,51 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -60,7 +104,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = win32
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.wmk
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_expat.m4 \
@@ -75,11 +119,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = Makefile.mak
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -258,11 +321,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -398,15 +461,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/asdcplib/win32/Makefile.mak b/asdcplib/win32/Makefile.mak
index 96be7f93..e2f538e0 100644
--- a/asdcplib/win32/Makefile.mak
+++ b/asdcplib/win32/Makefile.mak
@@ -1,4 +1,4 @@
-# $Id: Makefile.wmk,v 1.4 2012/03/07 18:16:52 mikey Exp $

+# $Id: Makefile.wmk,v 1.6 2013/06/26 19:34:18 msheby Exp $

 # Copyright (c) 2007-2012 John Hurst. All rights reserved.

 #

 # Redistribution and use in source and binary forms, with or without

@@ -33,11 +33,11 @@ OBJDIR = .
 

 !ifdef ENABLE_RANDOM_UUID

 CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \

-	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.9.45\" \

+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"2.5.11\" \

 	/I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1

 !else

 CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \

-	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.9.45\" \

+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"2.5.11\" \

 	/I"$(WITH_OPENSSL)"\inc32

 !endif

 LIB_EXE = lib.exe

@@ -83,14 +83,26 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
 	Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \

 	h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \

 	AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \

-	MDD.obj

+	MDD.obj AS_DCP_ATMOS.obj AS_DCP_DCData.obj \

+	DCData_ByteStream_Parser.obj DCData_Sequence_Parser.obj \

+	AtmosSyncChannel_Generator.obj AtmosSyncChannel_Mixer.obj \

+	PCMDataProviders.obj SyncEncoder.obj CRC16.obj \

+	UUIDInformation.obj

+AS02_OBJS = h__02_Reader.obj h__02_Writer.obj AS_02_JP2K.obj \

+	AS_02_PCM.obj

 

 {$(SRCDIR)\}.cpp{}.obj:

 	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<

 

+{$(SRCDIR)\}.c{}.obj:

+	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<

+

 all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe \

      asdcp-wrap.exe asdcp-unwrap.exe asdcp-info.exe \

      blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe 

+!IFDEF USE_AS_02

+       as-02-wrap.exe as-02-unwrap.exe \

+!ENDIF

 

 clean:

 	erase *.exe *.lib *.obj *.ilk *.pdb *.idb

@@ -111,6 +123,11 @@ libkumu.lib : $(KUMU_OBJS)
 libasdcp.lib: libkumu.lib $(ASDCP_OBJS)

 	$(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $**

 

+!IFDEF USE_AS_02

+libas02.lib: libasdcp.lib libkumu.lib $(AS02_OBJS)

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libas02.lib $**

+!ENDIF

+

 blackwave.exe: libasdcp.lib blackwave.obj

 	$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib

 

@@ -147,5 +164,13 @@ asdcp-util.exe: libasdcp.lib asdcp-util.obj
 j2c-test.exe: libasdcp.lib j2c-test.obj

 	$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib

 

+!IFDEF USE_AS_02

+as-02-wrap.exe: libas02.lib as-02-wrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:as-02-wrap.exe $** Advapi32.lib

+

+as-02-unwrap.exe: libas02.lib as-02-unwrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:as-02-unwrap.exe $** Advapi32.lib

+!ENDIF

+

 

 # END Makefile

diff --git a/asdcplib/win32/Makefile.wmk b/asdcplib/win32/Makefile.wmk
index 0539026e..95788b73 100755
--- a/asdcplib/win32/Makefile.wmk
+++ b/asdcplib/win32/Makefile.wmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.wmk,v 1.4 2012/03/07 18:16:52 mikey Exp $

+# $Id: Makefile.wmk,v 1.6 2013/06/26 19:34:18 msheby Exp $

 # Copyright (c) 2007-2012 John Hurst. All rights reserved.

 #

 # Redistribution and use in source and binary forms, with or without

@@ -83,14 +83,26 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
 	Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \

 	h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \

 	AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \

-	MDD.obj

+	MDD.obj AS_DCP_ATMOS.obj AS_DCP_DCData.obj \

+	DCData_ByteStream_Parser.obj DCData_Sequence_Parser.obj \

+	AtmosSyncChannel_Generator.obj AtmosSyncChannel_Mixer.obj \

+	PCMDataProviders.obj SyncEncoder.obj CRC16.obj \

+	UUIDInformation.obj

+AS02_OBJS = h__02_Reader.obj h__02_Writer.obj AS_02_JP2K.obj \

+	AS_02_PCM.obj

 

 {$(SRCDIR)\}.cpp{}.obj:

 	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<

 

+{$(SRCDIR)\}.c{}.obj:

+	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<

+

 all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe \

      asdcp-wrap.exe asdcp-unwrap.exe asdcp-info.exe \

      blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe 

+!IFDEF USE_AS_02

+       as-02-wrap.exe as-02-unwrap.exe \

+!ENDIF

 

 clean:

 	erase *.exe *.lib *.obj *.ilk *.pdb *.idb

@@ -111,6 +123,11 @@ libkumu.lib : $(KUMU_OBJS)
 libasdcp.lib: libkumu.lib $(ASDCP_OBJS)

 	$(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $**

 

+!IFDEF USE_AS_02

+libas02.lib: libasdcp.lib libkumu.lib $(AS02_OBJS)

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libas02.lib $**

+!ENDIF

+

 blackwave.exe: libasdcp.lib blackwave.obj

 	$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib

 

@@ -147,5 +164,13 @@ asdcp-util.exe: libasdcp.lib asdcp-util.obj
 j2c-test.exe: libasdcp.lib j2c-test.obj

 	$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib

 

+!IFDEF USE_AS_02

+as-02-wrap.exe: libas02.lib as-02-wrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:as-02-wrap.exe $** Advapi32.lib

+

+as-02-unwrap.exe: libas02.lib as-02-unwrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:as-02-unwrap.exe $** Advapi32.lib

+!ENDIF

+

 

 # END Makefile

diff --git a/asdcplib/win32/README.txt b/asdcplib/win32/README.txt
index ca3d9fd8..76e76c79 100755
--- a/asdcplib/win32/README.txt
+++ b/asdcplib/win32/README.txt
@@ -49,6 +49,10 @@ Without XML parsing:
 C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"

 	/f Makefile.mak

 

+Without XML parsing but with the AS-02 library and executables:

+C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"

+	USE_AS_02=1 /f Makefile.mak

+

 Want a 64-bit build? Change the following line in Makefile.mak:

     LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG

 to