diff options
| author | jelkins <jelkins@cinecert.com> | 2020-10-19 09:38:36 -0700 |
|---|---|---|
| committer | jelkins <jelkins@cinecert.com> | 2020-10-19 09:38:36 -0700 |
| commit | 82e8920b522cd46aba89adc53a74dce5b60da2c1 (patch) | |
| tree | bf4419f2a098d8901077dcb92d381810bb3b49c8 /src | |
| parent | fa71fce41f9fe79ab27a35461d625931d21f588a (diff) | |
revert changes to Metadata.cpp and PCMParserList.cpp
Diffstat (limited to 'src')
| -rwxr-xr-x | src/Metadata.cpp | 8 | ||||
| -rwxr-xr-x | src/PCMParserList.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Metadata.cpp b/src/Metadata.cpp index fd4c115..9ca3d66 100755 --- a/src/Metadata.cpp +++ b/src/Metadata.cpp @@ -370,7 +370,7 @@ EssenceContainerData::InitFromTLVSet(TLVReader& TLVSet) assert(m_Dict); Result_t result = InterchangeObject::InitFromTLVSet(TLVSet); if ( ASDCP_SUCCESS(result) ) result = TLVSet.ReadObject(OBJ_READ_ARGS(EssenceContainerData, LinkedPackageUID)); - if ( ASDCP_SUCCESS(result) && ! IndexSID.empty() ) { + if ( ASDCP_SUCCESS(result) ) { result = TLVSet.ReadUi32(OBJ_READ_ARGS_OPT(EssenceContainerData, IndexSID)); IndexSID.set_has_value( result == RESULT_OK ); } @@ -910,7 +910,7 @@ StructuralComponent::InitFromTLVSet(TLVReader& TLVSet) assert(m_Dict); Result_t result = InterchangeObject::InitFromTLVSet(TLVSet); if ( ASDCP_SUCCESS(result) ) result = TLVSet.ReadObject(OBJ_READ_ARGS(StructuralComponent, DataDefinition)); - if ( ASDCP_SUCCESS(result) && ! Duration.empty() ) { + if ( ASDCP_SUCCESS(result) ) { result = TLVSet.ReadUi64(OBJ_READ_ARGS_OPT(StructuralComponent, Duration)); Duration.set_has_value( result == RESULT_OK ); } @@ -1283,7 +1283,7 @@ FileDescriptor::InitFromTLVSet(TLVReader& TLVSet) { assert(m_Dict); Result_t result = GenericDescriptor::InitFromTLVSet(TLVSet); - if ( ASDCP_SUCCESS(result) && ! LinkedTrackID.empty() ) { + if ( ASDCP_SUCCESS(result) ) { result = TLVSet.ReadUi32(OBJ_READ_ARGS_OPT(FileDescriptor, LinkedTrackID)); LinkedTrackID.set_has_value( result == RESULT_OK ); } @@ -2592,7 +2592,7 @@ DMSegment::InitFromTLVSet(TLVReader& TLVSet) assert(m_Dict); Result_t result = InterchangeObject::InitFromTLVSet(TLVSet); if ( ASDCP_SUCCESS(result) ) result = TLVSet.ReadObject(OBJ_READ_ARGS(DMSegment, DataDefinition)); - if ( ASDCP_SUCCESS(result) && ! Duration.empty() ) { + if ( ASDCP_SUCCESS(result) ) { result = TLVSet.ReadUi64(OBJ_READ_ARGS_OPT(DMSegment, Duration)); Duration.set_has_value( result == RESULT_OK ); } diff --git a/src/PCMParserList.cpp b/src/PCMParserList.cpp index b814951..c073e3f 100755 --- a/src/PCMParserList.cpp +++ b/src/PCMParserList.cpp @@ -193,8 +193,8 @@ ASDCP::PCMParserList::OpenRead(const Kumu::PathList_t& argv, const Rational& Pic return RESULT_FORMAT; } - if ( I->ADesc.ContainerDuration < m_ADesc.ContainerDuration ) - m_ADesc.ContainerDuration = I->ADesc.ContainerDuration; + if ( I->ADesc.ContainerDuration < m_ADesc.ContainerDuration ) + m_ADesc.ContainerDuration = I->ADesc.ContainerDuration; m_ADesc.BlockAlign += I->ADesc.BlockAlign; } |