X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=c93d8fefff47c3f95417c83adb7c2b4f8a779e2c;hb=55c75e6e4bd3d1c44907b59768b891227bd8ab5a;hp=53d9f6b5bfcf3da9e3e700e37f506c97c32624b5;hpb=a4b8e3f0b62e289ad5e0e6bf58949bbdeed1c623;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 53d9f6b..c93d8fe 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -40,65 +40,126 @@ namespace CEC { class CLibCEC; - struct IAdapterCommunication; + class IAdapterCommunication; class CCECBusDevice; + // a buffer that priotises the input from the TV. + // if we need more than this, we'll have to change it into a priority_queue + class CCECInputBuffer + { + public: + CCECInputBuffer(void) : m_bHasData(false) {} + virtual ~CCECInputBuffer(void) + { + m_condition.Broadcast(); + } + + bool Push(const cec_command &command) + { + bool bReturn(false); + PLATFORM::CLockObject lock(m_mutex); + if (command.initiator == CECDEVICE_TV) + bReturn = m_tvInBuffer.Push(command); + else + bReturn = m_inBuffer.Push(command); + + m_bHasData |= bReturn; + if (m_bHasData) + m_condition.Signal(); + + return bReturn; + } + + bool Pop(cec_command &command, uint16_t iTimeout) + { + bool bReturn(false); + PLATFORM::CLockObject lock(m_mutex); + if (m_tvInBuffer.IsEmpty() && m_inBuffer.IsEmpty() && + !m_condition.Wait(m_mutex, m_bHasData, iTimeout)) + return bReturn; + + if (m_tvInBuffer.Pop(command)) + bReturn = true; + else if (m_inBuffer.Pop(command)) + bReturn = true; + + m_bHasData = !m_tvInBuffer.IsEmpty() || !m_inBuffer.IsEmpty(); + return bReturn; + } + + private: + PLATFORM::CMutex m_mutex; + PLATFORM::CCondition m_condition; + volatile bool m_bHasData; + PLATFORM::SyncedBuffer m_tvInBuffer; + PLATFORM::SyncedBuffer m_inBuffer; + }; + class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback { public: - CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types); + CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress); + CCECProcessor(CLibCEC *controller, libcec_configuration *configuration); virtual ~CCECProcessor(void); - virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); - virtual void *Process(void); - virtual void Close(void); - - virtual bool OnCommandReceived(const cec_command &command); - - virtual bool IsMonitoring(void) const { return m_bMonitor; } - virtual CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false) const; - virtual CCECBusDevice * GetDeviceByType(cec_device_type type) const; - virtual CCECBusDevice * GetPrimaryDevice(void) const; - virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress); - virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); - virtual const std::string & GetDeviceName(void) { return m_strDeviceName; } - virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); - virtual uint64_t GetDeviceVendorId(cec_logical_address iAddress); - virtual cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); - virtual cec_logical_address GetLogicalAddress(void) const { return m_logicalAddresses.primary; } - virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_logicalAddresses; } - virtual cec_logical_addresses GetActiveDevices(void); - virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); - virtual bool HasLogicalAddress(cec_logical_address address) const { return m_logicalAddresses.IsSet(address); } - virtual bool IsPresentDevice(cec_logical_address address); - virtual bool IsPresentDeviceType(cec_device_type type); - virtual uint16_t GetPhysicalAddress(void) const; - virtual uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } - virtual cec_logical_address GetActiveSource(void); - virtual bool IsActiveSource(cec_logical_address iAddress); - virtual bool IsInitialised(void); - virtual bool SetStreamPath(uint16_t iPhysicalAddress); - - virtual bool SetActiveView(void); - virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); - virtual bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); - virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); - virtual bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false); - virtual bool TransmitInactiveSource(void); - virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress); - virtual bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); - virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate = true); - virtual bool SetActiveSource(uint16_t iStreamPath); - virtual bool SwitchMonitoring(bool bEnable); - virtual bool PollDevice(cec_logical_address iAddress); - virtual uint8_t VolumeUp(bool bSendRelease = true); - virtual uint8_t VolumeDown(bool bSendRelease = true); - virtual uint8_t MuteAudio(bool bSendRelease = true); - virtual bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); - virtual bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); - virtual bool EnablePhysicalAddressDetection(void) { return false; }; + bool Start(const char *strPort, uint16_t iBaudRate = CEC_SERIAL_DEFAULT_BAUDRATE, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); + void *Process(void); + void Close(void); + + bool OnCommandReceived(const cec_command &command); + + bool IsMonitoring(void) const { return m_bMonitor; } + CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bSuppressUpdate = true); + CCECBusDevice * GetDeviceByType(cec_device_type type) const; + CCECBusDevice * GetPrimaryDevice(void) const; + cec_version GetDeviceCecVersion(cec_logical_address iAddress); + bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); + CStdString GetDeviceName(void) const; + cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); + uint64_t GetDeviceVendorId(cec_logical_address iAddress); + cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); + cec_logical_address GetLogicalAddress(void) const { return m_configuration.logicalAddresses.primary; } + cec_logical_addresses GetLogicalAddresses(void) const { return m_configuration.logicalAddresses; } + cec_logical_addresses GetActiveDevices(void); + uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); + bool HasLogicalAddress(cec_logical_address address) const { return m_configuration.logicalAddresses.IsSet(address); } + bool IsPresentDevice(cec_logical_address address); + bool IsPresentDeviceType(cec_device_type type); + uint16_t GetPhysicalAddress(void) const; + uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } + cec_logical_address GetActiveSource(bool bRequestActiveSource = true); + bool IsActiveSource(cec_logical_address iAddress); + bool IsInitialised(void); + bool SetStreamPath(uint16_t iPhysicalAddress); + cec_client_version GetClientVersion(void) const { return (cec_client_version)m_configuration.clientVersion; }; + bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); + bool PowerOnDevices(cec_logical_address address = CECDEVICE_BROADCAST); + + bool SetActiveView(void); + bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); + bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); + bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); + bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false); + bool TransmitInactiveSource(void); + bool SetLogicalAddress(cec_logical_address iLogicalAddress); + bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); + bool SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate = true); + bool SetActiveSource(uint16_t iStreamPath); + bool SwitchMonitoring(bool bEnable); + bool PollDevice(cec_logical_address iAddress); + uint8_t VolumeUp(bool bSendRelease = true); + uint8_t VolumeDown(bool bSendRelease = true); + uint8_t MuteAudio(bool bSendRelease = true); + bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); + bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); + bool EnablePhysicalAddressDetection(void); void SetStandardLineTimeout(uint8_t iTimeout); void SetRetryLineTimeout(uint8_t iTimeout); + bool GetCurrentConfiguration(libcec_configuration *configuration); + bool SetConfiguration(const libcec_configuration *configuration); + bool CanPersistConfiguration(void); + bool PersistConfiguration(libcec_configuration *configuration); + void RescanActiveDevices(void); bool SetLineTimeout(uint8_t iTimeout); @@ -113,29 +174,34 @@ namespace CEC const char *ToString(const cec_system_audio_status mode); const char *ToString(const cec_audio_status status); const char *ToString(const cec_vendor_id vendor); + const char *ToString(const cec_client_version version); + const char *ToString(const cec_server_version version); + + bool Transmit(const cec_command &data); + void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); + + bool ChangeDeviceType(cec_device_type from, cec_device_type to); + bool FindLogicalAddresses(void); + bool SetAckMask(uint16_t iMask); - virtual bool Transmit(const cec_command &data); - virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); + bool StartBootloader(const char *strPort = NULL); + bool PingAdapter(void); + void HandlePoll(cec_logical_address initiator, cec_logical_address destination); + bool HandleReceiveFailed(cec_logical_address initiator); - virtual bool ChangeDeviceType(cec_device_type from, cec_device_type to); - virtual bool FindLogicalAddresses(void); - virtual bool SetAckMask(uint16_t iMask); + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); - virtual bool StartBootloader(void); - virtual bool PingAdapter(void); - virtual void HandlePoll(cec_logical_address initiator, cec_logical_address destination); - virtual bool HandleReceiveFailed(cec_logical_address initiator); + bool TransmitPendingActiveSourceCommands(void); CCECBusDevice * m_busDevices[16]; - PLATFORM::CMutex m_transmitMutex; private: - bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs); + bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs, bool bStartListening = true); bool Initialise(void); void SetInitialised(bool bSetTo = true); + void CreateBusDevices(void); void ReplaceHandlers(void); - void ScanCECBus(void); bool PhysicalAddressInUse(uint16_t iPhysicalAddress); bool TryLogicalAddress(cec_logical_address address); bool FindLogicalAddressRecordingDevice(void); @@ -146,35 +212,18 @@ namespace CEC void LogOutput(const cec_command &data); void ParseCommand(const cec_command &command); + bool m_bConnectionOpened; bool m_bInitialised; - uint8_t m_iHDMIPort; - cec_logical_address m_iBaseDevice; - cec_logical_addresses m_logicalAddresses; - std::string m_strDeviceName; - cec_device_type_list m_types; PLATFORM::CMutex m_mutex; IAdapterCommunication * m_communication; CLibCEC* m_controller; bool m_bMonitor; - PLATFORM::SyncedBuffer m_commandBuffer; cec_keypress m_previousKey; PLATFORM::CThread * m_busScan; - uint8_t m_iLineTimeout; uint8_t m_iStandardLineTimeout; uint8_t m_iRetryLineTimeout; uint64_t m_iLastTransmission; - }; - - class CCECBusScan : public PLATFORM::CThread - { - public: - CCECBusScan(CCECProcessor *processor) { m_processor = processor; } - virtual ~CCECBusScan(void) { StopThread(true); } - virtual void *Process(void); - - private: - void WaitUntilIdle(void); - - CCECProcessor *m_processor; + CCECInputBuffer m_inBuffer; + libcec_configuration m_configuration; }; };