diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-11 13:55:39 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-03 17:01:32 +0100 |
| commit | ab0c4cc3b599bf8e8bb21c81f0418b8aa4922be3 (patch) | |
| tree | bad76f376ae17ca6b956d3064b30348b0899468d /src/h__Reader.cpp | |
| parent | 04cf4482e9bcd5329f717f4ccffd94ff3e751e2a (diff) | |
Make the IMP stuff usable.
Diffstat (limited to 'src/h__Reader.cpp')
| -rwxr-xr-x | src/h__Reader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp index 280e5d4..e142013 100755 --- a/src/h__Reader.cpp +++ b/src/h__Reader.cpp @@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define DEFAULT_MD_DECL #include "AS_DCP_internal.h" -#include "KLV.h" +#include <asdcp/KLV.h> using namespace ASDCP; using namespace ASDCP::MXF; @@ -333,7 +333,7 @@ ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict, ui32_t SourceLength = (ui32_t)KM_i64_BE(Kumu::cp2i<ui64_t>(ess_p)); ess_p += sizeof(ui64_t); assert(SourceLength); - + if ( FrameBuf.Capacity() < SourceLength ) { DefaultLogSink().Error("FrameBuf.Capacity: %u SourceLength: %u\n", FrameBuf.Capacity(), SourceLength); @@ -369,7 +369,7 @@ ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict, result = DecryptFrameBuffer(TmpWrapper, FrameBuf, Ctx); FrameBuf.FrameNumber(FrameNum); - + // detect and test integrity pack if ( ASDCP_SUCCESS(result) && Info.UsesHMAC && HMAC ) { @@ -408,7 +408,7 @@ ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict, ui32_t read_count; assert(PacketLength <= 0xFFFFFFFFL); result = File.Read(FrameBuf.Data(), (ui32_t) PacketLength, &read_count); - + if ( ASDCP_FAILURE(result) ) return result; @@ -419,7 +419,7 @@ ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict, DefaultLogSink().Error("read_count: %s != FrameLength: %s\n", ui64sz(read_count, intbuf1), ui64sz(PacketLength, intbuf2) ); - + return RESULT_READFAIL; } |