summaryrefslogtreecommitdiff
path: root/src/h__Writer.cpp
diff options
context:
space:
mode:
authorJohn Hurst <jhurst@cinecert.com>2021-08-27 07:44:17 -0700
committerGitHub <noreply@github.com>2021-08-27 07:44:17 -0700
commit3dd7454de034d96faf5571526d935d1d93560e05 (patch)
treeb6f298ea7bedd38727c01a7fda455d1ab3002faa /src/h__Writer.cpp
parentb8dea7232f134cc54f516e1f0f914d626594eaa4 (diff)
parenta41619256a7b65e51e1f57e4e7d72d7eccf33527 (diff)
Merge pull request #14 from DolbyLaboratories/dolby/atmos_storage/asdcplib_integration/increment_trackID
Set trackid incrementally from 2 instead of hardcoded
Diffstat (limited to 'src/h__Writer.cpp')
-rwxr-xr-xsrc/h__Writer.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp
index 9a201f2..b36af64 100755
--- a/src/h__Writer.cpp
+++ b/src/h__Writer.cpp
@@ -123,6 +123,8 @@ ASDCP::AddDmsTrackGenericPartUtf8Text(Kumu::FileWriter& file_writer, MXF::OP1aHe
StaticTrack *StaticTrack_obj = 0;
header_part.GetMDObjectsByType(Dict->ul(MDD_StaticTrack), object_list);
std::list<InterchangeObject*>::iterator j;
+ // start with 2 because there one other track in Material Package: Audio Essence track
+ ui32_t newTrackId = 2;
for ( j = object_list.begin(); j != object_list.end(); ++j )
{
StaticTrack_obj = dynamic_cast<StaticTrack*>(*j);
@@ -130,8 +132,13 @@ ASDCP::AddDmsTrackGenericPartUtf8Text(Kumu::FileWriter& file_writer, MXF::OP1aHe
if ( id_batch_contains(SourcePackage_obj->Tracks, StaticTrack_obj->InstanceUID)
&& StaticTrack_obj->TrackName.get() == rp2057_static_track_label )
{
- break;
+ newTrackId = StaticTrack_obj->TrackID;
+ break;
}
+ if (StaticTrack_obj->TrackID >= newTrackId)
+ {
+ newTrackId = StaticTrack_obj->TrackID + 1;
+ }
StaticTrack_obj = 0;
}
@@ -160,7 +167,7 @@ ASDCP::AddDmsTrackGenericPartUtf8Text(Kumu::FileWriter& file_writer, MXF::OP1aHe
header_part.AddChildObject(static_track);
source_package.Tracks.push_back(static_track->InstanceUID);
static_track->TrackName = trackDescription;
- static_track->TrackID = 4;
+ static_track->TrackID = newTrackId;
Sequence_obj = new Sequence(Dict);
header_part.AddChildObject(Sequence_obj);