X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=d5ee321ce90954fa485cd33a978dd610c55f003a;hb=b9eea66dd7e19a4baf9e89f4fd6b3c2f281ba7a7;hp=c73c02d21748f324ce105ae134ee7f830a48376c;hpb=13929cffe20a14024ab52a2f93b4edd414e129d1;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index c73c02d..d5ee321 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -42,7 +42,7 @@ using namespace CEC; using namespace std; CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) : - m_iLogicalAddress(iLogicalAddress), + m_iLogicalAddress(CECDEVICE_UNKNOWN), m_strDeviceName(strDeviceName), m_communication(serComm), m_controller(controller), @@ -87,8 +87,11 @@ void *CCECProcessor::Process(void) { m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); - cec_command command; - CCECAdapterMessage msg; + cec_command command; + CCECAdapterMessage msg; + CCECAdapterMessagePtr msgPtr; + + m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); while (!IsStopped()) { @@ -98,8 +101,13 @@ void *CCECProcessor::Process(void) { CLockObject lock(&m_mutex); - if (m_communication->IsOpen() && m_communication->Read(msg, 50)) - bParseFrame = ParseMessage(msg); + if (m_frameBuffer.Pop(msgPtr)) + bParseFrame = ParseMessage(msgPtr); + else if (m_communication->IsOpen() && m_communication->Read(msg, 50)) + { + msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg)); + bParseFrame = ParseMessage(msgPtr); + } bParseFrame &= !IsStopped(); if (bParseFrame) @@ -149,12 +157,17 @@ void CCECProcessor::LogOutput(const cec_command &data) bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress) { - CStdString strLog; - strLog.Format("<< setting logical address to %1x", iLogicalAddress); - m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str()); + if (m_iLogicalAddress != iLogicalAddress) + { + CStdString strLog; + strLog.Format("<< setting logical address to %1x", iLogicalAddress); + m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str()); + + m_iLogicalAddress = iLogicalAddress; + return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); + } - m_iLogicalAddress = iLogicalAddress; - return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); + return true; } bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress) @@ -176,30 +189,33 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable) return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress); } -bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */) +bool CCECProcessor::Transmit(const cec_command &data) { bool bReturn(false); LogOutput(data); - CCECAdapterMessage output(data); + CCECAdapterMessagePtr output(new CCECAdapterMessage(data)); CLockObject lock(&m_mutex); - if (!m_communication || !m_communication->Write(output)) - return bReturn; - - if (bWaitForAck) { - uint64_t now = GetTimeMs(); - uint64_t target = now + 1000; - bool bError(false); - - while (!bReturn && now < target && !bError) + CLockObject msgLock(&output->mutex); + if (!m_communication || !m_communication->Write(output)) + return bReturn; + else { - bReturn = WaitForAck(&bError, output.size(), (uint32_t) (target - now)); - now = GetTimeMs(); + output->condition.Wait(&output->mutex); + if (output->state != ADAPTER_MESSAGE_STATE_SENT) + { + m_controller->AddLog(CEC_LOG_ERROR, "command was not sent"); + return bReturn; + } } + } - if (!bReturn) + if (data.ack_timeout > 0) + { + bool bError(false); + if ((bReturn = WaitForAck(&bError, output->size(), data.ack_timeout)) == false) m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack"); } else @@ -297,7 +313,8 @@ bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout *bError = true; break; default: - m_frameBuffer.Push(msg); + CCECAdapterMessagePtr msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg)); + m_frameBuffer.Push(msgPtr); break; } @@ -307,16 +324,16 @@ bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout return bTransmitSucceeded && !*bError; } -bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg) +bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg) { bool bEom = false; - if (msg.empty()) + if (msg->empty()) return bEom; CStdString logStr; - switch(msg.message()) + switch(msg->message()) { case MSGCODE_NOTHING: m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_NOTHING"); @@ -325,15 +342,15 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg) case MSGCODE_HIGH_ERROR: case MSGCODE_LOW_ERROR: { - if (msg.message() == MSGCODE_TIMEOUT_ERROR) + if (msg->message() == MSGCODE_TIMEOUT_ERROR) logStr = "MSGCODE_TIMEOUT"; - else if (msg.message() == MSGCODE_HIGH_ERROR) + else if (msg->message() == MSGCODE_HIGH_ERROR) logStr = "MSGCODE_HIGH_ERROR"; else logStr = "MSGCODE_LOW_ERROR"; - int iLine = (msg.size() >= 3) ? (msg[1] << 8) | (msg[2]) : 0; - uint32_t iTime = (msg.size() >= 7) ? (msg[3] << 24) | (msg[4] << 16) | (msg[5] << 8) | (msg[6]) : 0; + int iLine = (msg->size() >= 3) ? (msg->at(1) << 8) | (msg->at(2)) : 0; + uint32_t iTime = (msg->size() >= 7) ? (msg->at(3) << 24) | (msg->at(4) << 16) | (msg->at(5) << 8) | (msg->at(6)) : 0; logStr.AppendFormat(" line:%i", iLine); logStr.AppendFormat(" time:%u", iTime); m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str()); @@ -343,13 +360,13 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg) { logStr = "MSGCODE_FRAME_START"; m_currentframe.clear(); - if (msg.size() >= 2) + if (msg->size() >= 2) { - logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg.initiator(), msg.destination(), msg.ack() ? "high" : "low", msg.eom() ? "eom" : ""); - m_currentframe.initiator = msg.initiator(); - m_currentframe.destination = msg.destination(); - m_currentframe.ack = msg.ack(); - m_currentframe.eom = msg.eom(); + logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg->initiator(), msg->destination(), msg->ack() ? "high" : "low", msg->eom() ? "eom" : ""); + m_currentframe.initiator = msg->initiator(); + m_currentframe.destination = msg->destination(); + m_currentframe.ack = msg->ack(); + m_currentframe.eom = msg->eom(); } m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str()); } @@ -357,16 +374,16 @@ bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg) case MSGCODE_FRAME_DATA: { logStr = "MSGCODE_FRAME_DATA"; - if (msg.size() >= 2) + if (msg->size() >= 2) { - uint8_t iData = msg[1]; + uint8_t iData = msg->at(1); logStr.AppendFormat(" %02x", iData); m_currentframe.push_back(iData); - m_currentframe.eom = msg.eom(); + m_currentframe.eom = msg->eom(); } m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str()); - bEom = msg.eom(); + bEom = msg->eom(); } break; case MSGCODE_COMMAND_ACCEPTED: