diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-06 20:06:14 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-06 21:20:23 +0200 |
| commit | 2c52b323e0099e63856fae099d127b2a093d510c (patch) | |
| tree | 8de1e94f86a473fded081646b3dcf9ec669d89b5 | |
| parent | 7b70b206a3bd767aad3a9a3c789cff9d0e9c38f2 (diff) | |
Remove some unused variables.
| -rw-r--r-- | src/AS_02_ACES.h | 16 | ||||
| -rw-r--r-- | src/AS_02_PCM.cpp | 2 | ||||
| -rw-r--r-- | src/AS_02_internal.h | 1 | ||||
| -rwxr-xr-x | src/AS_DCP_JP2K.cpp | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_MXF.cpp | 1 | ||||
| -rwxr-xr-x | src/AS_DCP_internal.h | 1 | ||||
| -rw-r--r-- | src/KM_fileio.cpp | 4 | ||||
| -rw-r--r-- | src/KM_xml.cpp | 4 | ||||
| -rwxr-xr-x | src/MPEG2_Parser.cpp | 10 | ||||
| -rwxr-xr-x | src/MXFTypes.h | 2 | ||||
| -rw-r--r-- | src/h__02_Writer.cpp | 2 | ||||
| -rwxr-xr-x | src/h__Reader.cpp | 2 | ||||
| -rwxr-xr-x | src/h__Writer.cpp | 2 |
13 files changed, 15 insertions, 34 deletions
diff --git a/src/AS_02_ACES.h b/src/AS_02_ACES.h index dd53904..1ca3d9e 100644 --- a/src/AS_02_ACES.h +++ b/src/AS_02_ACES.h @@ -278,24 +278,8 @@ const byte_t TIFFMagicBE[4] = { 0x4d, 0x4d, 0x00, 0x2a }; // int const NS_ID_LENGTH = 16; // -static byte_t s_ns_id_target_frame_prefix[NS_ID_LENGTH] = -{ - // RFC 4122 type 5 - // 2067-50 8.2.5.4 / RFC4122 Appendix C - //urn:uuid:bba41561-c505-4c9c-ab5a-71c68c2d70ea - 0xbb, 0xa4, 0x15, 0x61, 0xc5, 0x05, 0x4c, 0x9c, - 0xab, 0x5a, 0x71, 0xc6, 0x8c, 0x2d, 0x70, 0xea -}; -static byte_t s_asset_id_prefix[NS_ID_LENGTH] = -{ - // RFC 4122 type 5 - // 2067-2:2016 7.3.1 - 0xaf, 0x86, 0xb7, 0xec, 0x4c, 0xdf, 0x4f, 0x9f, - 0x82, 0x0f, 0x6f, 0xd8, 0xd3, 0x00, 0x30, 0x23 -}; // Generate UUID asset ID values from target frame file contents AS_02::Result_t CreateTargetFrameAssetId(Kumu::UUID& rID, const std::string& target_frame_file); -static Kumu::UUID create_4122_type5_id(const byte_t* subject_name, Kumu::fsize_t size, const byte_t* ns_id); class FrameBuffer : public ASDCP::FrameBuffer { diff --git a/src/AS_02_PCM.cpp b/src/AS_02_PCM.cpp index 8532887..79dc62c 100644 --- a/src/AS_02_PCM.cpp +++ b/src/AS_02_PCM.cpp @@ -151,7 +151,7 @@ AS_02::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename, const AS // ASDCP::Result_t AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBuffer& FrameBuf, - ASDCP::AESDecContext* Ctx, ASDCP::HMACContext* HMAC) + ASDCP::AESDecContext*, ASDCP::HMACContext*) { if ( ! m_File.IsOpen() ) { diff --git a/src/AS_02_internal.h b/src/AS_02_internal.h index 4be764d..ede5219 100644 --- a/src/AS_02_internal.h +++ b/src/AS_02_internal.h @@ -263,7 +263,6 @@ namespace AS_02 if ( KM_SUCCESS(result) ) { ASDCP::MXF::RIP::const_pair_iterator i = this->m_RIP.PairArray.begin(); - ui64_t header_byte_count = this->m_HeaderPart.HeaderByteCount; ui64_t previous_partition = 0; for ( i = this->m_RIP.PairArray.begin(); KM_SUCCESS(result) && i != this->m_RIP.PairArray.end(); ++i ) diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index 129f53d..82ff4ef 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -284,7 +284,7 @@ static const byte_t s_PixelLayoutXYZ[PixelLayoutSize] = { 0xd8, 0x0c, 0xd9, 0x0c // ASDCP::Result_t ASDCP::JP2K_PDesc_to_MD(const JP2K::PictureDescriptor& PDesc, - const ASDCP::Dictionary& dict, + const ASDCP::Dictionary&, ASDCP::MXF::GenericPictureEssenceDescriptor& EssenceDescriptor, ASDCP::MXF::JPEG2000PictureSubDescriptor& EssenceSubDescriptor) { diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp index d3606fe..da91b36 100755 --- a/src/AS_DCP_MXF.cpp +++ b/src/AS_DCP_MXF.cpp @@ -234,7 +234,6 @@ ASDCP::EssenceType(const std::string& filename, EssenceType_t& type) if (ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(RGBAEssenceDescriptor))) ) { MXF::RGBAEssenceDescriptor *rgba_descriptor = 0; - char buf[64]; if ASDCP_SUCCESS(TestHeader.GetMDObjectByType(m_Dict->ul(MDD_RGBAEssenceDescriptor), reinterpret_cast<MXF::InterchangeObject**>(&rgba_descriptor))) { diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index 57ed006..1df4936 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -249,7 +249,6 @@ namespace ASDCP if ( ASDCP_SUCCESS(result) ) { result = m_RIP.InitFromFile(m_File); - ui32_t test_s = (ui32_t)m_RIP.PairArray.size(); if ( ASDCP_FAILURE(result) ) { diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp index 27a5bfa..9db1947 100644 --- a/src/KM_fileio.cpp +++ b/src/KM_fileio.cpp @@ -1292,7 +1292,7 @@ Kumu::WriteStringIntoFile(const std::string& filename, const std::string& inStri // Kumu::Result_t -Kumu::ReadFileIntoObject(const std::string& Filename, Kumu::IArchive& Object, ui32_t max_size) +Kumu::ReadFileIntoObject(const std::string& Filename, Kumu::IArchive& Object, ui32_t) { ByteString Buffer; ui32_t file_size = static_cast<ui32_t>(FileSize(Filename)); @@ -1353,7 +1353,7 @@ Kumu::WriteObjectIntoFile(const Kumu::IArchive& Object, const std::string& Filen // Result_t -Kumu::ReadFileIntoBuffer(const std::string& Filename, Kumu::ByteString& Buffer, ui32_t max_size) +Kumu::ReadFileIntoBuffer(const std::string& Filename, Kumu::ByteString& Buffer, ui32_t) { ui32_t file_size = FileSize(Filename); Result_t result = Buffer.Capacity(file_size); diff --git a/src/KM_xml.cpp b/src/KM_xml.cpp index 68839a1..5037391 100644 --- a/src/KM_xml.cpp +++ b/src/KM_xml.cpp @@ -1047,14 +1047,14 @@ Kumu::XMLElement::ParseFirstFromString(const char* document, ui32_t doc_len) // bool -Kumu::XMLElement::ParseString(const char* document, ui32_t doc_len) +Kumu::XMLElement::ParseString(const char*, ui32_t) { DefaultLogSink().Error("Kumu compiled without XML parser support.\n"); return false; } bool -Kumu::XMLElement::ParseFirstFromString(const char* document, ui32_t doc_len) +Kumu::XMLElement::ParseFirstFromString(const char*, ui32_t) { DefaultLogSink().Error("Kumu compiled without XML parser support.\n"); return false; diff --git a/src/MPEG2_Parser.cpp b/src/MPEG2_Parser.cpp index 89abbfd..abfe32b 100755 --- a/src/MPEG2_Parser.cpp +++ b/src/MPEG2_Parser.cpp @@ -192,7 +192,7 @@ public: ~StreamParams() {} // - Result_t Sequence(VESParser*, const byte_t* b, ui32_t s) + Result_t Sequence(VESParser*, const byte_t* b, ui32_t) { Result_t result = m_State.Goto_SEQ(); @@ -211,7 +211,7 @@ public: } // - Result_t Extension(VESParser*, const byte_t* b, ui32_t s) + Result_t Extension(VESParser*, const byte_t* b, ui32_t) { Result_t result = m_State.Goto_EXT(); @@ -286,7 +286,7 @@ public: m_State.Reset(); } - Result_t Sequence(VESParser*, const byte_t* b, ui32_t s) + Result_t Sequence(VESParser*, const byte_t*, ui32_t s) { if ( m_State.Test_SLICE() ) { @@ -324,7 +324,7 @@ public: return m_State.Test_SLICE() ? RESULT_OK : RESULT_FAIL; } - Result_t Extension(VESParser*, const byte_t* b, ui32_t s) + Result_t Extension(VESParser*, const byte_t*, ui32_t s) { m_FrameSize += s; return m_State.Goto_EXT(); @@ -339,7 +339,7 @@ public: return m_State.Goto_GOP(); } - Result_t Data(VESParser*, const byte_t* b, i32_t s) + Result_t Data(VESParser*, const byte_t*, i32_t s) { m_FrameSize += s; return RESULT_OK; diff --git a/src/MXFTypes.h b/src/MXFTypes.h index baf27c4..555408d 100755 --- a/src/MXFTypes.h +++ b/src/MXFTypes.h @@ -158,6 +158,7 @@ namespace ASDCP } void Dump(FILE* stream = 0, ui32_t depth = 0) { + (void) depth; char identbuf[IdentBufferLen]; if ( stream == 0 ) @@ -253,6 +254,7 @@ namespace ASDCP // void Dump(FILE* stream = 0, ui32_t depth = 0) { + (void) depth; char identbuf[IdentBufferLen]; if ( stream == 0 ) diff --git a/src/h__02_Writer.cpp b/src/h__02_Writer.cpp index 9b1c6c6..b5f7312 100644 --- a/src/h__02_Writer.cpp +++ b/src/h__02_Writer.cpp @@ -316,7 +316,7 @@ AS_02::h__AS02WriterClip::HasOpenClip() const // Result_t -AS_02::h__AS02WriterClip::StartClip(const byte_t* EssenceUL, AESEncContext* Ctx, HMACContext* HMAC) +AS_02::h__AS02WriterClip::StartClip(const byte_t* EssenceUL, AESEncContext* Ctx, HMACContext*) { if ( Ctx != 0 ) { diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp index 77f532e..62a7565 100755 --- a/src/h__Reader.cpp +++ b/src/h__Reader.cpp @@ -80,8 +80,6 @@ ASDCP::h__ASDCPReader::OpenMXFRead(const std::string& filename) if( KM_SUCCESS(result) ) { // - InterchangeObject* Object; - m_Info.LabelSetType = LS_MXF_UNKNOWN; if ( m_HeaderPart.OperationalPattern.MatchExact(MXFInterop_OPAtom_Entry().ul) ) diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp index fc7f060..8b6da22 100755 --- a/src/h__Writer.cpp +++ b/src/h__Writer.cpp @@ -363,7 +363,7 @@ ASDCP::h__ASDCPWriter::WriteASDCPFooter() // standard method of writing a plaintext or encrypted frame Result_t -ASDCP::Write_EKLV_Packet(Kumu::FileWriter& File, const ASDCP::Dictionary& Dict, const MXF::OP1aHeader& HeaderPart, +ASDCP::Write_EKLV_Packet(Kumu::FileWriter& File, const ASDCP::Dictionary& Dict, const MXF::OP1aHeader&, const ASDCP::WriterInfo& Info, ASDCP::FrameBuffer& CtFrameBuf, ui32_t& FramesWritten, ui64_t & StreamOffset, const ASDCP::FrameBuffer& FrameBuf, const byte_t* EssenceUL, const ui32_t& MinEssenceElementBerLength, |
