Skip to content

Commit ffdc1f4

Browse files
apatel859apatel859
authored
Merge branch 'develop' into feature/RDKEMW-3526_L1
2 parents d99200f + 7cf1b00 commit ffdc1f4

File tree

9 files changed

+162
-31
lines changed

9 files changed

+162
-31
lines changed

‎.github/workflows/L1-tests.yml‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: L1-tests
22

33
on:
44
push:
5-
branches: [ main, develop, 'sprint/**', 'release/**', 'topic/RDK*' ]
5+
branches: [ main, develop, 'sprint/**', 'release/**' ]
66
pull_request:
7-
branches: [ main, develop, 'sprint/**', 'release/**', 'topic/RDK*' ]
7+
branches: [ main, develop, 'sprint/**', 'release/**' ]
88

99
env:
1010
BUILD_TYPE: Debug
@@ -121,6 +121,14 @@ jobs:
121121
with:
122122
path: entservices-inputoutput
123123

124+
- name: Checkout googletest
125+
if: steps.cache.outputs.cache-hit != 'true'
126+
uses: actions/checkout@v3
127+
with:
128+
repository: google/googletest
129+
path: googletest
130+
ref: v1.15.0
131+
124132
- name: Apply patches ThunderTools
125133
run: |
126134
cd $GITHUB_WORKSPACE/ThunderTools
@@ -342,6 +350,22 @@ jobs:
342350
&&
343351
cmake --install build/mocks
344352
353+
- name: Build googletest
354+
if: steps.cache.outputs.cache-hit != 'true'
355+
run: >
356+
cmake -G Ninja
357+
-S "$GITHUB_WORKSPACE/googletest"
358+
-B build/googletest
359+
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
360+
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
361+
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
362+
-DBUILD_TYPE=Debug
363+
-DBUILD_GMOCK=ON
364+
&&
365+
cmake --build build/googletest -j8
366+
&&
367+
cmake --install build/googletest
368+
345369
- name: Build entservices-inputoutput
346370
run: >
347371
cmake -G Ninja
@@ -368,6 +392,8 @@ jobs:
368392
-I $GITHUB_WORKSPACE/entservices-testframework/Tests
369393
-I $GITHUB_WORKSPACE/Thunder/Source
370394
-I $GITHUB_WORKSPACE/Thunder/Source/core
395+
-I $GITHUB_WORKSPACE/install/usr/include
396+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
371397
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
372398
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
373399
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -406,6 +432,8 @@ jobs:
406432
-DDS_FOUND=ON
407433
-DHAS_FRONT_PANEL=ON
408434
-DRDK_SERVICES_L1_TEST=ON
435+
-DPLUGIN_AVINPUT=ON
436+
-DPLUGIN_HDMIINPUT=ON
409437
-DPLUGIN_HDCPPROFILE=ON
410438
-DPLUGIN_HDMICECSOURCE=ON
411439
-DPLUGIN_HDMICECSINK=ON
@@ -443,6 +471,8 @@ jobs:
443471
-I $GITHUB_WORKSPACE/entservices-testframework/Tests
444472
-I $GITHUB_WORKSPACE/Thunder/Source
445473
-I $GITHUB_WORKSPACE/Thunder/Source/core
474+
-I $GITHUB_WORKSPACE/install/usr/include
475+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
446476
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
447477
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
448478
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -459,7 +489,7 @@ jobs:
459489
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/thunder/Communicator.h
460490
--coverage
461491
-Wall -Wno-unused-result -Wno-deprecated-declarations -Wno-error=format=
462-
-Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog
492+
-Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog -Wl,--no-as-needed
463493
-DENABLE_TELEMETRY_LOGGING
464494
-DUSE_IARMBUS
465495
-DENABLE_SYSTEM_GET_STORE_DEMO_LINK
@@ -480,6 +510,8 @@ jobs:
480510
-DCMAKE_DISABLE_FIND_PACKAGE_CEC=ON
481511
-DCMAKE_BUILD_TYPE=Debug
482512
-DDS_FOUND=ON
513+
-DPLUGIN_AVINPUT=ON
514+
-DPLUGIN_HDMIINPUT=ON
483515
-DPLUGIN_HDCPPROFILE=ON
484516
-DPLUGIN_HDMICECSOURCE=ON
485517
-DPLUGIN_HDMICECSINK=ON

‎.github/workflows/L2-tests.yml‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: L2-tests
22

3-
#enable the workflow incase of any plugin/testcase changes
4-
#Add "Tests/L2Tests" subdirectory in CMakeLists.txt, when enabling L2Tests
53
on:
6-
workflow_dispatch:
4+
push:
5+
branches: [ main, develop, 'sprint/**', 'release/**' ]
6+
pull_request:
7+
branches: [ main, develop, 'sprint/**', 'release/**' ]
78

89
env:
910
BUILD_TYPE: Debug
@@ -90,6 +91,14 @@ jobs:
9091
ref: develop
9192
token: ${{ secrets.RDKCM_RDKE }}
9293

94+
- name: Checkout googletest
95+
if: steps.cache.outputs.cache-hit != 'true'
96+
uses: actions/checkout@v3
97+
with:
98+
repository: google/googletest
99+
path: googletest
100+
ref: v1.15.0
101+
93102
- name: Apply patches ThunderTools
94103
run: |
95104
cd $GITHUB_WORKSPACE/ThunderTools
@@ -248,6 +257,22 @@ jobs:
248257
&&
249258
cmake --install build/mocks
250259
260+
- name: Build googletest
261+
if: steps.cache.outputs.cache-hit != 'true'
262+
run: >
263+
cmake -G Ninja
264+
-S "$GITHUB_WORKSPACE/googletest"
265+
-B build/googletest
266+
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
267+
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
268+
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
269+
-DBUILD_TYPE=Debug
270+
-DBUILD_GMOCK=ON
271+
&&
272+
cmake --build build/googletest -j8
273+
&&
274+
cmake --install build/googletest
275+
251276
- name: Build entservices-inputoutput
252277
run: >
253278
cmake
@@ -274,6 +299,8 @@ jobs:
274299
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal
275300
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
276301
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
302+
-I $GITHUB_WORKSPACE/install/usr/include
303+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
277304
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
278305
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
279306
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -365,6 +392,8 @@ jobs:
365392
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
366393
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
367394
-I $GITHUB_WORKSPACE/entservices-deviceanddisplay/helpers
395+
-I $GITHUB_WORKSPACE/install/usr/include
396+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
368397
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
369398
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
370399
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -384,6 +413,7 @@ jobs:
384413
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/tvSettingsODM.h
385414
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/tvTypes.h
386415
-Werror -Wall -Wno-unused-result -Wno-deprecated-declarations -Wno-error=format=
416+
-Wl,--no-as-needed
387417
-DUSE_IARMBUS
388418
-DRDK_SERVICE_L2_TEST
389419
-DDISABLE_SECURITY_TOKEN

‎AVInput/AVInput.cpp‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,30 @@ void AVInput::AVInputVideoModeUpdate( int port , dsVideoPortResolution_t resolut
868868
params["frameRateN"] = 60000;
869869
params["frameRateD"] = 1001;
870870
break;
871-
871+
case dsVIDEO_FRAMERATE_100:
872+
params["frameRateN"] = 100000;
873+
params["frameRateD"] = 1000;
874+
break;
875+
case dsVIDEO_FRAMERATE_119dot88:
876+
params["frameRateN"] = 120000;
877+
params["frameRateD"] = 1001;
878+
break;
879+
case dsVIDEO_FRAMERATE_120:
880+
params["frameRateN"] = 120000;
881+
params["frameRateD"] = 1000;
882+
break;
883+
case dsVIDEO_FRAMERATE_200:
884+
params["frameRateN"] = 200000;
885+
params["frameRateD"] = 1000;
886+
break;
887+
case dsVIDEO_FRAMERATE_239dot76:
888+
params["frameRateN"] = 240000;
889+
params["frameRateD"] = 1001;
890+
break;
891+
case dsVIDEO_FRAMERATE_240:
892+
params["frameRateN"] = 240000;
893+
params["frameRateD"] = 100;
894+
break;
872895
default:
873896
params["frameRateN"] = 60000;
874897
params["frameRateD"] = 1000;

‎CHANGELOG.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [1.1.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.1.0...1.1.1)
8+
9+
- RDKEMW-5124: Higher framerate support in Thunder [`#134`](https://github.com/rdkcentral/entservices-inputoutput/pull/134)
10+
- RDK-57440: Enable HdcpProfile for contract test [`#132`](https://github.com/rdkcentral/entservices-inputoutput/pull/132)
11+
- [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to specific entservices for inputoutput repo [`#123`](https://github.com/rdkcentral/entservices-inputoutput/pull/123)
12+
- RDKEMW-4196: Cleanup and remove pwrmgr references from workflows [`#126`](https://github.com/rdkcentral/entservices-inputoutput/pull/126)
13+
- RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change [`#104`](https://github.com/rdkcentral/entservices-inputoutput/pull/104)
14+
- RDKEMW-4139: Coverity integration with Entservices-inputoutput repo [`#116`](https://github.com/rdkcentral/entservices-inputoutput/pull/116)
15+
- Merge tag '1.1.0' into develop [`2ce89ed`](https://github.com/rdkcentral/entservices-inputoutput/commit/2ce89edb2c300ecc3275fab6673b48823578d053)
16+
717
#### [1.1.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.12...1.1.0)
818

19+
> 20 May 2025
20+
921
- RDK-52028 : Add CMS,WB,ALS to AVOutput (#6139) [`#23`](https://github.com/rdkcentral/entservices-inputoutput/pull/23)
1022
- [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to entservices-inputoutput [`#107`](https://github.com/rdkcentral/entservices-inputoutput/pull/107)
1123
- [RDKEMW-2711] RDKEMW-3851: L1 - Move plugins Unit test to inputoutput repo [`#92`](https://github.com/rdkcentral/entservices-inputoutput/pull/92)
@@ -14,6 +26,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
1426
- RDK-55554 : Gtest for HdmiCecSource and sink [`#78`](https://github.com/rdkcentral/entservices-inputoutput/pull/78)
1527
- RDK-55373:[RDKServices] Coverity integration with middleware componen… [`#96`](https://github.com/rdkcentral/entservices-inputoutput/pull/96)
1628
- RDK-55373:[RDKServices] Coverity integration with middleware component workflow [`#94`](https://github.com/rdkcentral/entservices-inputoutput/pull/94)
29+
- 1.1.0 release changelog updates [`d6c91fa`](https://github.com/rdkcentral/entservices-inputoutput/commit/d6c91fa3fb9bda7e296ce9321921cc8882b2d50d)
1730
- Merge tag '1.0.12' into develop [`2019c9f`](https://github.com/rdkcentral/entservices-inputoutput/commit/2019c9f8d72eba911fe9030cf4476ce99c2127de)
1831

1932
#### [1.0.12](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.11...1.0.12)
@@ -74,10 +87,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
7487
- Enabling workflow for L1 and L2 [`4049a2e`](https://github.com/rdkcentral/entservices-inputoutput/commit/4049a2eb188efede1c1547be50847d29ddcb9e03)
7588
- Merge tag '1.0.6' into develop [`f46b084`](https://github.com/rdkcentral/entservices-inputoutput/commit/f46b084ed21e61d89e20868eacdea4ba8198266d)
7689

77-
#### [1.0.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.5...1.0.6)
90+
#### [1.0.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.6-RDK7.1...1.0.6)
7891

7992
> 27 March 2025
8093
94+
#### [1.0.6-RDK7.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.5...1.0.6-RDK7.1)
95+
96+
> 22 May 2025
97+
98+
- RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change [`#104`](https://github.com/rdkcentral/entservices-inputoutput/pull/104)
8199
- Removed Cec host header [`#35`](https://github.com/rdkcentral/entservices-inputoutput/pull/35)
82100
- 1.0.9 release change log updates [`8abd094`](https://github.com/rdkcentral/entservices-inputoutput/commit/8abd09439355af4041436e562c4590769b55bc0c)
83101
- Merge tag '1.0.5' into develop [`3b26eeb`](https://github.com/rdkcentral/entservices-inputoutput/commit/3b26eebfdf0e992e369e5cd3cdc981748c9cdb69)

‎HdmiInput/HdmiInput.cpp‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,30 @@ namespace WPEFramework
718718
params["frameRateN"] = 60000;
719719
params["frameRateD"] = 1001;
720720
break;
721-
721+
case dsVIDEO_FRAMERATE_100:
722+
params["frameRateN"] = 100000;
723+
params["frameRateD"] = 1000;
724+
break;
725+
case dsVIDEO_FRAMERATE_119dot88:
726+
params["frameRateN"] = 120000;
727+
params["frameRateD"] = 1001;
728+
break;
729+
case dsVIDEO_FRAMERATE_120:
730+
params["frameRateN"] = 120000;
731+
params["frameRateD"] = 1000;
732+
break;
733+
case dsVIDEO_FRAMERATE_200:
734+
params["frameRateN"] = 200000;
735+
params["frameRateD"] = 1000;
736+
break;
737+
case dsVIDEO_FRAMERATE_239dot76:
738+
params["frameRateN"] = 240000;
739+
params["frameRateD"] = 1001;
740+
break;
741+
case dsVIDEO_FRAMERATE_240:
742+
params["frameRateN"] = 240000;
743+
params["frameRateD"] = 100;
744+
break;
722745
default:
723746
params["frameRateN"] = 60000;
724747
params["frameRateD"] = 1000;

‎Tests/L1Tests/CMakeLists.txt‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,16 @@ cmake_minimum_required(VERSION 3.8)
1919
set(PLUGIN_NAME L1TestsIO)
2020
set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
2121

22-
set(CMAKE_CXX_STANDARD 11)
22+
set(CMAKE_CXX_STANDARD 14)
23+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2324

2425
find_package(${NAMESPACE}Plugins REQUIRED)
2526

2627
set (TEST_SRC
2728
tests/test_UtilsFile.cpp
2829
)
2930

30-
include(FetchContent)
31-
FetchContent_Declare(
32-
googletest
33-
URL https://github.com/google/googletest/archive/e39786088138f2749d64e9e90e0f9902daa77c40.zip
34-
)
35-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
36-
FetchContent_MakeAvailable(googletest)
37-
3831
set (TEST_LIB
39-
gmock_main
4032
${NAMESPACE}Plugins::${NAMESPACE}Plugins
4133
)
4234

@@ -136,6 +128,12 @@ add_plugin_test_ex(PLUGIN_AVINPUT tests/test_AVInput.cpp "${AVINPUT_INC}" "${NAM
136128

137129
add_library(${MODULE_NAME} SHARED ${TEST_SRC})
138130

131+
set_source_files_properties(
132+
tests/test_HdmiCec2.cpp
133+
tests/test_HdmiCecSource.cpp
134+
tests/test_HdmiCecSink.cpp
135+
PROPERTIES COMPILE_FLAGS "-fexceptions")
136+
139137
if (RDK_SERVICES_L1_TEST)
140138
find_library(TESTMOCKLIB_LIBRARIES NAMES L1TestMocklib)
141139
if (TESTMOCKLIB_LIBRARIES)
@@ -148,7 +146,7 @@ endif (RDK_SERVICES_L1_TEST)
148146

149147
include_directories(${TEST_INC})
150148

151-
target_link_directories(${MODULE_NAME} PUBLIC ${CMAKE_INSTALL_PREFIX}/lib/wpeframework/plugins)
149+
target_link_directories(${MODULE_NAME} PUBLIC ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib/wpeframework/plugins)
152150

153151
target_link_libraries(${MODULE_NAME} ${TEST_LIB})
154152

‎Tests/L1Tests/tests/test_HdcpProfile.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,8 @@ TEST_F(HDCPProfileDsTest, getSettopHDCPSupport_Hdcp_v2x)
378378
"\\}")));
379379
}
380380

381+
#if 0
382+
381383
TEST_F(HDCPProfileEventIarmTest, onDisplayConnectionChanged)
382384
{
383385
ASSERT_TRUE(dsHdmiEventHandler != nullptr);
@@ -447,6 +449,7 @@ TEST_F(HDCPProfileEventIarmTest, onDisplayConnectionChanged)
447449
EVENT_UNSUBSCRIBE(0, _T("onDisplayConnectionChanged"), _T("client.events"), message);
448450
}
449451

452+
#endif
450453
TEST_F(HDCPProfileEventIarmTest, onHdmiOutputHDCPStatusEvent)
451454
{
452455
ASSERT_TRUE(dsHdmiEventHandler != nullptr);

‎Tests/L2Tests/CMakeLists.txt‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,10 @@
1919
set(PLUGIN_NAME L2TestsIO)
2020
set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
2121
set(THUNDER_PORT 9998)
22-
#set(CMAKE_CXX_STANDARD 11)
22+
2323
find_package(${NAMESPACE}Plugins REQUIRED)
2424

25-
include(FetchContent)
26-
FetchContent_Declare(
27-
googletest
28-
URL https://github.com/google/googletest/archive/e39786088138f2749d64e9e90e0f9902daa77c40.zip
29-
)
30-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
31-
FetchContent_MakeAvailable(googletest)
25+
set(SRC_FILES tests/test_foo_IN.cpp)
3226

3327
if(PLUGIN_AVOUTPUT)
3428
set(SRC_FILES ${SRC_FILES} tests/AVOutputTV_L2Test.cpp)
@@ -37,16 +31,16 @@ endif()
3731
add_library(${MODULE_NAME} SHARED ${SRC_FILES})
3832

3933
set_target_properties(${MODULE_NAME} PROPERTIES
40-
CXX_STANDARD 11
34+
CXX_STANDARD 14
4135
CXX_STANDARD_REQUIRED YES)
4236

4337
target_compile_definitions(${MODULE_NAME}
4438
PRIVATE
4539
MODULE_NAME=Plugin_${PLUGIN_NAME}
4640
THUNDER_PORT="${THUNDER_PORT}")
4741

48-
target_compile_options(${MODULE_NAME} PRIVATE -Wno-error)
49-
target_link_libraries(${MODULE_NAME} PRIVATE gmock_main ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
42+
# target_compile_options(${MODULE_NAME} PRIVATE -Wno-error)
43+
target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
5044

5145
if (NOT L2_TEST_OOP_RPC)
5246
find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib)

‎Tests/L2Tests/tests/test_foo_IN.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#include <gtest/gtest.h>
2+
#include <iostream>
3+
4+
class PrintTestIO : public ::testing::Test {
5+
};
6+
7+
// Single test with print statement
8+
TEST_F(PrintTestIO, BasicOutputIO) {
9+
std::cout << "this is a print statement from inputoutput" << std::endl;
10+
}

0 commit comments

Comments
 (0)