version bump

diff --git a/README b/README
index 71dfe64578aebab31788fafa4b3ffdbfa9bf4618..567c4c6ea6f11fca67f66e553fd9505fdc27ac44 100755 (executable)
--- a/README
+++ b/README
@@ -139,6 +139,12 @@ command-line utilities all respond to -h.
 
 
 Change History
+2014-10-2 - Bug fixes and enhancements, 2.2.6
+  o Fixed erroneous 377-4 MCA identifier in AS_DCP_PCM dump routine
+  o Fixed erroneous byte 13 in WaveAudioDescriptor_ReferenceAudioAlignmentLevel label
+  o Added missing implementation of -W option to as-02.unwrap
+  o Fixed erroneous use of d-cinema ChannelAssignment label in as-02-wrap
+
 2014-10-01 - Bug fixes and enhancements, 2.2.5
   o Finished AS-02 text wrap/unwrap
   o Fixed fractional seconds parsing for Timestamp objects

diff --git a/configure.ac b/configure.ac
index c47dd0c6a720618f5bd2ab7d0f065410d628674b..f3677494dac57d782b605567bbeefe298c578ab8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_PREREQ([2.59])
 # For example, if asdcplib version 1.0.0 were modified to accomodate changes
 # in file format, and if no changes were made to AS_DCP.h, the new version would be
 # 1.0.1. If changes were also required in AS_DCP.h, the new version would be 1.1.1.
-AC_INIT([asdcplib], [2.2.5], [asdcplib@cinecert.com])
+AC_INIT([asdcplib], [2.2.6], [asdcplib@cinecert.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/KM_error.h])

diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp
index 9de8d53bd76ec2abb23a5014f3b6a46baa10ab66..d90581440474498fe2fdf7ee15f375b573e88f98 100755 (executable)
--- a/src/AS_DCP_PCM.cpp
+++ b/src/AS_DCP_PCM.cpp
@@ -170,7 +170,7 @@ ASDCP::PCM::operator << (std::ostream& strm, const AudioDescriptor& ADesc)
       break;
 
     case CF_CFG_6:
-      strm << "Config 6 (ST 377-1 MCA)";
+      strm << "Config 6 (ST 377-4 MCA)";
       break;
   }
   strm << std::endl;

diff --git a/src/MDD.cpp b/src/MDD.cpp
index f3e8fc68aa6017042d85627d1c7605232d9b74be..2f9604de5be4a912e6f0d56f8b491d177d22adfd 100644 (file)
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -1119,7 +1119,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
       0x04, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00, 0x00 },
       {0}, false, "WaveAudioDescriptor_ReferenceImageEditRate" },
   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 361
-      0x04, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00, 0x00 },
+      0x04, 0x02, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00 },
       {0}, false, "WaveAudioDescriptor_ReferenceAudioAlignmentLevel" },
   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 362
       0x04, 0x01, 0x03, 0x02, 0x0b, 0x00, 0x00, 0x00 },

diff --git a/src/as-02-unwrap.cpp b/src/as-02-unwrap.cpp
index b8f69a0a169bf0946f7a8ca20659a62153cef869..c6ba96bd8d1c5ed7dd59e62171daae3ae5ece01c 100755 (executable)
--- a/src/as-02-unwrap.cpp
+++ b/src/as-02-unwrap.cpp
@@ -376,7 +376,7 @@ read_JP2K_file(CommandOptions& Options)
     {
       result = Reader.ReadFrame(i, FrameBuffer, Context, HMAC);
 
-      if ( ASDCP_SUCCESS(result) )
+      if ( ASDCP_SUCCESS(result)  && ( ! Options.no_write_flag ) )
        {
          Kumu::FileWriter OutFile;
          char filename[256];
@@ -387,8 +387,10 @@ read_JP2K_file(CommandOptions& Options)
          if ( ASDCP_SUCCESS(result) )
            result = OutFile.Write(FrameBuffer.Data(), FrameBuffer.Size(), &write_count);
 
-         if ( Options.verbose_flag )
-           FrameBuffer.Dump(stderr, Options.fb_dump_size);
+         if ( ASDCP_SUCCESS(result) && Options.verbose_flag )
+           {
+             FrameBuffer.Dump(stderr, Options.fb_dump_size);
+           }
        }
     }
 

diff --git a/src/as-02-wrap.cpp b/src/as-02-wrap.cpp
index 66aacd043f590df522dc4ab382f95c5ae04bfe64..8aac348e008996b4e529633e2b255eb9de058fca 100755 (executable)
--- a/src/as-02-wrap.cpp
+++ b/src/as-02-wrap.cpp
@@ -698,7 +698,7 @@ write_PCM_file(CommandOptions& Options)
            }
 
          // this is the d-cinema MCA label, what is the one for IMF?
-         essence_descriptor->ChannelAssignment = g_dict->ul(MDD_DCAudioChannelCfg_MCA);
+         essence_descriptor->ChannelAssignment = g_dict->ul(MDD_IMFAudioChannelCfg_MCA);
        }
     }