From: Lars Op den Kamp Date: Sat, 8 Oct 2011 00:54:11 +0000 (+0200) Subject: cec: clear the input buffer when parsing X-Git-Tag: upstream/2.2.0~1^2~278 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d54c6c91b8ee2eecf8db22080cfc3662e96bbfc0;p=deb_libcec.git cec: clear the input buffer when parsing --- diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 44b2acb..29daf53 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -491,24 +491,27 @@ bool CCECProcessor::ParseMessage(cec_frame &msg) void CCECProcessor::ParseCurrentFrame(void) { - uint8_t initiator = m_currentframe.data[0] >> 4; - uint8_t destination = m_currentframe.data[0] & 0xF; + cec_frame frame = m_currentframe; + m_currentframe.clear(); + + uint8_t initiator = frame.data[0] >> 4; + uint8_t destination = frame.data[0] & 0xF; CStdString dataStr; dataStr.Format("received frame: initiator: %u destination: %u", initiator, destination); - if (m_currentframe.size > 1) + if (frame.size > 1) { dataStr += " data:"; - for (unsigned int i = 1; i < m_currentframe.size; i++) - dataStr.AppendFormat(" %02x", m_currentframe.data[i]); + for (unsigned int i = 1; i < frame.size; i++) + dataStr.AppendFormat(" %02x", frame.data[i]); } m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str()); - if (m_currentframe.size <= 1) + if (frame.size <= 1) return; - cec_opcode opCode = (cec_opcode) m_currentframe.data[1]; + cec_opcode opCode = (cec_opcode) frame.data[1]; if (destination == (uint16_t) m_iLogicalAddress) { switch(opCode) @@ -533,19 +536,19 @@ void CCECProcessor::ParseCurrentFrame(void) ReportCECVersion((cec_logical_address)initiator); break; case CEC_OPCODE_USER_CONTROL_PRESSED: - if (m_currentframe.size > 2) + if (frame.size > 2) { m_controller->AddKey(); - if (m_currentframe.data[2] <= CEC_USER_CONTROL_CODE_MAX) - m_controller->SetCurrentButton((cec_user_control_code) m_currentframe.data[2]); + if (frame.data[2] <= CEC_USER_CONTROL_CODE_MAX) + m_controller->SetCurrentButton((cec_user_control_code) frame.data[2]); } break; case CEC_OPCODE_USER_CONTROL_RELEASE: m_controller->AddKey(); break; default: - cec_frame params = m_currentframe; + cec_frame params = frame; params.shift(2); m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, ¶ms); break; @@ -562,9 +565,9 @@ void CCECProcessor::ParseCurrentFrame(void) } else if (opCode == CEC_OPCODE_SET_STREAM_PATH) { - if (m_currentframe.size >= 4) + if (frame.size >= 4) { - int streamaddr = ((int)m_currentframe.data[2] << 8) | ((int)m_currentframe.data[3]); + int streamaddr = ((int)frame.data[2] << 8) | ((int)frame.data[3]); strLog.Format("%i requests stream path from physical address %04x", initiator, streamaddr); m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str()); if (streamaddr == m_physicaladdress) @@ -573,7 +576,7 @@ void CCECProcessor::ParseCurrentFrame(void) } else { - cec_frame params = m_currentframe; + cec_frame params = frame; params.shift(2); m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, ¶ms); } diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index bec5c4d..c239d3b 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -176,7 +176,7 @@ void show_console_help(void) int main (int argc, char *argv[]) { - ICECAdapter *parser = LoadLibCec("CEC Tester"); + ICECAdapter *parser = LoadLibCec("CECTester"); if (!parser && parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) { cout << "Unable to create parser. Is libcec.dll present?" << endl;