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-unwrap.cpp | |
| parent | 70d6b24694d5d243d5e09cecd34097180a4f2d62 (diff) | |
| parent | 8400c964b7852fd5be2b23640bf665cf69d85593 (diff) | |
Merge branch 'master' into sha1_builtin
Diffstat (limited to 'src/as-02-unwrap.cpp')
| -rwxr-xr-x | src/as-02-unwrap.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/as-02-unwrap.cpp b/src/as-02-unwrap.cpp index 48cfe93..64a399a 100755 --- a/src/as-02-unwrap.cpp +++ b/src/as-02-unwrap.cpp @@ -315,8 +315,10 @@ read_JP2K_file(CommandOptions& Options) if ( KM_SUCCESS(result) ) { assert(rgba_descriptor); - frame_count = (ui32_t)rgba_descriptor->ContainerDuration; - + if ( ! rgba_descriptor->ContainerDuration.empty() ) + { + frame_count = (ui32_t)rgba_descriptor->ContainerDuration; + } if ( Options.verbose_flag ) { rgba_descriptor->Dump(); @@ -330,8 +332,10 @@ read_JP2K_file(CommandOptions& Options) if ( KM_SUCCESS(result) ) { assert(cdci_descriptor); - frame_count = (ui32_t)cdci_descriptor->ContainerDuration; - + if ( ! cdci_descriptor->ContainerDuration.empty() ) + { + frame_count = (ui32_t)cdci_descriptor->ContainerDuration; + } if ( Options.verbose_flag ) { cdci_descriptor->Dump(); @@ -456,8 +460,10 @@ read_ACES_file(CommandOptions& Options) if (KM_SUCCESS(result)) { assert(aces_descriptor); - frame_count = aces_descriptor->ContainerDuration; - + if ( ! aces_descriptor->ContainerDuration.empty() ) + { + frame_count = aces_descriptor->ContainerDuration; + } if (Options.verbose_flag) { aces_descriptor->Dump(); @@ -669,7 +675,10 @@ read_PCM_file(CommandOptions& Options) } else { - last_frame = (ui32_t)wave_descriptor->ContainerDuration; + if ( ! wave_descriptor->ContainerDuration.empty() ) + { + last_frame = (ui32_t)wave_descriptor->ContainerDuration; + } } if ( last_frame == 0 ) |