diff options
| author | John Hurst <jhurst@cinecert.com> | 2021-01-12 12:46:52 -0800 |
|---|---|---|
| committer | John Hurst <jhurst@cinecert.com> | 2021-01-12 12:46:52 -0800 |
| commit | f69df80edc00a138f50fd527706c78617342dcdd (patch) | |
| tree | 8797cf6a3afc7fca45296d753b2033d74558044f /src/AS_DCP_PCM.cpp | |
| parent | 70d6b24694d5d243d5e09cecd34097180a4f2d62 (diff) | |
| parent | 8400c964b7852fd5be2b23640bf665cf69d85593 (diff) | |
Merge branch 'master' into sha1_builtin
Diffstat (limited to 'src/AS_DCP_PCM.cpp')
| -rwxr-xr-x | src/AS_DCP_PCM.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index e7fbff3..6241d15 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -53,7 +53,6 @@ ASDCP::PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* AD ADescObj->AvgBps = ADesc.AvgBps; ADescObj->LinkedTrackID = ADesc.LinkedTrackID; ADescObj->ContainerDuration = ADesc.ContainerDuration; - ADescObj->ChannelAssignment.get().Reset(); switch ( ADesc.ChannelFormat ) @@ -98,10 +97,15 @@ ASDCP::MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc.QuantizationBits = ADescObj->QuantizationBits; ADesc.BlockAlign = ADescObj->BlockAlign; ADesc.AvgBps = ADescObj->AvgBps; - ADesc.LinkedTrackID = ADescObj->LinkedTrackID; - assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL); - ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration; - + if ( ! ADescObj->LinkedTrackID.empty() ) + { + ADesc.LinkedTrackID = ADescObj->LinkedTrackID; + } + if ( ! ADescObj->ContainerDuration.empty() ) + { + assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL); + ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration; + } ADesc.ChannelFormat = PCM::CF_NONE; if ( ! ADescObj->ChannelAssignment.empty() ) |