X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=1daa7b60d2d8d421f879fa9b530ce07039725b1f;hb=0ecbcd4dd338a4e0e7dcf0400274cebf6744ff4e;hp=11065ebfec6e5b6bb7198986825db3f93d8c9bd9;hpb=ef79edcce663c6156731ad73d63acbe0c6be85b9;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 11065eb..1daa7b6 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -55,7 +55,10 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec m_strDeviceName(strDeviceName), m_controller(controller), m_bMonitor(false), - m_busScan(NULL) + m_busScan(NULL), + m_iStandardLineTimeout(3), + m_iRetryLineTimeout(3), + m_iLastTransmission(0) { m_communication = new CAdapterCommunication(this); m_logicalAddresses.Clear(); @@ -72,7 +75,10 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con m_strDeviceName(strDeviceName), m_types(types), m_controller(controller), - m_bMonitor(false) + m_bMonitor(false), + m_iStandardLineTimeout(3), + m_iRetryLineTimeout(3), + m_iLastTransmission(0) { m_communication = new CAdapterCommunication(this); m_logicalAddresses.Clear(); @@ -111,12 +117,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con CCECProcessor::~CCECProcessor(void) { - if (m_busScan) - { - m_busScan->StopThread(); - delete m_busScan; - } - + m_bStarted = false; m_startCondition.Broadcast(); StopThread(); @@ -154,7 +155,7 @@ bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, if (SetAckMask(m_logicalAddresses.AckMask()) && SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) { - m_controller->AddLog(CEC_LOG_ERROR, "processor thread started"); + m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); m_busScan = new CCECBusScan(this); m_busScan->CreateThread(true); return true; @@ -259,7 +260,9 @@ void *CCECProcessor::Process(void) } else { - m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress(); + m_busDevices[CECDEVICE_TV]->GetVendorId(); + m_busDevices[m_logicalAddresses.primary]->TransmitVendorID(CECDEVICE_TV, false); + CLockObject lock(&m_mutex); m_bStarted = true; m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); @@ -293,6 +296,13 @@ void *CCECProcessor::Process(void) m_controller->CheckKeypressTimeout(); } + if (m_busScan) + { + m_busScan->StopThread(); + delete m_busScan; + m_busScan = NULL; + } + if (m_communication) m_communication->Close(); @@ -310,7 +320,7 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE if (type != CEC_DEVICE_TYPE_RESERVED) { - for (uint8_t iPtr = 0; iPtr < 16; iPtr++) + for (uint8_t iPtr = 0; iPtr <= 11; iPtr++) { if (m_logicalAddresses[iPtr] && m_busDevices[iPtr]->m_type == type) { @@ -320,8 +330,7 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE } } - bReturn = m_busDevices[CECDEVICE_TV]->PowerOn() && - m_busDevices[addr]->TransmitActiveSource() && + bReturn = m_busDevices[addr]->TransmitActiveSource() && SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false)); if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || @@ -333,9 +342,16 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE return bReturn; } -bool CCECProcessor::SetActiveSource(cec_logical_address iAddress) +void CCECProcessor::SetStandardLineTimeout(uint8_t iTimeout) +{ + CLockObject lock(&m_mutex); + m_iStandardLineTimeout = iTimeout; +} + +void CCECProcessor::SetRetryLineTimeout(uint8_t iTimeout) { - return SetStreamPath(m_busDevices[iAddress]->GetPhysicalAddress(false)); + CLockObject lock(&m_mutex); + m_iRetryLineTimeout = iTimeout; } bool CCECProcessor::SetActiveView(void) @@ -504,7 +520,10 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress) { for (uint8_t iPtr = 0; iPtr < 15; iPtr++) if (m_logicalAddresses[iPtr]) + { m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress); + m_busDevices[iPtr]->TransmitPhysicalAddress(); + } return SetActiveView(); } return false; @@ -520,7 +539,7 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable) CLockObject lock(&m_mutex); m_bMonitor = bEnable; - if (bEnable) + if (!bEnable) { if (!m_busScan) { @@ -556,29 +575,29 @@ bool CCECProcessor::PollDevice(cec_logical_address iAddress) return false; } -uint8_t CCECProcessor::VolumeUp(bool bWait /* = true */) +uint8_t CCECProcessor::VolumeUp(void) { uint8_t status = 0; if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM)) - status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(bWait); + status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(); return status; } -uint8_t CCECProcessor::VolumeDown(bool bWait /* = true */) +uint8_t CCECProcessor::VolumeDown(void) { uint8_t status = 0; if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM)) - status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(bWait); + status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(); return status; } -uint8_t CCECProcessor::MuteAudio(bool bWait /* = true */) +uint8_t CCECProcessor::MuteAudio(void) { uint8_t status = 0; if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM)) - status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(bWait); + status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(); return status; } @@ -664,8 +683,13 @@ bool CCECProcessor::Transmit(const cec_command &data) CCECAdapterMessage *output = new CCECAdapterMessage(data); bReturn = Transmit(output); - delete output; + /* set to "not present" on failed ack */ + if (output->is_error() && output->reply == MSGCODE_TRANSMIT_FAILED_ACK && + output->destination() != CECDEVICE_BROADCAST) + m_busDevices[output->destination()]->SetDeviceStatus(CEC_DEVICE_STATUS_NOT_PRESENT); + + delete output; return bReturn; } @@ -674,12 +698,14 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output) bool bReturn(false); CLockObject lock(&m_mutex); { - m_communication->SetLineTimeout(3); + m_iLastTransmission = GetTimeMs(); + m_communication->SetLineTimeout(m_iStandardLineTimeout); + output->tries = 1; do { if (output->tries > 0) - m_communication->SetLineTimeout(5); + m_communication->SetLineTimeout(m_iRetryLineTimeout); CLockObject msgLock(&output->mutex); if (!m_communication || !m_communication->Write(output)) @@ -701,10 +727,10 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output) } else bReturn = true; - }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries <= output->maxTries); + }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries < output->maxTries); } - m_communication->SetLineTimeout(3); + m_communication->SetLineTimeout(m_iStandardLineTimeout); return bReturn; } @@ -810,7 +836,7 @@ bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg) m_currentframe.ack = msg.ack(); m_currentframe.eom = msg.eom(); } - if (m_currentframe.ack == true) + if (m_currentframe.ack == 0x1) { m_lastInitiator = m_currentframe.initiator; m_busDevices[m_lastInitiator]->GetHandler()->HandlePoll(m_currentframe.initiator, m_currentframe.destination); @@ -936,14 +962,14 @@ bool CCECProcessor::SetAckMask(uint16_t iMask) return bReturn; } -bool CCECProcessor::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = false */) +bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key) { - return m_busDevices[iDestination]->SendKeypress(key, bWait); + return m_busDevices[iDestination]->TransmitKeypress(key); } -bool CCECProcessor::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = false */) +bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination) { - return m_busDevices[iDestination]->SendKeyRelease(bWait); + return m_busDevices[iDestination]->TransmitKeyRelease(); } const char *CCECProcessor::ToString(const cec_menu_state state) @@ -1270,30 +1296,48 @@ const char *CCECProcessor::ToString(const cec_vendor_id vendor) void *CCECBusScan::Process(void) { CCECBusDevice *device(NULL); - int iCount(0); + uint8_t iCounter(0); + while (!IsStopped()) { - if (iCount == 0) + if (++iCounter < 30) { - for (unsigned int iPtr = 0; iPtr < 15 && !IsStopped(); iPtr++) + Sleep(1000); + continue; + } + for (unsigned int iPtr = 0; iPtr <= 11 && !IsStopped(); iPtr++) + { + device = m_processor->m_busDevices[iPtr]; + WaitUntilIdle(); + if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT) { - device = m_processor->m_busDevices[iPtr]; - if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT) - { - if (!IsStopped()) - device->GetVendorId(); - Sleep(5); - } + WaitUntilIdle(); + if (!IsStopped()) + device->GetVendorId(); + + WaitUntilIdle(); + if (!IsStopped()) + device->GetPowerStatus(true); } } - - if (++iCount > 60) - iCount = 0; - Sleep(1000); } + return NULL; } +void CCECBusScan::WaitUntilIdle(void) +{ + if (IsStopped()) + return; + + int64_t iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + while (iWaitTime > 0) + { + Sleep(iWaitTime); + iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + } +} + bool CCECProcessor::StartBootloader(void) { return m_communication->StartBootloader();