X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2FCECProcessor.cpp;h=2e53d6b9271742e3cf41140adea44b99f4653743;hb=e36035adeeab088655508cf6c2aa492e8eea7cc3;hp=ae7d5fd16b93c1b7ecab70f2b8c784b8234f46b5;hpb=78e8010a91b23bd33c547937870d3240c641815f;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index ae7d5fd..2e53d6b 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -41,11 +41,12 @@ 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_physicaladdress(iPhysicalAddress),
+    m_iPhysicalAddress(iPhysicalAddress),
     m_iLogicalAddress(iLogicalAddress),
     m_strDeviceName(strDeviceName),
     m_communication(serComm),
-    m_controller(controller)
+    m_controller(controller),
+    m_bMonitor(false)
 {
   for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
     m_vendorIds[iPtr] = CEC_VENDOR_UNKNOWN;
@@ -158,8 +159,8 @@ bool CCECProcessor::SetActiveView(void)
 
   cec_command command;
   cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
-  command.parameters.push_back((m_physicaladdress >> 8) & 0xFF);
-  command.parameters.push_back(m_physicaladdress & 0xFF);
+  command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
+  command.parameters.push_back(m_iPhysicalAddress & 0xFF);
 
   return Transmit(command);
 }
@@ -173,8 +174,8 @@ bool CCECProcessor::SetInactiveView(void)
 
   cec_command command;
   cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
-  command.parameters.push_back((m_physicaladdress >> 8) & 0xFF);
-  command.parameters.push_back(m_physicaladdress & 0xFF);
+  command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
+  command.parameters.push_back(m_iPhysicalAddress & 0xFF);
 
   return Transmit(command);
 }
@@ -183,10 +184,10 @@ void CCECProcessor::LogOutput(const cec_command &data)
 {
   CStdString txStr = "transmit ";
   txStr.AppendFormat(" %02x", ((uint8_t)data.initiator << 4) + (uint8_t)data.destination);
-  txStr.AppendFormat(" %02x", (uint8_t)data.opcode);
+  txStr.AppendFormat(":%02x", (uint8_t)data.opcode);
 
   for (uint8_t iPtr = 0; iPtr < data.parameters.size; iPtr++)
-    txStr.AppendFormat(" %02x", data.parameters[iPtr]);
+    txStr.AppendFormat(":%02x", data.parameters[iPtr]);
   m_controller->AddLog(CEC_LOG_DEBUG, txStr.c_str());
 }
 
@@ -204,13 +205,52 @@ bool CCECProcessor::Transmit(const cec_command &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 %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);
 }
 
+bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
+{
+  CStdString strLog;
+  strLog.Format("<< setting physical address to %2x", iPhysicalAddress);
+  m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+
+  m_iPhysicalAddress = iPhysicalAddress;
+  return SetActiveView();
+}
+
+bool CCECProcessor::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
+{
+  CStdString strLog;
+  strLog.Format("<< display message '%s'", strMessage);
+  m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+
+  cec_command command;
+  cec_command::format(command, m_iLogicalAddress, iLogicalAddress, CEC_OPCODE_SET_OSD_STRING);
+  command.parameters.push_back((uint8_t)duration);
+
+  for (unsigned int iPtr = 0; iPtr < strlen(strMessage); iPtr++)
+    command.parameters.push_back(strMessage[iPtr]);
+
+  return Transmit(command);
+}
+
+bool CCECProcessor::SwitchMonitoring(bool bEnable)
+{
+  CStdString strLog;
+  strLog.Format("== %s monitoring mode ==", bEnable ? "enabling" : "disabling");
+  m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+
+  m_bMonitor = bEnable;
+  if (bEnable)
+    return m_communication && m_communication->SetAckMask(0);
+  else
+    return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+}
+
 bool CCECProcessor::TransmitFormatted(const cec_adapter_message &data, bool bWaitForAck /* = true */)
 {
   CLockObject lock(&m_mutex);
@@ -316,13 +356,13 @@ void CCECProcessor::ReportOSDName(cec_logical_address address /* = CECDEVICE_TV
 void CCECProcessor::ReportPhysicalAddress(void)
 {
   CStdString strLog;
-  strLog.Format("<< reporting physical address as %04x", m_physicaladdress);
+  strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress);
   m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
   cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
-  command.parameters.push_back((uint8_t) ((m_physicaladdress >> 8) & 0xFF));
-  command.parameters.push_back((uint8_t) (m_physicaladdress & 0xFF));
+  command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+  command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
   command.parameters.push_back((uint8_t) (CEC_DEVICE_TYPE_PLAYBACK_DEVICE));
 
   Transmit(command);
@@ -334,8 +374,8 @@ void CCECProcessor::BroadcastActiveSource(void)
 
   cec_command command;
   cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
-  command.parameters.push_back((uint8_t) ((m_physicaladdress >> 8) & 0xFF));
-  command.parameters.push_back((uint8_t) (m_physicaladdress & 0xFF));
+  command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+  command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
 
   Transmit(command);
 }
@@ -497,21 +537,100 @@ void CCECProcessor::ParseVendorId(cec_logical_address device, const cec_datapack
   m_vendorClasses[(uint8_t)device] = data.size >= 4 ? 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]);
+  strLog.Format("device %d: vendor = %s (%04x) 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::ParseCommand(cec_command &command)
+bool CCECProcessor::HandleANCommand(cec_command &command)
 {
-  CStdString dataStr;
-  dataStr.Format(">> received frame: initiator: %u destination: %u", command.initiator, command.destination);
-  if (command.parameters.size > 1)
+  bool bHandled(true);
+  if (command.destination == m_iLogicalAddress)
   {
-    dataStr += " data:";
-    for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
-      dataStr.AppendFormat(" %02x", (unsigned int)command.parameters[iPtr]);
+    switch(command.opcode)
+    {
+    case CEC_OPCODE_VENDOR_REMOTE_BUTTON_DOWN:
+      if (command.parameters.size > 0)
+      {
+        m_controller->AddKey();
+
+        uint8_t iButton = 0;
+        switch (command.parameters[0])
+        {
+        case CEC_AN_USER_CONTROL_CODE_RETURN:
+          iButton = CEC_USER_CONTROL_CODE_PREVIOUS_CHANNEL;
+          break;
+        default:
+          break;
+        }
+
+        if (iButton > 0 && iButton <= CEC_USER_CONTROL_CODE_MAX)
+        {
+          CStdString strLog;
+          strLog.Format("key pressed: %1x", iButton);
+          m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+          m_controller->SetCurrentButton((cec_user_control_code) command.parameters[0]);
+        }
+      }
+      break;
+    case CEC_OPCODE_VENDOR_REMOTE_BUTTON_UP:
+      m_controller->AddKey();
+      break;
+    default:
+      bHandled = false;
+      break;
+    }
   }
-  m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str());
+  else if (command.destination == CECDEVICE_BROADCAST)
+  {
+    switch(command.opcode)
+    {
+    // TODO
+    default:
+      bHandled = false;
+      break;
+    }
+  }
+
+  if (!bHandled)
+    bHandled = HandleCecCommand(command);
+
+  return bHandled;
+}
+
+bool CCECProcessor::HandleSLCommand(cec_command &command)
+{
+  bool bHandled(true);
+  if (command.destination == m_iLogicalAddress)
+  {
+    switch(command.opcode)
+    {
+    // TODO
+    default:
+      bHandled = false;
+      break;
+    }
+  }
+  else if (command.destination == CECDEVICE_BROADCAST)
+  {
+    switch(command.opcode)
+    {
+    // TODO
+    default:
+      bHandled = false;
+      break;
+    }
+  }
+
+  if (!bHandled)
+    bHandled = HandleCecCommand(command);
+
+  return bHandled;
+}
+
+bool CCECProcessor::HandleCecCommand(cec_command &command)
+{
+  bool bHandled(true);
 
   if (command.destination == m_iLogicalAddress)
   {
@@ -526,9 +645,11 @@ void CCECProcessor::ParseCommand(cec_command &command)
     case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
       ReportVendorID(command.initiator);
       break;
+    case CEC_OPCODE_DEVICE_VENDOR_ID:
+      ParseVendorId(command.initiator, command.parameters);
+      break;
     case CEC_OPCODE_VENDOR_COMMAND_WITH_ID:
       ParseVendorId(command.initiator, command.parameters);
-      TransmitAbort(command.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
@@ -550,43 +671,59 @@ void CCECProcessor::ParseCommand(cec_command &command)
         m_controller->AddKey();
 
         if (command.parameters[0] <= CEC_USER_CONTROL_CODE_MAX)
+        {
+          CStdString strLog;
+          strLog.Format("key pressed: %1x", command.parameters[0]);
+          m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
           m_controller->SetCurrentButton((cec_user_control_code) command.parameters[0]);
+        }
       }
       break;
     case CEC_OPCODE_USER_CONTROL_RELEASE:
       m_controller->AddKey();
       break;
-    case CEC_OPCODE_ROUTING_CHANGE:
-      m_controller->SetActiveView();
-      break;
     default:
       m_controller->AddCommand(command);
+      bHandled = false;
       break;
     }
   }
   else if (command.destination == CECDEVICE_BROADCAST)
   {
     CStdString strLog;
-    if (command.opcode == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
+    switch (command.opcode)
     {
+    case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
       strLog.Format(">> %i requests active source", (uint8_t) command.initiator);
       m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
       BroadcastActiveSource();
-    }
-    else if (command.opcode == CEC_OPCODE_SET_STREAM_PATH)
-    {
+      break;
+    case CEC_OPCODE_SET_STREAM_PATH:
       if (command.parameters.size >= 2)
       {
-        int streamaddr = ((int)command.parameters[0] << 8) | ((int)command.parameters[1]);
+        int streamaddr = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
         strLog.Format(">> %i requests stream path from physical address %04x", command.initiator, streamaddr);
         m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-        if (streamaddr == m_physicaladdress)
+        if (streamaddr == m_iPhysicalAddress)
           BroadcastActiveSource();
       }
-    }
-    else
-    {
+      break;
+    case CEC_OPCODE_ROUTING_CHANGE:
+      if (command.parameters.size == 4)
+      {
+        uint16_t iOldAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
+        uint16_t iNewAddress = ((uint16_t)command.parameters[2] << 8) | ((uint16_t)command.parameters[3]);
+        strLog.Format(">> %i changed physical address from %04x to %04x", command.initiator, iOldAddress, iNewAddress);
+        m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+        m_controller->AddCommand(command);
+      }
+      break;
+    default:
       m_controller->AddCommand(command);
+      bHandled = false;
+      break;
     }
   }
   else
@@ -594,6 +731,34 @@ void CCECProcessor::ParseCommand(cec_command &command)
     CStdString strLog;
     strLog.Format("ignoring frame: destination: %u != %u", command.destination, (uint8_t)m_iLogicalAddress);
     m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+    bHandled = false;
+  }
+
+  return bHandled;
+}
+
+void CCECProcessor::ParseCommand(cec_command &command)
+{
+  CStdString dataStr;
+  dataStr.Format(">> received frame: %1x%1x:%02x", command.initiator, command.destination, command.opcode);
+  for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+    dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
+  m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str());
+
+  if (!m_bMonitor)
+  {
+    switch(m_vendorIds[command.initiator])
+    {
+    case CEC_VENDOR_LG:
+      HandleSLCommand(command);
+      break;
+    case CEC_VENDOR_SAMSUNG:
+      HandleANCommand(command);
+      break;
+    default:
+      HandleCecCommand(command);
+      break;
+    }
   }
 }
 
@@ -603,6 +768,8 @@ const char *CCECProcessor::CECVendorIdToString(const uint64_t iVendorId)
   {
   case CEC_VENDOR_SAMSUNG:
     return "Samsung";
+  case CEC_VENDOR_LG:
+      return "LG";
   default:
     return "Unknown";
   }