diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-01-05 15:32:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-01-05 15:45:01 +0000 |
| commit | e3b5521ac40125c3dfd9f254856cf58ea1584f79 (patch) | |
| tree | f7d7abdfccdcb2e52a06be72da72b593881ae9c4 /asdcplib/src/AS_DCP_internal.h | |
| parent | 3ec4338ce90ea0549409312f24f8b28c07a5d2da (diff) | |
My warning fixes and extensions to asdcplib.
Diffstat (limited to 'asdcplib/src/AS_DCP_internal.h')
| -rwxr-xr-x | asdcplib/src/AS_DCP_internal.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asdcplib/src/AS_DCP_internal.h b/asdcplib/src/AS_DCP_internal.h index a52bd75b..ca60d39b 100755 --- a/asdcplib/src/AS_DCP_internal.h +++ b/asdcplib/src/AS_DCP_internal.h @@ -157,7 +157,7 @@ namespace ASDCP Result_t Write_EKLV_Packet(Kumu::FileWriter& File, const ASDCP::Dictionary& Dict, const MXF::OP1aHeader& HeaderPart, const ASDCP::WriterInfo& Info, ASDCP::FrameBuffer& CtFrameBuf, ui32_t& FramesWritten, ui64_t & StreamOffset, const ASDCP::FrameBuffer& FrameBuf, const byte_t* EssenceUL, - AESEncContext* Ctx, HMACContext* HMAC); + AESEncContext* Ctx, HMACContext* HMAC, std::string* hash = 0); // class KLReader : public ASDCP::KLVPacket @@ -170,8 +170,8 @@ namespace ASDCP ~KLReader() {} inline const byte_t* Key() { return m_KeyBuf; } - inline const ui64_t Length() { return m_ValueLength; } - inline const ui64_t KLLength() { return m_KLLength; } + inline ui64_t Length() { return m_ValueLength; } + inline ui64_t KLLength() { return m_KLLength; } Result_t ReadKLFromFile(Kumu::FileReader& Reader); }; @@ -200,7 +200,7 @@ namespace ASDCP Kumu::fpos_t m_LastPosition; TrackFileReader(const Dictionary& d) : - m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict), m_Dict(&d) + m_Dict(&d), m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict) { default_md_object_init(); } @@ -223,7 +223,6 @@ namespace ASDCP if ( ASDCP_SUCCESS(result) ) { result = m_RIP.InitFromFile(m_File); - ui32_t test_s = m_RIP.PairArray.size(); if ( ASDCP_FAILURE(result) ) { @@ -332,7 +331,7 @@ namespace ASDCP // get absolute frame position and go read the frame's key and length Result_t result = RESULT_OK; - if ( TmpEntry.StreamOffset != m_LastPosition ) + if ( ((Kumu::fpos_t) TmpEntry.StreamOffset) != m_LastPosition ) { m_LastPosition = TmpEntry.StreamOffset; result = m_File.Seek(TmpEntry.StreamOffset); @@ -371,7 +370,7 @@ namespace ASDCP streamOffset = body_offset + TmpEntry.StreamOffset; temporalOffset = TmpEntry.TemporalOffset; keyFrameOffset = TmpEntry.KeyFrameOffset; - + return RESULT_OK; } @@ -381,7 +380,7 @@ namespace ASDCP m_File.Close(); } }; - + //------------------------------------------------------------------------------------------ // @@ -622,7 +621,7 @@ namespace ASDCP MPTrack.Clip->Duration.set_has_value(); m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration.get())); - + // // File (Source) Package // @@ -728,7 +727,7 @@ namespace ASDCP m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration)); - + // // File (Source) Package // @@ -815,7 +814,7 @@ namespace ASDCP } }; - + }/// namespace MXF //------------------------------------------------------------------------------------------ @@ -861,7 +860,8 @@ namespace ASDCP Result_t CreateBodyPart(const MXF::Rational& EditRate, ui32_t BytesPerEditUnit = 0); Result_t WriteEKLVPacket(const ASDCP::FrameBuffer& FrameBuf,const byte_t* EssenceUL, - AESEncContext* Ctx, HMACContext* HMAC); + AESEncContext* Ctx, HMACContext* HMAC, std::string* hash = 0); + Result_t FakeWriteEKLVPacket(int size); Result_t WriteASDCPFooter(); }; |