From 8b3a282e00d907320123e450ac6faee29cfe0e4d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Apr 2020 20:06:14 +0200 Subject: Remove some unused variables. --- src/MPEG2_Parser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/MPEG2_Parser.cpp') 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; -- cgit v1.2.3 From 343464b6db9d451c82fbdcd1f43da587bd6992af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Apr 2020 20:57:31 +0200 Subject: Fix warnings about not all possible values in a switch being handled. --- src/AS_DCP_MPEG2.cpp | 1 + src/AS_DCP_PCM.cpp | 4 ++++ src/JP2K_Codestream_Parser.cpp | 2 ++ src/KM_log.cpp | 3 +++ src/MPEG2_Parser.cpp | 10 ++++++++++ 5 files changed, 20 insertions(+) (limited to 'src/MPEG2_Parser.cpp') diff --git a/src/AS_DCP_MPEG2.cpp b/src/AS_DCP_MPEG2.cpp index 8afa8bc..7db7cd8 100755 --- a/src/AS_DCP_MPEG2.cpp +++ b/src/AS_DCP_MPEG2.cpp @@ -607,6 +607,7 @@ ASDCP::MPEG2::MXFWriter::h__Writer::WriteFrame(const FrameBuffer& FrameBuf, AESE case FRAME_I: Flags = 0x00; break; case FRAME_P: Flags = 0x22; break; case FRAME_B: Flags = 0x33; break; + case FRAME_U: break; } if ( FrameBuf.GOPStart() ) diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index e7fbff3..5a3fd1e 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -81,6 +81,10 @@ ASDCP::PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* AD case PCM::CF_CFG_6: ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_MCA).ul; break; + + case PCM::CF_NONE: + case PCM::CF_MAXIMUM: + break; } return RESULT_OK; diff --git a/src/JP2K_Codestream_Parser.cpp b/src/JP2K_Codestream_Parser.cpp index 9d55409..d68b52a 100755 --- a/src/JP2K_Codestream_Parser.cpp +++ b/src/JP2K_Codestream_Parser.cpp @@ -242,6 +242,8 @@ ASDCP::JP2K::ParseMetadataIntoDesc(const FrameBuffer& FB, PictureDescriptor& PDe PDesc.CorrespondingProfile.Pcpf[i] = CPF_.pcpf(i+1); } } + break; + default: break; } diff --git a/src/KM_log.cpp b/src/KM_log.cpp index 1a9354a..9aff3a5 100755 --- a/src/KM_log.cpp +++ b/src/KM_log.cpp @@ -203,6 +203,7 @@ Kumu::SyslogLogSink::WriteEntry(const LogEntry& Entry) case Kumu::LOG_NOTICE: priority = SYSLOG_NOTICE; break; case Kumu::LOG_INFO: priority = SYSLOG_INFO; break; case Kumu::LOG_DEBUG: priority = SYSLOG_DEBUG; break; + case Kumu::LOG_MAX: break; } AutoMutex L(m_lock); @@ -295,6 +296,8 @@ Kumu::LogEntry::TestFilter(i32_t filter) const return false; break; + case LOG_MAX: + break; } return true; diff --git a/src/MPEG2_Parser.cpp b/src/MPEG2_Parser.cpp index abfe32b..8b79d51 100755 --- a/src/MPEG2_Parser.cpp +++ b/src/MPEG2_Parser.cpp @@ -94,6 +94,8 @@ class h__ParserState case ST_EXT: m_State = ST_SEQ; return RESULT_OK; + default: + break; } DefaultLogSink().Error("SEQ follows %s\n", StringParserState(m_State)); @@ -110,6 +112,8 @@ class h__ParserState case ST_EXT: m_State = ST_SLICE; return RESULT_OK; + default: + break; } DefaultLogSink().Error("Slice follows %s\n", StringParserState(m_State)); @@ -128,6 +132,8 @@ class h__ParserState case ST_EXT: m_State = ST_PIC; return RESULT_OK; + default: + break; } DefaultLogSink().Error("PIC follows %s\n", StringParserState(m_State)); @@ -144,6 +150,8 @@ class h__ParserState case ST_SEQ: m_State = ST_GOP; return RESULT_OK; + default: + break; } DefaultLogSink().Error("GOP follows %s\n", StringParserState(m_State)); @@ -161,6 +169,8 @@ class h__ParserState case ST_GOP: m_State = ST_EXT; return RESULT_OK; + default: + break; } DefaultLogSink().Error("EXT follows %s\n", StringParserState(m_State)); -- cgit v1.2.3