Log EKLV packet reading.mattias-debug

1 files changed, 66 insertions, 1 deletions

diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp
index 26ceb4a..1657902 100755
--- a/src/h__Reader.cpp
+++ b/src/h__Reader.cpp
@@ -32,6 +32,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 "KM_sha1.h"
 
 using namespace ASDCP;
 using namespace ASDCP::MXF;
@@ -247,6 +248,9 @@ ASDCP::Read_EKLV_Packet(Kumu::IFileReader& File, const ASDCP::Dictionary& Dict,
 {
   KLReader Reader;
   Result_t result = Reader.ReadKLFromFile(File);
+  Kumu::fpos_t Pos;
+  File.Tell(&Pos);
+  DefaultLogSink().Debug("Read_EKLV_Packet from %ld", Pos);
 
   if ( KM_FAILURE(result) )
     return result;
@@ -268,6 +272,36 @@ ASDCP::Read_EKLV_Packet(Kumu::IFileReader& File, const ASDCP::Dictionary& Dict,
       CtFrameBuf.Capacity((ui32_t) PacketLength);
       ui32_t read_count;
       result = File.Read(CtFrameBuf.Data(), (ui32_t) PacketLength, &read_count);
+      DefaultLogSink().Debug("Tried %d, got %d, result was %d", PacketLength, read_count, int(result));
+      Kumu::SHA1_CTX Check;
+      Kumu::SHA1_Init(&Check);
+      Kumu::SHA1_Update(&Check, CtFrameBuf.Data(), PacketLength);
+      byte_t digest[20];
+      Kumu::SHA1_Final(digest, &Check);
+      DefaultLogSink().Debug(
+	"Hash %x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",
+	digest[0],
+	digest[1],
+	digest[2],
+	digest[3],
+	digest[4],
+	digest[5],
+	digest[6],
+	digest[7],
+	digest[8],
+	digest[9],
+	digest[10],
+	digest[11],
+	digest[12],
+	digest[13],
+	digest[14],
+	digest[15],
+	digest[16],
+	digest[17],
+	digest[18],
+	digest[19]
+      );
+
 
       if ( ASDCP_FAILURE(result) )
 	return result;
@@ -410,7 +444,38 @@ ASDCP::Read_EKLV_Packet(Kumu::IFileReader& File, const ASDCP::Dictionary& Dict,
       ui32_t read_count;
       assert(PacketLength <= 0xFFFFFFFFL);
       result = File.Read(FrameBuf.Data(), (ui32_t) PacketLength, &read_count);
-	  
+
+      DefaultLogSink().Debug("Tried %d, got %d, result was %d", PacketLength, read_count, int(result));
+      Kumu::SHA1_CTX Check;
+      Kumu::SHA1_Init(&Check);
+      Kumu::SHA1_Update(&Check, FrameBuf.Data(), PacketLength);
+      byte_t digest[20];
+      Kumu::SHA1_Final(digest, &Check);
+      DefaultLogSink().Debug(
+	"Hash %x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",
+	digest[0],
+	digest[1],
+	digest[2],
+	digest[3],
+	digest[4],
+	digest[5],
+	digest[6],
+	digest[7],
+	digest[8],
+	digest[9],
+	digest[10],
+	digest[11],
+	digest[12],
+	digest[13],
+	digest[14],
+	digest[15],
+	digest[16],
+	digest[17],
+	digest[18],
+	digest[19]
+      );
+
+
       if ( ASDCP_FAILURE(result) )
 	return result;