X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FAS_DCP_internal.h;h=d55d337182764d40d922642fee24e373a3b73c9a;hb=f6761c9d335a482925d7ad9b1b72543684afcb77;hp=ed9eec7e92dbd9d0878ba1bd60a942475a3beca1;hpb=aff131e971b71a648caaae20b6a9c84207085321;p=asdcplib.git diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index ed9eec7..d55d337 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2006, John Hurst +Copyright (c) 2004-2009, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -86,7 +86,7 @@ namespace ASDCP // Result_t MD_to_WriterInfo(MXF::Identification*, WriterInfo&); - Result_t MD_to_CryptoInfo(MXF::CryptographicContext*, WriterInfo&); + Result_t MD_to_CryptoInfo(MXF::CryptographicContext*, WriterInfo&, const Dictionary&); Result_t EncryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESEncContext*); Result_t DecryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESDecContext*); @@ -111,8 +111,10 @@ namespace ASDCP class h__Reader { ASDCP_NO_COPY_CONSTRUCT(h__Reader); + h__Reader(); public: + const Dictionary* m_Dict; Kumu::FileReader m_File; OPAtomHeader m_HeaderPart; Partition m_BodyPart; @@ -122,7 +124,7 @@ namespace ASDCP ASDCP::FrameBuffer m_CtFrameBuf; Kumu::fpos_t m_LastPosition; - h__Reader(); + h__Reader(const Dictionary&); virtual ~h__Reader(); Result_t InitInfo(); @@ -181,8 +183,10 @@ namespace ASDCP class h__Writer { ASDCP_NO_COPY_CONSTRUCT(h__Writer); + h__Writer(); public: + const Dictionary* m_Dict; Kumu::FileWriter m_File; ui32_t m_HeaderSize; OPAtomHeader m_HeaderPart; @@ -203,7 +207,7 @@ namespace ASDCP WriterInfo m_Info; DurationElementList_t m_DurationUpdateList; - h__Writer(); + h__Writer(const Dictionary&); virtual ~h__Writer(); void InitHeader();