X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2FCECProcessor.cpp;h=a313e0921c93e1b3d4f072e59405eebd88e41ea6;hb=5d38b0b6b48d9c1603c690a140a1400184065c7c;hp=1946556a6f4edcd9f027094ada1c97d462808819;hpb=8b08421cf0a69841b692e34602fb95f66d511030;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 1946556..a313e09 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -47,6 +47,10 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm m_communication(serComm), m_controller(controller) { + for (uint8_t iPtr = 0; iPtr < 16; iPtr++) + m_vendorIds[iPtr] = CEC_VENDOR_UNKNOWN; + for (uint8_t iPtr = 0; iPtr < 16; iPtr++) + m_vendorClasses[iPtr] = (uint8_t) 0; } CCECProcessor::~CCECProcessor(void) @@ -118,7 +122,7 @@ bool CCECProcessor::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV return false; CStdString strLog; - strLog.Format("powering on devices with logical address %d", (int8_t)address); + strLog.Format("<< powering on device with logical address %d", (int8_t)address); m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str()); cec_frame frame; frame.clear(); @@ -134,7 +138,7 @@ bool CCECProcessor::StandbyDevices(cec_logical_address address /* = CECDEVICE_BR return false; CStdString strLog; - strLog.Format("putting all devices with logical address %d in standby mode", (int8_t)address); + strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)address); m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str()); cec_frame frame; frame.clear(); @@ -149,7 +153,7 @@ bool CCECProcessor::SetActiveView(void) if (!IsRunning()) return false; - m_controller->AddLog(CEC_LOG_DEBUG, "setting active view"); + m_controller->AddLog(CEC_LOG_DEBUG, "<< setting active view"); cec_frame frame; frame.clear(); @@ -165,7 +169,7 @@ bool CCECProcessor::SetInactiveView(void) if (!IsRunning()) return false; - m_controller->AddLog(CEC_LOG_DEBUG, "setting inactive view"); + m_controller->AddLog(CEC_LOG_DEBUG, "<< setting inactive view"); cec_frame frame; frame.clear(); @@ -224,7 +228,7 @@ bool CCECProcessor::Transmit(const cec_frame &data, bool bWaitForAck /* = true * bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress) { CStdString strLog; - strLog.Format("setting logical address to %d", iLogicalAddress); + strLog.Format("<< setting logical address to %d", iLogicalAddress); m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str()); m_iLogicalAddress = iLogicalAddress; @@ -237,10 +241,25 @@ bool CCECProcessor::TransmitFormatted(const cec_frame &data, bool bWaitForAck /* if (!m_communication || !m_communication->Write(data)) return false; - if (bWaitForAck && !WaitForAck()) + if (bWaitForAck) { - m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ACK"); - return false; + uint64_t now = GetTimeMs(); + uint64_t target = now + 1000; + bool bError(false); + bool bGotAck(false); + + while (!bGotAck && now < target) + { + bGotAck = WaitForAck(&bError, (uint64_t) (target - now)); + now = GetTimeMs(); + + if (bError && now < target) + { + m_controller->AddLog(CEC_LOG_ERROR, "retransmitting previous frame"); + if (!m_communication->Write(data)) + return false; + } + } } return true; @@ -264,7 +283,7 @@ void CCECProcessor::ReportCECVersion(cec_logical_address address /* = CECDEVICE_ cec_frame frame; frame.clear(); - m_controller->AddLog(CEC_LOG_NOTICE, "reporting CEC version as 1.3a"); + m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a"); frame.push_back(GetSourceDestination(address)); frame.push_back((uint8_t) CEC_OPCODE_CEC_VERSION); frame.push_back((uint8_t) CEC_VERSION_1_3A); @@ -277,9 +296,9 @@ void CCECProcessor::ReportPowerState(cec_logical_address address /*= CECDEVICE_T frame.clear(); if (bOn) - m_controller->AddLog(CEC_LOG_NOTICE, "reporting \"On\" power status"); + m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting \"On\" power status"); else - m_controller->AddLog(CEC_LOG_NOTICE, "reporting \"Off\" power status"); + m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting \"Off\" power status"); frame.push_back(GetSourceDestination(address)); frame.push_back((uint8_t) CEC_OPCODE_REPORT_POWER_STATUS); @@ -293,9 +312,9 @@ void CCECProcessor::ReportMenuState(cec_logical_address address /* = CECDEVICE_T frame.clear(); if (bActive) - m_controller->AddLog(CEC_LOG_NOTICE, "reporting menu state as active"); + m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active"); else - m_controller->AddLog(CEC_LOG_NOTICE, "reporting menu state as inactive"); + m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting menu state as inactive"); frame.push_back(GetSourceDestination(address)); frame.push_back((uint8_t) CEC_OPCODE_MENU_STATUS); @@ -305,7 +324,7 @@ void CCECProcessor::ReportMenuState(cec_logical_address address /* = CECDEVICE_T void CCECProcessor::ReportVendorID(cec_logical_address address /* = CECDEVICE_TV */) { - m_controller->AddLog(CEC_LOG_NOTICE, "vendor ID requested, feature abort"); + m_controller->AddLog(CEC_LOG_NOTICE, "<< vendor ID requested, feature abort"); TransmitAbort(address, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID); } @@ -316,7 +335,7 @@ void CCECProcessor::ReportOSDName(cec_logical_address address /* = CECDEVICE_TV const char *osdname = m_strDeviceName.c_str(); CStdString strLog; - strLog.Format("reporting OSD name as %s", osdname); + strLog.Format("<< reporting OSD name as %s", osdname); m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str()); frame.push_back(GetSourceDestination(address)); frame.push_back((uint8_t) CEC_OPCODE_SET_OSD_NAME); @@ -333,7 +352,7 @@ void CCECProcessor::ReportPhysicalAddress(void) frame.clear(); CStdString strLog; - strLog.Format("reporting physical address as %04x", m_physicaladdress); + strLog.Format("<< reporting physical address as %04x", m_physicaladdress); m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str()); frame.push_back(GetSourceDestination(CECDEVICE_BROADCAST)); frame.push_back((uint8_t) CEC_OPCODE_REPORT_PHYSICAL_ADDRESS); @@ -348,7 +367,7 @@ void CCECProcessor::BroadcastActiveSource(void) cec_frame frame; frame.clear(); - m_controller->AddLog(CEC_LOG_NOTICE, "broadcasting active source"); + m_controller->AddLog(CEC_LOG_NOTICE, "<< broadcasting active source"); frame.push_back(GetSourceDestination(CECDEVICE_BROADCAST)); frame.push_back((uint8_t) CEC_OPCODE_ACTIVE_SOURCE); frame.push_back((uint8_t) ((m_physicaladdress >> 8) & 0xFF)); @@ -361,66 +380,69 @@ uint8_t CCECProcessor::GetSourceDestination(cec_logical_address destination /* = return ((uint8_t)m_iLogicalAddress << 4) + (uint8_t)destination; } -bool CCECProcessor::WaitForAck(uint32_t iTimeout /* = 1000 */) +bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */) { bool bGotAck(false); - bool bError(false); + *bError = false; int64_t iNow = GetTimeMs(); int64_t iTargetTime = iNow + (uint64_t) iTimeout; - while (!bGotAck && !bError && (iTimeout == 0 || iNow < iTargetTime)) + while (!bGotAck && !*bError && (iTimeout == 0 || iNow < iTargetTime)) { cec_frame msg; msg.clear(); - while (!bGotAck && !bError && m_communication->Read(msg, iTimeout)) + if (!m_communication->Read(msg, iTimeout > 0 ? iTargetTime - iNow : 1000)) { - uint8_t iCode = msg.data[0] & ~(MSGCODE_FRAME_EOM | MSGCODE_FRAME_ACK); - - switch (iCode) - { - case MSGCODE_COMMAND_ACCEPTED: - m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED"); - break; - case MSGCODE_TRANSMIT_SUCCEEDED: - m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED"); - // TODO - bGotAck = true; - break; - case MSGCODE_RECEIVE_FAILED: - m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED"); - bError = true; - break; - case MSGCODE_COMMAND_REJECTED: - m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED"); - bError = true; - break; - case MSGCODE_TRANSMIT_FAILED_LINE: - m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE"); - bError = true; - break; - case MSGCODE_TRANSMIT_FAILED_ACK: - m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK"); - bError = true; - break; - case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA: - m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA"); - bError = true; - break; - case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE: - m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE"); - bError = true; - break; - default: - m_frameBuffer.Push(msg); - break; - } iNow = GetTimeMs(); + continue; + } + + uint8_t iCode = msg.data[0] & ~(MSGCODE_FRAME_EOM | MSGCODE_FRAME_ACK); + + switch (iCode) + { + case MSGCODE_COMMAND_ACCEPTED: + m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED"); + break; + case MSGCODE_TRANSMIT_SUCCEEDED: + m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED"); + bGotAck = true; + break; + case MSGCODE_RECEIVE_FAILED: + m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED"); + *bError = true; + break; + case MSGCODE_COMMAND_REJECTED: + m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED"); + *bError = true; + break; + case MSGCODE_TRANSMIT_FAILED_LINE: + m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE"); + *bError = true; + break; + case MSGCODE_TRANSMIT_FAILED_ACK: + m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK"); + *bError = true; + break; + case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA: + m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA"); + *bError = true; + break; + case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE: + m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE"); + *bError = true; + break; + default: + m_frameBuffer.Push(msg); + break; } + + iNow = GetTimeMs(); } - return bGotAck && !bError; + return bGotAck && !*bError; } bool CCECProcessor::ParseMessage(cec_frame &msg) @@ -494,13 +516,33 @@ bool CCECProcessor::ParseMessage(cec_frame &msg) return bReturn; } +void CCECProcessor::ParseVendorId(cec_logical_address device, cec_frame data) +{ + if (data.size < 3) + { + m_controller->AddLog(CEC_LOG_WARNING, "invalid vendor ID received"); + return; + } + + uint64_t iVendorId = ((uint64_t)data.data[0] << 3) + + ((uint64_t)data.data[1] << 2) + + (uint64_t)data.data[2]; + + m_vendorIds[(uint8_t)device] = iVendorId; + m_vendorClasses[(uint8_t)device] = data.size >= 4 ? data.data[3] : 0; + + CStdString strLog; + strLog.Format("device %d: vendor = %s (%lld) class = %2x", (uint8_t)device, CECVendorIdToString(m_vendorIds[(uint8_t)device]), iVendorId, m_vendorClasses[(uint8_t)device]); + m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str()); +} + void CCECProcessor::ParseCurrentFrame(cec_frame &frame) { 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); + dataStr.Format(">> received frame: initiator: %u destination: %u", initiator, destination); if (frame.size > 1) { @@ -520,7 +562,6 @@ void CCECProcessor::ParseCurrentFrame(cec_frame &frame) { case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS: ReportPhysicalAddress(); - SetActiveView(); break; case CEC_OPCODE_GIVE_OSD_NAME: ReportOSDName((cec_logical_address)initiator); @@ -528,11 +569,21 @@ void CCECProcessor::ParseCurrentFrame(cec_frame &frame) case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID: ReportVendorID((cec_logical_address)initiator); break; + case CEC_OPCODE_VENDOR_COMMAND_WITH_ID: + frame.shift(2); + ParseVendorId((cec_logical_address)initiator, frame); + TransmitAbort((cec_logical_address)initiator, CEC_OPCODE_VENDOR_COMMAND_WITH_ID); + break; + case CEC_OPCODE_GIVE_DECK_STATUS: + // need to support opcodes play and deck control before doing anything with this + TransmitAbort((cec_logical_address)initiator, CEC_OPCODE_GIVE_DECK_STATUS); + break; case CEC_OPCODE_MENU_REQUEST: ReportMenuState((cec_logical_address)initiator); break; case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS: ReportPowerState((cec_logical_address)initiator); + SetActiveView(); break; case CEC_OPCODE_GET_CEC_VERSION: ReportCECVersion((cec_logical_address)initiator); @@ -550,9 +601,8 @@ void CCECProcessor::ParseCurrentFrame(cec_frame &frame) m_controller->AddKey(); break; default: - cec_frame params = frame; - params.shift(2); - m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, ¶ms); + frame.shift(2); + m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, &frame); break; } } @@ -561,7 +611,7 @@ void CCECProcessor::ParseCurrentFrame(cec_frame &frame) CStdString strLog; if (opCode == CEC_OPCODE_REQUEST_ACTIVE_SOURCE) { - strLog.Format("%i requests active source", initiator); + strLog.Format(">> %i requests active source", initiator); m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str()); BroadcastActiveSource(); } @@ -570,7 +620,7 @@ void CCECProcessor::ParseCurrentFrame(cec_frame &frame) if (frame.size >= 4) { int streamaddr = ((int)frame.data[2] << 8) | ((int)frame.data[3]); - strLog.Format("%i requests stream path from physical address %04x", initiator, streamaddr); + 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) BroadcastActiveSource(); @@ -579,7 +629,7 @@ void CCECProcessor::ParseCurrentFrame(cec_frame &frame) else { cec_frame params = frame; - params.shift(2); + frame.shift(2); m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, ¶ms); } }