diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-24 23:45:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-09-15 22:16:23 +0200 |
| commit | 2eeee990f029779d8d1c2205b99a239bf87fbbe5 (patch) | |
| tree | 8a5402633b55a447f03e07f7f061318f0a5164a6 /src/AS_DCP_JP2K.cpp | |
| parent | 6fe97406c72dd95339e4045679507b709dbefae2 (diff) | |
Hash to a vector of bytes rather than an ASCII string.2758-safe-write
Diffstat (limited to 'src/AS_DCP_JP2K.cpp')
| -rwxr-xr-x | src/AS_DCP_JP2K.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index 33bde17..7468cd1 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -1161,7 +1161,7 @@ public: Result_t OpenWrite(const std::string&, EssenceType_t type, ui32_t HeaderSize, bool); Result_t SetSourceStream(const PictureDescriptor&, const std::string& label, ASDCP::Rational LocalEditRate = ASDCP::Rational(0,0)); - Result_t WriteFrame(const JP2K::FrameBuffer&, bool add_index, AESEncContext*, HMACContext*, std::string* hash = 0); + Result_t WriteFrame(const JP2K::FrameBuffer&, bool add_index, AESEncContext*, HMACContext*, std::vector<uint8_t>* hash = 0); Result_t FakeWriteFrame(int size, bool add_index); Result_t Finalize(); }; @@ -1269,7 +1269,7 @@ lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l // ASDCP::Result_t lh__Writer::WriteFrame(const JP2K::FrameBuffer& FrameBuf, bool add_index, - AESEncContext* Ctx, HMACContext* HMAC, std::string* hash) + AESEncContext* Ctx, HMACContext* HMAC, std::vector<uint8_t>* hash) { Result_t result = RESULT_OK; @@ -1430,7 +1430,7 @@ ASDCP::JP2K::MXFWriter::OpenWrite(const std::string& filename, const WriterInfo& // Fails if the file is not open, is finalized, or an operating system // error occurs. ASDCP::Result_t -ASDCP::JP2K::MXFWriter::WriteFrame(const FrameBuffer& FrameBuf, AESEncContext* Ctx, HMACContext* HMAC, std::string* hash) +ASDCP::JP2K::MXFWriter::WriteFrame(const FrameBuffer& FrameBuf, AESEncContext* Ctx, HMACContext* HMAC, std::vector<uint8_t>* hash) { if ( m_Writer.empty() ) return RESULT_INIT; @@ -1478,7 +1478,7 @@ public: // Result_t WriteFrame(const FrameBuffer& FrameBuf, StereoscopicPhase_t phase, - AESEncContext* Ctx, HMACContext* HMAC, std::string* hash) + AESEncContext* Ctx, HMACContext* HMAC, std::vector<uint8_t>* hash) { if ( m_NextPhase != phase ) return RESULT_SPHASE; @@ -1667,7 +1667,7 @@ ASDCP::JP2K::MXFSWriter::WriteFrame(const SFrameBuffer& FrameBuf, AESEncContext* // error occurs. ASDCP::Result_t ASDCP::JP2K::MXFSWriter::WriteFrame(const FrameBuffer& FrameBuf, StereoscopicPhase_t phase, - AESEncContext* Ctx, HMACContext* HMAC, std::string* hash) + AESEncContext* Ctx, HMACContext* HMAC, std::vector<uint8_t>* hash) { if ( m_Writer.empty() ) return RESULT_INIT; |