diff options
| author | jhurst <jhurst@cinecert.com> | 2006-09-28 04:59:41 +0000 |
|---|---|---|
| committer | jhurst <> | 2006-09-28 04:59:41 +0000 |
| commit | f03fdc18bdf7d3f3b4141024de01d0538f2b224d (patch) | |
| tree | b404158105401bbf28126c227aba32224ad1004a /src | |
| parent | 72e5392ca11c06a1ac0732c71f86df0d9a712ce3 (diff) | |
bug fixes
Diffstat (limited to 'src')
| -rwxr-xr-x | src/AS_DCP.h | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_JP2K.cpp | 2 | ||||
| -rwxr-xr-x | src/MXFTypes.h | 2 | ||||
| -rwxr-xr-x | src/h__Writer.cpp | 11 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/AS_DCP.h b/src/AS_DCP.h index 5dafdaa..54f3bec 100755 --- 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 a1071cf..6358779 100755 --- 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 f2bef5b..c5541be 100755 --- 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 1d1607f..a3b9457 100755 --- 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 // |
