diff options
| author | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2022-01-28 09:30:55 +0100 |
|---|---|---|
| committer | Thomas Richter <thomas.richter@iis.fraunhofer.de> | 2022-01-28 09:30:55 +0100 |
| commit | 7081231eba80044c0f97d4da5998d65681b94528 (patch) | |
| tree | 550d0ecc45d301663b93cfd34e6c958fa6c5b4c0 /src/AS_DCP_MXF.cpp | |
| parent | d96e461dd7ba5f81ce40979a79bfad105be352de (diff) | |
| parent | 94e66805feeba15e6dd80ec290f04706a1c9dbdc (diff) | |
Merge branch 'master' of github.com:thorfdbg/asdcplib
Diffstat (limited to 'src/AS_DCP_MXF.cpp')
| -rwxr-xr-x | src/AS_DCP_MXF.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp index 9cb4c15..129edf1 100755 --- a/src/AS_DCP_MXF.cpp +++ b/src/AS_DCP_MXF.cpp @@ -163,19 +163,19 @@ ASDCP::MD_to_CryptoInfo(CryptographicContext* InfoObj, WriterInfo& Info, const D // // ASDCP::Result_t -ASDCP::EssenceType(const std::string& filename, EssenceType_t& type) +ASDCP::EssenceType(const std::string& filename, EssenceType_t& type, const Kumu::IFileReaderFactory& fileReaderFactory) { const Dictionary* m_Dict = &DefaultCompositeDict(); InterchangeObject* md_object = 0; assert(m_Dict); - Kumu::FileReader Reader; + ASDCP::mem_ptr<Kumu::IFileReader> Reader(fileReaderFactory.CreateFileReader()); OP1aHeader TestHeader(m_Dict); - Result_t result = Reader.OpenRead(filename); + Result_t result = Reader->OpenRead(filename); if ( ASDCP_SUCCESS(result) ) - result = TestHeader.InitFromFile(Reader); // test UL and OP + result = TestHeader.InitFromFile(*Reader); // test UL and OP if ( ASDCP_SUCCESS(result) ) { @@ -312,7 +312,6 @@ ASDCP::RawEssenceType(const std::string& filename, EssenceType_t& type) ASDCP::Wav::SimpleWaveHeader WavHeader; ASDCP::RF64::SimpleRF64Header RF64Header; ASDCP::AIFF::SimpleAIFFHeader AIFFHeader; - Kumu::XMLElement TmpElement("Tmp"); ui32_t data_offset; ui32_t read_count; @@ -466,6 +465,8 @@ ASDCP::RawEssenceType(const std::string& filename, EssenceType_t& type) return result; } +#ifdef HAVE_OPENSSL + // Result_t ASDCP::EncryptFrameBuffer(const ASDCP::FrameBuffer& FBin, ASDCP::FrameBuffer& FBout, AESEncContext* Ctx) @@ -721,6 +722,8 @@ ASDCP::IntegrityPack::TestValues(const ASDCP::FrameBuffer& FB, const byte_t* Ass return result; } +#endif //HAVE_OPENSSL + // // end AS_DCP_MXF.cpp // |