X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=565d226493e08c96a316338180332befaa4aa5f4;hb=37b0c5724f06a98e14686695b5089f66ac657f11;hp=11065ebfec6e5b6bb7198986825db3f93d8c9bd9;hpb=ef79edcce663c6156731ad73d63acbe0c6be85b9;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 11065eb..565d226 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(); @@ -151,10 +152,12 @@ bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, } lock.Leave(); - if (SetAckMask(m_logicalAddresses.AckMask()) && - SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) + + m_busDevices[CECDEVICE_TV]->GetVendorId(); + + if (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; @@ -173,12 +176,6 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address) { if (m_busDevices[address]->TryLogicalAddress()) { - /* only set our OSD name and active source for the primary device */ - if (m_logicalAddresses.IsEmpty()) - { - m_busDevices[address]->m_strDeviceName = m_strDeviceName; - m_busDevices[address]->m_bActiveSource = true; - } m_logicalAddresses.Set(address); return true; } @@ -259,7 +256,12 @@ void *CCECProcessor::Process(void) } else { - m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress(); + /* only set our OSD name and active source for the primary device */ + m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName; + m_busDevices[m_logicalAddresses.primary]->m_bActiveSource = true; + + SetAckMask(m_logicalAddresses.AckMask()); + CLockObject lock(&m_mutex); m_bStarted = true; m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); @@ -293,6 +295,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 +319,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,9 +329,8 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE } } - bReturn = m_busDevices[CECDEVICE_TV]->PowerOn() && - m_busDevices[addr]->TransmitActiveSource() && - SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false)); + m_busDevices[addr]->SetActiveSource(); + bReturn = m_busDevices[addr]->TransmitActiveSource(); if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)) @@ -333,9 +341,30 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE return bReturn; } -bool CCECProcessor::SetActiveSource(cec_logical_address iAddress) +bool CCECProcessor::SetActiveSource(uint16_t iStreamPath) { - return SetStreamPath(m_busDevices[iAddress]->GetPhysicalAddress(false)); + bool bReturn(false); + + CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath); + if (device) + { + device->SetActiveSource(); + bReturn = true; + } + + return bReturn; +} + +void CCECProcessor::SetStandardLineTimeout(uint8_t iTimeout) +{ + CLockObject lock(&m_mutex); + m_iStandardLineTimeout = iTimeout; +} + +void CCECProcessor::SetRetryLineTimeout(uint8_t iTimeout) +{ + CLockObject lock(&m_mutex); + m_iRetryLineTimeout = iTimeout; } bool CCECProcessor::SetActiveView(void) @@ -379,44 +408,54 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, { bool bReturn(false); - CStdString strLog; - strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice); - AddLog(CEC_LOG_DEBUG, strLog); - m_iBaseDevice = iBaseDevice; m_iHDMIPort = iPort; if (!m_bStarted && !bForce) return true; + CStdString strLog; + strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice); + AddLog(CEC_LOG_DEBUG, strLog); + uint16_t iPhysicalAddress(0); - iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress(); - uint16_t iPos = 0; - if (iPhysicalAddress == 0) - iPos = 0x1000; - else if (iPhysicalAddress % 0x1000 == 0) - iPos = 0x100; - else if (iPhysicalAddress % 0x100 == 0) - iPos = 0x10; - else if (iPhysicalAddress % 0x10 == 0) - iPos = 0x1; - - while(!bReturn && iPos > 0) + if (iBaseDevice > CECDEVICE_TV) + iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress(); + + if (iPhysicalAddress == 0xffff) { - iPhysicalAddress += (uint16_t)(iPort * iPos); - strLog.Format("checking physical address %4x", iPhysicalAddress); - AddLog(CEC_LOG_DEBUG, strLog); - if (PhysicalAddressInUse(iPhysicalAddress)) - { - strLog.Format("physical address %4x is in use", iPhysicalAddress); - AddLog(CEC_LOG_DEBUG, strLog); - iPos = (iPos == 1) ? 0 : iPos / 0x10; - } - else + SetPhysicalAddress((uint16_t)iPort * 0x1000); + bReturn = false; + } + else + { + uint16_t iPos = 0; + if (iPhysicalAddress == 0) + iPos = 0x1000; + else if (iPhysicalAddress % 0x1000 == 0) + iPos = 0x100; + else if (iPhysicalAddress % 0x100 == 0) + iPos = 0x10; + else if (iPhysicalAddress % 0x10 == 0) + iPos = 0x1; + + while(!bReturn && iPos > 0) { - strLog.Format("physical address %4x is free", iPhysicalAddress); + iPhysicalAddress += (uint16_t)(iPort * iPos); + strLog.Format("checking physical address %4x", iPhysicalAddress); AddLog(CEC_LOG_DEBUG, strLog); - SetPhysicalAddress(iPhysicalAddress); - bReturn = true; + if (PhysicalAddressInUse(iPhysicalAddress)) + { + strLog.Format("physical address %4x is in use", iPhysicalAddress); + AddLog(CEC_LOG_DEBUG, strLog); + iPos = (iPos == 1) ? 0 : iPos / 0x10; + } + else + { + strLog.Format("physical address %4x is free", iPhysicalAddress); + AddLog(CEC_LOG_DEBUG, strLog); + SetPhysicalAddress(iPhysicalAddress); + bReturn = true; + } } } @@ -433,20 +472,6 @@ bool CCECProcessor::PhysicalAddressInUse(uint16_t iPhysicalAddress) return false; } -bool CCECProcessor::SetStreamPath(uint16_t iStreamPath) -{ - bool bReturn(false); - - CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath); - if (device) - { - device->SetActiveDevice(); - bReturn = true; - } - - return bReturn; -} - bool CCECProcessor::TransmitInactiveSource(void) { if (!IsRunning()) @@ -504,7 +529,11 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress) { for (uint8_t iPtr = 0; iPtr < 15; iPtr++) if (m_logicalAddresses[iPtr]) + { + m_busDevices[iPtr]->SetInactiveDevice(); m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress); + m_busDevices[iPtr]->TransmitPhysicalAddress(); + } return SetActiveView(); } return false; @@ -520,7 +549,7 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable) CLockObject lock(&m_mutex); m_bMonitor = bEnable; - if (bEnable) + if (!bEnable) { if (!m_busScan) { @@ -556,29 +585,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); + if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM)) + 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); + if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM)) + 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); + if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM)) + status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(); return status; } @@ -650,6 +679,13 @@ uint64_t CCECProcessor::GetDeviceVendorId(cec_logical_address iAddress) return false; } +uint16_t CCECProcessor::GetDevicePhysicalAddress(cec_logical_address iAddress) +{ + if (m_busDevices[iAddress]) + return m_busDevices[iAddress]->GetPhysicalAddress(false); + return false; +} + cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress) { if (m_busDevices[iAddress]) @@ -657,15 +693,43 @@ cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddres return CEC_POWER_STATUS_UNKNOWN; } +cec_logical_address CCECProcessor::GetActiveSource(void) +{ + for (uint8_t iPtr = 0; iPtr <= 11; iPtr++) + { + if (m_busDevices[iPtr]->IsActiveSource()) + return (cec_logical_address)iPtr; + } + + return CECDEVICE_UNKNOWN; +} + +bool CCECProcessor::IsActiveSource(cec_logical_address iAddress) +{ + return m_busDevices[iAddress]->IsActiveSource(); +} + bool CCECProcessor::Transmit(const cec_command &data) { bool bReturn(false); LogOutput(data); CCECAdapterMessage *output = new CCECAdapterMessage(data); + + /* set the number of retries */ + if (data.opcode == CEC_OPCODE_NONE) + output->maxTries = 1; + else if (data.initiator != CECDEVICE_BROADCAST) + output->maxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1; + 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 +738,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 +767,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 +876,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); @@ -865,12 +931,12 @@ cec_logical_addresses CCECProcessor::GetActiveDevices(void) return addresses; } -bool CCECProcessor::IsActiveDevice(cec_logical_address address) +bool CCECProcessor::IsPresentDevice(cec_logical_address address) { return m_busDevices[address]->GetStatus() == CEC_DEVICE_STATUS_PRESENT; } -bool CCECProcessor::IsActiveDeviceType(cec_device_type type) +bool CCECProcessor::IsPresentDeviceType(cec_device_type type) { for (unsigned int iPtr = 0; iPtr < 15; iPtr++) { @@ -936,14 +1002,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 +1336,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 < 10) { - 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; + + int32_t iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission()); + while (iWaitTime > 0) + { + Sleep(iWaitTime); + iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission()); + } +} + bool CCECProcessor::StartBootloader(void) { return m_communication->StartBootloader();