o Oops, mistakenly turned off timed-text ancillary resource decryption

diff --git a/src/AS_02_ISXD.cpp b/src/AS_02_ISXD.cpp
index eec27a874601cd7f64bf6a20176bc6a75bd3ede2..b9aaef5fc26a68b31b655c65bf025162b30a3374 100644 (file)
--- a/src/AS_02_ISXD.cpp
+++ b/src/AS_02_ISXD.cpp
@@ -209,7 +209,7 @@ AS_02::ISXD::MXFReader::ReadGenericStreamPartitionPayload(const ui32_t SID, ASDC
 {
   if ( m_Reader && m_Reader->m_File.IsOpen() )
     {
-      return m_Reader->ReadGenericStreamPartitionPayload(SID, frame_buf);
+      return m_Reader->ReadGenericStreamPartitionPayload(SID, frame_buf, 0, 0 /*no encryption*/);
     }
 
   return RESULT_INIT;

diff --git a/src/AS_02_TimedText.cpp b/src/AS_02_TimedText.cpp
index 974c811e2e7fa8b50fb789a1e0616b075e319a93..085d34f0a198c290a5aa46ac7310e5fd6d4a25b5 100644 (file)
--- a/src/AS_02_TimedText.cpp
+++ b/src/AS_02_TimedText.cpp
@@ -205,7 +205,7 @@ AS_02::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const Kumu::UUID&
   if ( KM_SUCCESS(result) )
     {
       assert(desc_object);
-      result = ReadGenericStreamPartitionPayload(desc_object->EssenceStreamID, frame_buf);
+      result = ReadGenericStreamPartitionPayload(desc_object->EssenceStreamID, frame_buf, Ctx, HMAC);
     }
 
   if ( KM_SUCCESS(result) )

diff --git a/src/AS_DCP_TimedText.cpp b/src/AS_DCP_TimedText.cpp
index 1f0930a53c2fdd231643dc0fcd4919edb19fd6e4..bf0e25637afb81a7344ce0c121523a9899658201 100644 (file)
--- a/src/AS_DCP_TimedText.cpp
+++ b/src/AS_DCP_TimedText.cpp
@@ -266,7 +266,7 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const byte_t* uuid
   if ( KM_SUCCESS(result) )
     {
       assert(desc_object);
-      result = ReadGenericStreamPartitionPayload(desc_object->EssenceStreamID, frame_buf);
+      result = ReadGenericStreamPartitionPayload(desc_object->EssenceStreamID, frame_buf, Ctx, HMAC);
     }
 
   if ( KM_SUCCESS(result) )

diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index 73b9e7a45fd89a8e93262d207a18c2d4031ad44c..3c1a9b7f5e255bef36f9007afac1c529a7b664f8 100755 (executable)
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -399,7 +399,8 @@ namespace ASDCP
        // Reads a Generic Stream Partition payload. Returns RESULT_FORMAT if the SID is
        // not present in the  RIP, or if the actual partition at ByteOffset does not have
        // a matching BodySID value. Encryption is not currently supported.
-       Result_t ReadGenericStreamPartitionPayload(const ui32_t sid, ASDCP::FrameBuffer& frame_buf)
+       Result_t ReadGenericStreamPartitionPayload(const ui32_t sid, ASDCP::FrameBuffer& frame_buf,
+                                                  AESDecContext* Ctx, HMACContext* HMAC)
        {
          Kumu::fpos_t start_offset = 0, end_offset = 0;
          ui32_t sequence = 0;
@@ -451,7 +452,7 @@ namespace ASDCP
                    }
                  else
                    {
-                     result = ReadEKLVPacket(0, sequence, frame_buf, m_Dict->ul(MDD_GenericStream_DataElement), 0, 0);
+                     result = ReadEKLVPacket(0, sequence, frame_buf, m_Dict->ul(MDD_GenericStream_DataElement), Ctx, HMAC);
                    }
                }
            }

diff --git a/src/Makefile.am b/src/Makefile.am
index ccf6bee7f9b6387d6329e712d3058251d618d5a0..6a0abc769c459250ec6e8a9751d5f1a9f5065e7d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,6 +73,7 @@ include_HEADERS += \
        SyncCommon.h \
        SyncEncoder.h \
        UUIDInformation.h \
+       WavFileWriter.h \
        AS_DCP_internal.h \
        AS_DCP_DCData_internal.h