rdkcentral · Santhosh-Kumar-infosys · May 27, 2021 · Jul 2, 2021 · Dec 16, 2021 · Feb 14, 2022
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -11,6 +11,9 @@ env:
   THUNDER_REF: "39c82df24c7b4a4a10663cf527a3b289e7c1ceae"
   INTERFACES_REF: "8d3bd0ddd187c6104543699041ec53e1e186d49a"
 
+  # Refs for 22Q4_sprint
+  THUNDER_REF: "a87b48eca1e76c3e6f03d689e6302b1fb090b52c"
+  INTERFACES_REF: "f61d710cc51628819d0fd80b8cc65e55eeec12b4"
 
 jobs:
   unit-tests:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,6 +54,10 @@ if(PLUGIN_DISPLAYSETTINGS)
     add_subdirectory(DisplaySettings)
 endif()
 
+if(PLUGIN_LGIDISPLAYSETTINGS)
+    add_subdirectory(LgiDisplaySettings)
+endif()
+
 if(PLUGIN_REMOTEACTIONMAPPING)
     add_subdirectory(RemoteActionMapping)
 endif()
@@ -74,6 +78,10 @@ if(PLUGIN_SYSTEMSERVICES)
     add_subdirectory(SystemServices)
 endif()
 
+if(PLUGIN_LGISYSTEMSERVICES)
+    add_subdirectory(LgiSystemServices)
+endif()
+
 if(PLUGIN_MAINTENANCEMANAGER)
     add_subdirectory(MaintenanceManager)
 endif()
@@ -82,6 +90,10 @@ if(PLUGIN_HOMENETWORKING)
     add_subdirectory(HomeNetworking)
 endif()
 
+if(PLUGIN_LGINETWORK)
+    add_subdirectory(LgiNetwork)
+endif()
+
 if(PLUGIN_NETWORK)
     add_subdirectory(Network)
 endif()
@@ -171,6 +183,10 @@ if(PLUGIN_HDMICECSINK)
     add_subdirectory(HdmiCecSink)
 endif()
 
+if(PLUGIN_LGIHDMICEC)
+    add_subdirectory(LgiHdmiCec)
+endif()
+
 if(PLUGIN_LOCATIONSYNC)
     add_subdirectory(LocationSync)
 endif()
@@ -303,6 +319,10 @@ if(PLUGIN_TEXTTOSPEECH)
     add_subdirectory(TextToSpeech)
 endif()
 
+if(PLUGIN_LGITEXTTOSPEECH)
+    add_subdirectory(LgiTextToSpeech)
+endif()
+
 if(PLUGIN_SYSTEMAUDIOPLAYER)
     add_subdirectory(SystemAudioPlayer)
 endif()
@@ -331,6 +351,10 @@ if(PLUGIN_WEBBRIDGE)
     add_subdirectory(WebBridge)
 endif()
 
+if(PLUGIN_LGIHDCPPROFILE)
+    add_subdirectory(LgiHdcpProfile)
+endif()
+
 if(PLUGIN_LINEARPLAYBACKCONTROL)
     add_subdirectory(LinearPlaybackControl)
 endif()

diff --git a/DeviceIdentification/Implementation/Broadcom/Broadcom.cpp b/DeviceIdentification/Implementation/Broadcom/Broadcom.cpp
@@ -28,7 +28,7 @@ namespace WPEFramework {
 namespace Plugin {
 
 class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier {
-    static constexpr const TCHAR* PlatformFile = _T("/proc/brcm/platform");
+    static constexpr const TCHAR* PlatformFile = _T("/tmp/device_identification.txt");
 
 public:
     DeviceImplementation()

diff --git a/DeviceInfo/CMakeLists.txt b/DeviceInfo/CMakeLists.txt
@@ -22,6 +22,7 @@ set(PLUGIN_DEVICEINFO_MODE "Off" CACHE STRING "Controls if the plugin should run
 set(PLUGIN_DEVICEINFO_STARTUPORDER "" CACHE STRING "Start-up order for DeviceInfo plugin")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(${NAMESPACE}DSManagerPlugin REQUIRED)
 find_package(${NAMESPACE}Definitions REQUIRED)
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 find_package(RFC)
@@ -57,6 +58,7 @@ target_link_libraries(${MODULE_NAME}
         PRIVATE
         CompileSettingsDebug::CompileSettingsDebug
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+        ${NAMESPACE}DSManagerPlugin::${NAMESPACE}DSManagerPlugin
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions
         ${RFC_LIBRARIES}
         ${DS_LIBRARIES}

diff --git a/DeviceInfo/Implementation/DeviceAudioCapabilities.cpp b/DeviceInfo/Implementation/DeviceAudioCapabilities.cpp
@@ -14,15 +14,6 @@ namespace Plugin {
     DeviceAudioCapabilities::DeviceAudioCapabilities()
     {
         Utils::IARM::init();
-
-        try {
-            device::Manager::Initialize();
-        } catch (const device::Exception& e) {
-            TRACE(Trace::Fatal, (_T("Exception caught %s"), e.what()));
-        } catch (const std::exception& e) {
-            TRACE(Trace::Fatal, (_T("Exception caught %s"), e.what()));
-        } catch (...) {
-        }
     }
 
     uint32_t DeviceAudioCapabilities::SupportedAudioPorts(RPC::IStringIterator*& supportedAudioPorts) const

diff --git a/DeviceInfo/Implementation/DeviceAudioCapabilities.h b/DeviceInfo/Implementation/DeviceAudioCapabilities.h
@@ -7,9 +7,11 @@
 #include <interfaces/IDeviceInfo2.h>
 #endif /* USE_THUNDER_R4 */
 
+#include "dsmanagerplugin/DSManagerPlugin.h"
+
 namespace WPEFramework {
 namespace Plugin {
-    class DeviceAudioCapabilities : public Exchange::IDeviceAudioCapabilities {
+    class DeviceAudioCapabilities : public Exchange::IDeviceAudioCapabilities, public DSManagerPlugin {
     private:
         DeviceAudioCapabilities(const DeviceAudioCapabilities&) = delete;
         DeviceAudioCapabilities& operator=(const DeviceAudioCapabilities&) = delete;

diff --git a/DeviceInfo/Implementation/DeviceVideoCapabilities.cpp b/DeviceInfo/Implementation/DeviceVideoCapabilities.cpp
@@ -15,15 +15,6 @@ namespace Plugin {
     DeviceVideoCapabilities::DeviceVideoCapabilities()
     {
         Utils::IARM::init();
-
-        try {
-            device::Manager::Initialize();
-        } catch (const device::Exception& e) {
-            TRACE(Trace::Fatal, (_T("Exception caught %s"), e.what()));
-        } catch (const std::exception& e) {
-            TRACE(Trace::Fatal, (_T("Exception caught %s"), e.what()));
-        } catch (...) {
-        }
     }
 
     uint32_t DeviceVideoCapabilities::SupportedVideoDisplays(RPC::IStringIterator*& supportedVideoDisplays) const

diff --git a/DeviceInfo/Implementation/DeviceVideoCapabilities.h b/DeviceInfo/Implementation/DeviceVideoCapabilities.h
@@ -7,9 +7,11 @@
 #include <interfaces/IDeviceInfo2.h>
 #endif /* USE_THUNDER_R4 */
 
+#include "dsmanagerplugin/DSManagerPlugin.h"
+
 namespace WPEFramework {
 namespace Plugin {
-    class DeviceVideoCapabilities : public Exchange::IDeviceVideoCapabilities {
+    class DeviceVideoCapabilities : public Exchange::IDeviceVideoCapabilities, public DSManagerPlugin {
     private:
         DeviceVideoCapabilities(const DeviceVideoCapabilities&) = delete;
         DeviceVideoCapabilities& operator=(const DeviceVideoCapabilities&) = delete;

diff --git a/DisplayInfo/CMakeLists.txt b/DisplayInfo/CMakeLists.txt
@@ -33,6 +33,7 @@ set(PLUGIN_DISPLAYINFO_STARTUPORDER "" CACHE STRING "Automatically start Display
 set(PLUGIN_DISPLAYINFO_MODE "Off" CACHE STRING "Set DisplayInfo plugin mode, controls if the plugin should run in its own process, in process or remote.")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(${NAMESPACE}DSManagerPlugin REQUIRED)
 find_package(${NAMESPACE}Definitions REQUIRED)
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 find_package(BCM_HOST QUIET)
@@ -58,6 +59,7 @@ target_link_libraries(${MODULE_NAME}
     PRIVATE
         CompileSettingsDebug::CompileSettingsDebug
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+        ${NAMESPACE}DSManagerPlugin::${NAMESPACE}DSManagerPlugin
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
 if (PLUGIN_DISPLAYINFO_BCM_VERSION_MAJOR)

diff --git a/DisplayInfo/DeviceSettings/PlatformImplementation.cpp b/DisplayInfo/DeviceSettings/PlatformImplementation.cpp
@@ -38,6 +38,7 @@
 #include "libIBus.h"
 #include "libIBusDaemon.h"
 #include "dsMgr.h"
+#include "dsmanagerplugin/DSManagerPlugin.h"
 
 #define EDID_MAX_HORIZONTAL_SIZE 21
 #define EDID_MAX_VERTICAL_SIZE   22
@@ -49,7 +50,8 @@ class DisplayInfoImplementation :
     public Exchange::IGraphicsProperties,
     public Exchange::IConnectionProperties,
     public Exchange::IHDRProperties,
-    public Exchange::IDisplayProperties  {
+    public Exchange::IDisplayProperties,
+    public DSManagerPlugin  {
 private:
     using HdrteratorImplementation = RPC::IteratorType<Exchange::IHDRProperties::IHDRIterator>;
     using ColorimetryIteratorImplementation = RPC::IteratorType<Exchange::IDisplayProperties::IColorimetryIterator>;
@@ -65,12 +67,10 @@ class DisplayInfoImplementation :
             IARM_CHECK( IARM_Bus_RegisterEventHandler(IARM_BUS_DSMGR_NAME,IARM_BUS_DSMGR_EVENT_RES_POSTCHANGE, ResolutionChange) );
 
             //TODO: this is probably per process so we either need to be running in our own process or be carefull no other plugin is calling it
-            device::Manager::Initialize();
-            TRACE(Trace::Information, (_T("device::Manager::Initialize success")));
         }
         catch(...)
         {
-           TRACE(Trace::Error, (_T("device::Manager::Initialize failed")));
+           TRACE(Trace::Error, (_T("Initialize failed")));
         }
     }
 
@@ -216,7 +216,8 @@ class DisplayInfoImplementation :
         if (ret == Core::ERROR_NONE)
         {
             uint32_t edidLen = edidVec.size();
-            unsigned char* edidbytes = new unsigned char [edidLen];
+            std::unique_ptr<unsigned char[]> edidbytes_ {new unsigned char [edidLen]};
+            unsigned char *edidbytes = edidbytes_.get();
             std::copy(edidVec.begin(), edidVec.end(), edidbytes);
             if (edid_parser::EDID_Verify(edidbytes, edidLen) == edid_parser::EDID_STATUS_OK)
             {
@@ -230,7 +231,6 @@ class DisplayInfoImplementation :
                 TRACE(Trace::Information, (_T("EDID Verification failed")));
                 ret = Core::ERROR_GENERAL;
             }
-            delete edidbytes;
         }
         else
         {
@@ -306,24 +306,32 @@ class DisplayInfoImplementation :
 
     uint32_t WidthInCentimeters(uint8_t& width /* @out */) const override
     {
-        int ret = Core::ERROR_NONE;
-        vector<uint8_t> edidVec;
-        ret = GetEdidBytes(edidVec);
-        if (Core::ERROR_NONE == ret)
+        try
         {
             std::string strVideoPort = device::Host::getInstance().getDefaultVideoPortName();
-            if(edidVec.size() > EDID_MAX_VERTICAL_SIZE)
-            {
-                width = edidVec[EDID_MAX_HORIZONTAL_SIZE];
-                TRACE(Trace::Information, (_T("Width in cm = %d"), width));
-            }
-            else
+            ::device::VideoOutputPort vPort = ::device::Host::getInstance().getVideoOutputPort(strVideoPort.c_str());
+            if (vPort.isDisplayConnected())
             {
-                TRACE(Trace::Information, (_T("Failed to get Display Size!")));
-                ret = Core::ERROR_GENERAL;
+                std::vector<uint8_t> edidVec;
+
+                vPort.getDisplay().getEDIDBytes(edidVec);
+
+                if(edidVec.size() > EDID_MAX_HORIZONTAL_SIZE)
+                {
+                    width = edidVec[EDID_MAX_HORIZONTAL_SIZE];
+                    TRACE(Trace::Information, (_T("Width in cm = %d"), width));
+                }
+                else
+                {
+                    TRACE(Trace::Information, (_T("Failed to get Display Size!")));
+                }
             }
         }
-        return ret;
+        catch (const device::Exception& err)
+        {
+            TRACE(Trace::Error, (_T("Exception during DeviceSetting library call. code = %d message = %s"), err.getCode(), err.what()));
+        }
+        return (Core::ERROR_NONE);
     }
 
     uint32_t HeightInCentimeters(uint8_t& height /* @out */) const override
@@ -582,7 +590,8 @@ class DisplayInfoImplementation :
         if (ret == Core::ERROR_NONE)
         {
             uint32_t edidLen = edidVec.size();
-            unsigned char* edidbytes = new unsigned char [edidLen];
+            std::unique_ptr<unsigned char[]> edidbytes_ {new unsigned char [edidLen]};
+            unsigned char *edidbytes = edidbytes_.get();
             std::copy(edidVec.begin(), edidVec.end(), edidbytes);
             if (edid_parser::EDID_Verify(edidbytes, edidLen) == edid_parser::EDID_STATUS_OK)
             {
@@ -605,7 +614,6 @@ class DisplayInfoImplementation :
                 TRACE(Trace::Error, (_T("EDID Verification failed")));
                 ret = Core::ERROR_GENERAL;
             }
-            delete edidbytes;
         }
         else
         {

diff --git a/DisplayInfo/DisplayInfo.h b/DisplayInfo/DisplayInfo.h
@@ -65,7 +65,6 @@ namespace Plugin {
 
         private:
             DisplayInfo& _parent;
-            Exchange::IConnectionProperties* _client;
         };
 
     public:

diff --git a/DisplaySettings/CMakeLists.txt b/DisplaySettings/CMakeLists.txt
@@ -22,6 +22,8 @@ set(PLUGIN_DISPLAYSETTINGS_AUTOSTART "false" CACHE STRING "Automatically start D
 set(PLUGIN_DISPLAYSETTINGS_STARTUPORDER "" CACHE STRING "To configure startup order of DisplaySettings plugin")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(${NAMESPACE}DSManagerPlugin REQUIRED)
+
 
 add_library(${MODULE_NAME} SHARED
         DisplaySettings.cpp
@@ -41,7 +43,7 @@ if (DS_FOUND)
     add_definitions(-DDS_FOUND)
     target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS})
     target_include_directories(${MODULE_NAME} PRIVATE ${DS_INCLUDE_DIRS})
-    target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${DS_LIBRARIES} "-ltr181api")
+    target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${DS_LIBRARIES} "-ltr181api" ${NAMESPACE}DSManagerPlugin::${NAMESPACE}DSManagerPlugin)
 else (DS_FOUND)
     target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 endif(DS_FOUND)
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,6 @@ namespace Plugin { @@
             private:
                 DisplayInfo& _parent;
-                Exchange::IConnectionProperties* _client;
             };
         public:
@@ Expand Down @@