diff options
| author | jhurst <jhurst@cinecert.com> | 2011-10-27 22:07:13 +0000 |
|---|---|---|
| committer | jhurst <> | 2011-10-27 22:07:13 +0000 |
| commit | 289216de368bb6456b2f5e5dc6d4c38abac2b0d9 (patch) | |
| tree | b71a49a34001f894fb8607e4ec261bfa12962977 /src/h__Reader.cpp | |
| parent | d1be446a52726e2223f58b07e5bd2179c8742075 (diff) | |
release
Diffstat (limited to 'src/h__Reader.cpp')
| -rwxr-xr-x | src/h__Reader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp index 6ba52e2..d466500 100755 --- a/src/h__Reader.cpp +++ b/src/h__Reader.cpp @@ -250,7 +250,7 @@ ASDCP::h__Reader::ReadEKLVPacket(ui32_t FrameNum, ui32_t SequenceNum, ASDCP::Fra m_LastPosition = m_LastPosition + Reader.KLLength() + PacketLength; assert(m_Dict); - if ( memcmp(Key.Value(), m_Dict->ul(MDD_CryptEssence), Key.Size() - 1) == 0 ) // ignore the stream numbers + if ( Key.MatchIgnoreStream(m_Dict->ul(MDD_CryptEssence)) ) // ignore the stream numbers { if ( ! m_Info.EncryptedEssence ) { @@ -303,7 +303,7 @@ ASDCP::h__Reader::ReadEKLVPacket(ui32_t FrameNum, ui32_t SequenceNum, ASDCP::Fra return RESULT_FORMAT; // test essence UL - if ( memcmp(ess_p, EssenceUL, SMPTE_UL_LENGTH - 1) != 0 ) // ignore the stream number + if ( UL(ess_p).MatchIgnoreStream(EssenceUL) ) // ignore the stream number { char strbuf[IntBufferLen]; const MDDEntry* Entry = m_Dict->FindUL(Key.Value()); @@ -383,7 +383,7 @@ ASDCP::h__Reader::ReadEKLVPacket(ui32_t FrameNum, ui32_t SequenceNum, ASDCP::Fra FrameBuf.PlaintextOffset(PlaintextOffset); } } - else if ( memcmp(Key.Value(), EssenceUL, Key.Size() - 1) == 0 ) // ignore the stream number + else if ( Key.MatchIgnoreStream(EssenceUL) ) // ignore the stream number { // read plaintext frame if ( FrameBuf.Capacity() < PacketLength ) { |