diff options
| author | John Hurst <jhurst@cinecert.com> | 2021-08-26 20:47:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 20:47:03 -0700 |
| commit | 623b3ae0a41e6c27f331e2a3347ec07cf1337b05 (patch) | |
| tree | 63d3da84a1e21aeb306f8799ab70f213947e032a /src | |
| parent | 1f8506fd1076926c1b9c15587b8c7dca707e2c37 (diff) | |
| parent | 36406bc0e760052619736b6421df58077c7f453d (diff) | |
Merge pull request #13 from DolbyLaboratories/dolby/atmos_storage/asdcplib_integration/asdcplib_internal_trackID
Fix trackID bug in AS_DCP_internal
Diffstat (limited to 'src')
| -rwxr-xr-x | src/AS_DCP_internal.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index 11443ee..f3616b7 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -732,6 +732,7 @@ extern MXF::RIP *g_RIP; m_HeaderPart.AddChildObject(m_MaterialPackage); m_ContentStorage->Packages.push_back(m_MaterialPackage->InstanceUID); + ui32_t trackID = 1; if ( tc_frame_rate ) { TrackSet<TimecodeComponent> MPTCTrack = @@ -742,12 +743,13 @@ extern MXF::RIP *g_RIP; m_DurationUpdateList.push_back(&(MPTCTrack.Sequence->Duration.get())); MPTCTrack.Clip->Duration.set_has_value(); m_DurationUpdateList.push_back(&(MPTCTrack.Clip->Duration.get())); + trackID++; } TrackSet<SourceClip> MPTrack = CreateTrackAndSequence<MaterialPackage, SourceClip>(m_HeaderPart, *m_MaterialPackage, TrackName, clip_edit_rate, DataDefinition, - 2, m_Dict); + trackID, m_Dict); MPTrack.Sequence->Duration.set_has_value(); m_DurationUpdateList.push_back(&(MPTrack.Sequence->Duration.get())); @@ -756,7 +758,7 @@ extern MXF::RIP *g_RIP; MPTrack.Sequence->StructuralComponents.push_back(MPTrack.Clip->InstanceUID); MPTrack.Clip->DataDefinition = DataDefinition; MPTrack.Clip->SourcePackageID = SourcePackageUMID; - MPTrack.Clip->SourceTrackID = 2; + MPTrack.Clip->SourceTrackID = trackID; MPTrack.Clip->Duration.set_has_value(); m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration.get())); @@ -773,6 +775,7 @@ extern MXF::RIP *g_RIP; m_HeaderPart.AddChildObject(m_FilePackage); m_ContentStorage->Packages.push_back(m_FilePackage->InstanceUID); + trackID = 1; if ( tc_frame_rate ) { TrackSet<TimecodeComponent> FPTCTrack = @@ -783,12 +786,13 @@ extern MXF::RIP *g_RIP; m_DurationUpdateList.push_back(&(FPTCTrack.Sequence->Duration.get())); FPTCTrack.Clip->Duration.set_has_value(); m_DurationUpdateList.push_back(&(FPTCTrack.Clip->Duration.get())); + trackID++; } TrackSet<SourceClip> FPTrack = CreateTrackAndSequence<SourcePackage, SourceClip>(m_HeaderPart, *m_FilePackage, TrackName, clip_edit_rate, DataDefinition, - 2, m_Dict); + trackID, m_Dict); FPTrack.Sequence->Duration.set_has_value(); m_DurationUpdateList.push_back(&(FPTrack.Sequence->Duration.get())); |