bug fixes

diff --git a/README b/README
index 247a8ce59ab494819b46faf2594862181666267f..4b11857381e679ecb2259f109992c1060b42ac66 100755 (executable)
--- a/README
+++ b/README
@@ -113,6 +113,13 @@ utilities all respond to -h and there are manual pages in man/.
 
 
 Change History
+2006.09.28 - Bug fixes v1.1.10
+ o Changed RM_RELEASE to RL_RELEASE in MXFTypes.h
+ o Cahnged the MXF writer to use RL_RELEASE (was RL_DEVELOPMENT)
+ o Really fixed source reference chain
+ o Updated JP2K file package label
+
+
 2006.09.25 - Bug fixes v1.1.9
  o Fixed SourcePackageID value. All files will be 'original',
    i.e. SourcePackageID will be all zeros. Let me know if you

diff --git a/src/AS_DCP.h b/src/AS_DCP.h
index 5dafdaa5fbef63e0623340893b817731c9d22909..54f3becb2d89f2b5b74e9bc2e5dad4d05a7af43a 100755 (executable)
--- a/src/AS_DCP.h
+++ b/src/AS_DCP.h
@@ -143,7 +143,7 @@ namespace ASDCP {
   // 1.0.1. If changes were also required in AS_DCP.h, the new version would be 1.1.1.
   const ui32_t VERSION_MAJOR = 1;
   const ui32_t VERSION_APIMINOR = 1;
-  const ui32_t VERSION_IMPMINOR = 9;
+  const ui32_t VERSION_IMPMINOR = 10;
   const char* Version();
 
   // UUIDs are passed around as strings of UUIDlen bytes

diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp
index a1071cf7e0ec957406ab5d7333c9ad89749a00ff..635877964b6b8eb1ac5b46e60f7cbd2f5c00de16 100755 (executable)
--- a/src/AS_DCP_JP2K.cpp
+++ b/src/AS_DCP_JP2K.cpp
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 //------------------------------------------------------------------------------------------
 
-static std::string JP2K_PACKAGE_LABEL = "File Package: SMPTE XXXM frame wrapping of JPEG 2000 codestreams";
+static std::string JP2K_PACKAGE_LABEL = "File Package: SMPTE 429-4 frame wrapping of JPEG 2000 codestreams";
 static std::string PICT_DEF_LABEL = "Picture Track";
 
 //

diff --git a/src/MXFTypes.h b/src/MXFTypes.h
index f2bef5b31f910a59195dddc0bfe50b599911d323..c5541be13a193981a873997a8c22475ad761eac5 100755 (executable)
--- a/src/MXFTypes.h
+++ b/src/MXFTypes.h
@@ -345,7 +345,7 @@ namespace ASDCP
          ASDCP_NO_COPY_CONSTRUCT(VersionType);
 
        public:
-         enum Release_t { RL_UNKNOWN, RM_RELEASE, RL_DEVELOPMENT, RL_PATCHED, RL_BETA, RL_PRIVATE };
+         enum Release_t { RL_UNKNOWN, RL_RELEASE, RL_DEVELOPMENT, RL_PATCHED, RL_BETA, RL_PRIVATE };
          ui16_t Major;
          ui16_t Minor;
          ui16_t Patch;

diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp
index 1d1607f1cd74b95329b4d42208156ac080221078..a3b9457536412045750a93768fbd30da821a6c5b 100755 (executable)
--- a/src/h__Writer.cpp
+++ b/src/h__Writer.cpp
@@ -129,7 +129,7 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap
   Ident->ToolkitVersion.Minor = VERSION_APIMINOR;
   Ident->ToolkitVersion.Patch = VERSION_IMPMINOR;
   Ident->ToolkitVersion.Build = ASDCP_BUILD_NUMBER;
-  Ident->ToolkitVersion.Release = VersionType::RL_DEVELOPMENT;
+  Ident->ToolkitVersion.Release = VersionType::RL_RELEASE;
 
   //
   ContentStorage* Storage = new ContentStorage;
@@ -202,9 +202,8 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap
   m_FilePackage->PackageUID = PackageUMID;
   ECD->LinkedPackageUID = PackageUMID;
 
-  // for now we do not allow setting this value, so all files will be 'original'
-  m_MPClip->SourcePackageID = NilUMID;
-  m_MPClip->SourceTrackID = 0;
+  m_MPClip->SourcePackageID = PackageUMID;
+  m_MPClip->SourceTrackID = 2;
 
   m_HeaderPart.AddChildObject(m_FilePackage);
   Storage->Packages.push_back(m_FilePackage->InstanceUID);
@@ -247,6 +246,10 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap
   m_FPClSequence->StructuralComponents.push_back(m_FPClip->InstanceUID);
   m_FPClip->DataDefinition = DataDefinition;
 
+  // for now we do not allow setting this value, so all files will be 'original'
+  m_FPClip->SourceTrackID = 0;
+  m_FPClip->SourcePackageID = NilUMID;
+
   //
   // Essence Descriptor
   //