diff options
| author | jhurst <jhurst@cinecert.com> | 2018-08-12 22:35:09 +0000 |
|---|---|---|
| committer | jhurst <> | 2018-08-12 22:35:09 +0000 |
| commit | 79912d9558b67fb75dfad8bca29d2db1fa58a769 (patch) | |
| tree | 93450ec3c85b083e309996334904fc08f88e5b68 /src | |
| parent | 24b30516919d625991324b09820a15feb9365870 (diff) | |
o Oops, mistakenly turned off timed-text ancillary resource decryption
Diffstat (limited to 'src')
| -rw-r--r-- | src/AS_02_ISXD.cpp | 2 | ||||
| -rw-r--r-- | src/AS_02_TimedText.cpp | 2 | ||||
| -rw-r--r-- | src/AS_DCP_TimedText.cpp | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_internal.h | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/AS_02_ISXD.cpp b/src/AS_02_ISXD.cpp index eec27a8..b9aaef5 100644 --- 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 974c811..085d34f 100644 --- 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 1f0930a..bf0e256 100644 --- 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 73b9e7a..3c1a9b7 100755 --- 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 ccf6bee..6a0abc7 100644 --- 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 |