RDKEMW-6331 : Fix HdmiCecSink COM-RPC issues

.github/workflows/L1-tests.yml

@@ -462,8 +462,8 @@ jobs:
           -DRDK_SERVICES_L1_TEST=ON
           -DPLUGIN_AVINPUT=ON
           -DPLUGIN_HDCPPROFILE=ON
-          -DPLUGIN_HDMICECSOURCE=ON
-          -DPLUGIN_HDMICECSINK=ON
+          -DPLUGIN_HDMICECSOURCE=OFF
+          -DPLUGIN_HDMICECSINK=OFF
           -DUSE_THUNDER_R4=ON
           -DHIDE_NON_EXTERNAL_SYMBOLS=OFF
           &&
@@ -540,8 +540,8 @@ jobs:
           -DDS_FOUND=ON
           -DPLUGIN_AVINPUT=ON
           -DPLUGIN_HDCPPROFILE=ON
-          -DPLUGIN_HDMICECSOURCE=ON
-          -DPLUGIN_HDMICECSINK=ON
+          -DPLUGIN_HDMICECSOURCE=OFF
+          -DPLUGIN_HDMICECSINK=OFF
           -DRDK_SERVICES_L1_TEST=ON
           -DUSE_THUNDER_R4=ON
           -DHIDE_NON_EXTERNAL_SYMBOLS=OFF

HdmiCecSink/CMakeLists.txt

@@ -16,6 +16,7 @@
 # limitations under the License.
 set(PLUGIN_NAME HdmiCecSink)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
+set(PLUGIN_IMPLEMENTATION ${MODULE_NAME}Implementation)
 
 
 set(PLUGIN_HDMICECSINK_STARTUPORDER "" CACHE STRING "To configure startup order of HdmiCecSink plugin")
@@ -26,10 +27,18 @@ add_library(${MODULE_NAME} SHARED
         HdmiCecSink.cpp
         Module.cpp)
 
+add_library(${PLUGIN_IMPLEMENTATION} SHARED
+        HdmiCecSinkImplementation.cpp
+        Module.cpp)
+
 set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
+        CXX_STANDARD 11
+        CXX_STANDARD_REQUIRED YES)
+
 target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
 
 find_package(DS)
@@ -41,13 +50,23 @@ target_include_directories(${MODULE_NAME} PRIVATE ${CEC_INCLUDE_DIRS})
 target_include_directories(${MODULE_NAME} PRIVATE ${DS_INCLUDE_DIRS})
 set_source_files_properties(HdmiCecSink.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
 
+
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${CEC_INCLUDE_DIRS})
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${DS_INCLUDE_DIRS})
+set_source_files_properties(HdmiCecSinkImplementation.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
+
 target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
 
 if (NOT RDK_SERVICES_L1_TEST)
-    target_compile_options(${MODULE_NAME} PRIVATE -Wno-error=deprecated)
+    target_compile_options(${PLUGIN_IMPLEMENTATION} PRIVATE -Wno-error=deprecated)
 endif ()
 
 install(TARGETS ${MODULE_NAME}
         DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
 
+install(TARGETS ${PLUGIN_IMPLEMENTATION}
+        DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+
 write_config(${PLUGIN_NAME})

HdmiCecSink/HdmiCecSink.conf.in

@@ -2,3 +2,10 @@ precondition = ["Platform"]
 callsign = "org.rdk.HdmiCecSink"
 autostart = "false"
 startuporder = "@PLUGIN_HDMICECSINK_STARTUPORDER@"
+
+configuration = JSON()
+rootobject = JSON()
+
+rootobject.add("mode", "@PLUGIN_HDMICECSINK_MODE@")
+rootobject.add("locator", "lib@[email protected]")
+configuration.add("root", rootobject)

HdmiCecSink/HdmiCecSink.config

@@ -5,3 +5,13 @@ set (callsign "org.rdk.HdmiCecSink")
 if(PLUGIN_HDMICECSINK_STARTUPORDER)
 set (startuporder ${PLUGIN_HDMICECSINK_STARTUPORDER})
 endif()
+
+
+map()
+   key(root)
+   map()
+       kv(mode ${PLUGIN_HDMICECSOURCE_MODE})
+       kv(locator lib${PLUGIN_IMPLEMENTATION}.so)
+   end()
+end()
+ans(configuration)