Skip to content

Commit bb067c1

Browse files
committed
RDKEMW-6331 : Fix HdmiCecSink COM-RPC issues
Reason for change : COM-RPC Implementation with fixes for - getDeviceList does not return proper json tags in response. Populating powerStatus instead of portNumber. Added RequestAudioDevicePowerStatus API Signed-off-by: smanes0213 <[email protected]>
1 parent 71b8500 commit bb067c1

File tree

12 files changed

+4666
-4181
lines changed

12 files changed

+4666
-4181
lines changed

.github/workflows/L1-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,8 @@ jobs:
457457
-DRDK_SERVICES_L1_TEST=ON
458458
-DPLUGIN_AVINPUT=ON
459459
-DPLUGIN_HDCPPROFILE=ON
460-
-DPLUGIN_HDMICECSOURCE=ON
461-
-DPLUGIN_HDMICECSINK=ON
460+
-DPLUGIN_HDMICECSOURCE=OFF
461+
-DPLUGIN_HDMICECSINK=OFF
462462
-DUSE_THUNDER_R4=ON
463463
-DHIDE_NON_EXTERNAL_SYMBOLS=OFF
464464
&&
@@ -534,8 +534,8 @@ jobs:
534534
-DDS_FOUND=ON
535535
-DPLUGIN_AVINPUT=ON
536536
-DPLUGIN_HDCPPROFILE=ON
537-
-DPLUGIN_HDMICECSOURCE=ON
538-
-DPLUGIN_HDMICECSINK=ON
537+
-DPLUGIN_HDMICECSOURCE=OFF
538+
-DPLUGIN_HDMICECSINK=OFF
539539
-DRDK_SERVICES_L1_TEST=ON
540540
-DUSE_THUNDER_R4=ON
541541
-DHIDE_NON_EXTERNAL_SYMBOLS=OFF

HdmiCecSink/CMakeLists.txt

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# limitations under the License.
1717
set(PLUGIN_NAME HdmiCecSink)
1818
set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
19+
set(PLUGIN_IMPLEMENTATION ${MODULE_NAME}Implementation)
1920

2021

2122
set(PLUGIN_HDMICECSINK_STARTUPORDER "" CACHE STRING "To configure startup order of HdmiCecSink plugin")
@@ -26,10 +27,18 @@ add_library(${MODULE_NAME} SHARED
2627
HdmiCecSink.cpp
2728
Module.cpp)
2829

30+
add_library(${PLUGIN_IMPLEMENTATION} SHARED
31+
HdmiCecSinkImplementation.cpp
32+
Module.cpp)
33+
2934
set_target_properties(${MODULE_NAME} PROPERTIES
3035
CXX_STANDARD 11
3136
CXX_STANDARD_REQUIRED YES)
3237

38+
set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
39+
CXX_STANDARD 11
40+
CXX_STANDARD_REQUIRED YES)
41+
3342
target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
3443

3544
find_package(DS)
@@ -41,13 +50,23 @@ target_include_directories(${MODULE_NAME} PRIVATE ${CEC_INCLUDE_DIRS})
4150
target_include_directories(${MODULE_NAME} PRIVATE ${DS_INCLUDE_DIRS})
4251
set_source_files_properties(HdmiCecSink.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
4352

53+
54+
target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
55+
target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${CEC_INCLUDE_DIRS})
56+
target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${DS_INCLUDE_DIRS})
57+
set_source_files_properties(HdmiCecSinkImplementation.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
58+
4459
target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
60+
target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
4561

4662
if (NOT RDK_SERVICES_L1_TEST)
47-
target_compile_options(${MODULE_NAME} PRIVATE -Wno-error=deprecated)
63+
target_compile_options(${PLUGIN_IMPLEMENTATION} PRIVATE -Wno-error=deprecated)
4864
endif ()
4965

5066
install(TARGETS ${MODULE_NAME}
5167
DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
5268

53-
write_config(${PLUGIN_NAME})
69+
install(TARGETS ${PLUGIN_IMPLEMENTATION}
70+
DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
71+
72+
write_config(${PLUGIN_NAME})

HdmiCecSink/HdmiCecSink.conf.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@ precondition = ["Platform"]
22
callsign = "org.rdk.HdmiCecSink"
33
autostart = "false"
44
startuporder = "@PLUGIN_HDMICECSINK_STARTUPORDER@"
5+
6+
configuration = JSON()
7+
rootobject = JSON()
8+
9+
rootobject.add("mode", "@PLUGIN_HDMICECSINK_MODE@")
10+
rootobject.add("locator", "lib@[email protected]")
11+
configuration.add("root", rootobject)

HdmiCecSink/HdmiCecSink.config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,13 @@ set (callsign "org.rdk.HdmiCecSink")
55
if(PLUGIN_HDMICECSINK_STARTUPORDER)
66
set (startuporder ${PLUGIN_HDMICECSINK_STARTUPORDER})
77
endif()
8+
9+
10+
map()
11+
key(root)
12+
map()
13+
kv(mode ${PLUGIN_HDMICECSOURCE_MODE})
14+
kv(locator lib${PLUGIN_IMPLEMENTATION}.so)
15+
end()
16+
end()
17+
ans(configuration)

0 commit comments

Comments
 (0)