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-02-info.cpp | |
| parent | 70d6b24694d5d243d5e09cecd34097180a4f2d62 (diff) | |
| parent | 8400c964b7852fd5be2b23640bf665cf69d85593 (diff) | |
Merge branch 'master' into sha1_builtin
Diffstat (limited to 'src/as-02-info.cpp')
| -rw-r--r-- | src/as-02-info.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/as-02-info.cpp b/src/as-02-info.cpp index b469591..dd769a8 100644 --- a/src/as-02-info.cpp +++ b/src/as-02-info.cpp @@ -1,5 +1,7 @@ /* Copyright (c) 2003-2016, John Hurst, Wolfgang Ruppel + + All rights reserved. Redistribution and use in source and binary forms, with or without @@ -238,12 +240,18 @@ class MyPictureDescriptor : public JP2K::PictureDescriptor if ( m_RGBADescriptor != 0 ) { SampleRate = m_RGBADescriptor->SampleRate; - ContainerDuration = m_RGBADescriptor->ContainerDuration; + if ( ! m_RGBADescriptor->ContainerDuration.empty() ) + { + ContainerDuration = m_RGBADescriptor->ContainerDuration; + } } else if ( m_CDCIDescriptor != 0 ) { SampleRate = m_CDCIDescriptor->SampleRate; - ContainerDuration = m_CDCIDescriptor->ContainerDuration; + if ( ! m_CDCIDescriptor->ContainerDuration.empty() ) + { + ContainerDuration = m_CDCIDescriptor->ContainerDuration; + } } else { @@ -376,7 +384,10 @@ class MyACESPictureDescriptor : public AS_02::ACES::PictureDescriptor if ( m_RGBADescriptor != 0 ) { SampleRate = m_RGBADescriptor->SampleRate; - ContainerDuration = m_RGBADescriptor->ContainerDuration; + if ( ! m_RGBADescriptor->ContainerDuration.empty() ) + { + ContainerDuration = m_RGBADescriptor->ContainerDuration; + } } else { @@ -475,7 +486,10 @@ class MyAudioDescriptor : public PCM::AudioDescriptor if ( m_WaveAudioDescriptor != 0 ) { AudioSamplingRate = m_WaveAudioDescriptor->SampleRate; - ContainerDuration = m_WaveAudioDescriptor->ContainerDuration; + if ( ! m_WaveAudioDescriptor->ContainerDuration.empty() ) + { + ContainerDuration = m_WaveAudioDescriptor->ContainerDuration; + } } else { |