diff options
| author | jelkins <jelkins@cinecert.com> | 2020-10-08 17:29:11 -0700 |
|---|---|---|
| committer | jelkins <jelkins@cinecert.com> | 2020-10-08 17:29:11 -0700 |
| commit | 1d4a906682d19207b0885d90f25fe3e5fd9bb844 (patch) | |
| tree | cd3d8574cef08f6e09227419c61a41a0bb43d982 /src/AS_DCP_PCM.cpp | |
| parent | ee40718aa383cb40beb67be317b3565c218d32c1 (diff) | |
check values for ContainerDuration.
Diffstat (limited to 'src/AS_DCP_PCM.cpp')
| -rwxr-xr-x | src/AS_DCP_PCM.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index de8dbc0..6241d15 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -51,12 +51,8 @@ ASDCP::PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* AD ADescObj->QuantizationBits = ADesc.QuantizationBits; ADescObj->BlockAlign = ADesc.BlockAlign; ADescObj->AvgBps = ADesc.AvgBps; - if ( ! ADesc.LinkedTrackID.empty() ) - { - ADescObj->LinkedTrackID = ADesc.LinkedTrackID; - } + ADescObj->LinkedTrackID = ADesc.LinkedTrackID; ADescObj->ContainerDuration = ADesc.ContainerDuration; - ADescObj->ChannelAssignment.get().Reset(); switch ( ADesc.ChannelFormat ) @@ -101,13 +97,15 @@ ASDCP::MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc.QuantizationBits = ADescObj->QuantizationBits; ADesc.BlockAlign = ADescObj->BlockAlign; ADesc.AvgBps = ADescObj->AvgBps; - if ( ! ADescObj.LinkedTrackID.empty() ) + if ( ! ADescObj->LinkedTrackID.empty() ) { ADesc.LinkedTrackID = ADescObj->LinkedTrackID; } - assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL); - ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration; - + if ( ! ADescObj->ContainerDuration.empty() ) + { + assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL); + ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration; + } ADesc.ChannelFormat = PCM::CF_NONE; if ( ! ADescObj->ChannelAssignment.empty() ) |