Skip to content

Commit dc75e9f

Browse files
apatel859apatel859
committed
Merge branch 'release/1.1.1' into main
2 parents 97acc32 + 6b11c5b commit dc75e9f

File tree

16 files changed

+100
-54
lines changed

16 files changed

+100
-54
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
BUILD_TYPE: Debug
1111
THUNDER_REF: "R4.4.1"
12-
INTERFACES_REF: "main"
12+
INTERFACES_REF: "develop"
1313
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
1414
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
1515

@@ -124,7 +124,7 @@ jobs:
124124
- name: Apply patches ThunderTools
125125
run: |
126126
cd $GITHUB_WORKSPACE/ThunderTools
127-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
127+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
128128
cd -
129129
130130
- name: Build ThunderTools
@@ -145,10 +145,10 @@ jobs:
145145
- name: Apply patches Thunder
146146
run: |
147147
cd $GITHUB_WORKSPACE/Thunder
148-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
149-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
150-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
151-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
148+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
149+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
150+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
151+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
152152
cd -
153153
154154
- name: Build Thunder
@@ -252,7 +252,6 @@ jobs:
252252
rdk/iarmbus/libIBusDaemon.h
253253
rdk/halif/deepsleep-manager/deepSleepMgr.h
254254
rdk/iarmmgrs-hal/mfrMgr.h
255-
rdk/iarmmgrs-hal/pwrMgr.h
256255
rdk/iarmmgrs-hal/sysMgr.h
257256
network/wifiSrvMgrIarmIf.h
258257
network/netsrvmgrIarm.h
@@ -639,3 +638,4 @@ jobs:
639638
rdkL1TestResultsWithoutValgrind.json
640639
rdkL1TestResultsWithValgrind.json
641640
if-no-files-found: warn
641+

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: L2-tests
22

33
#enable the workflow incase of any plugin/testcase changes
4+
#Add "Tests/L2Tests" subdirectory in CMakeLists.txt, when enabling L2Tests
45
on:
56
workflow_dispatch:
67

78
env:
89
BUILD_TYPE: Debug
910
THUNDER_REF: "R4.4.1"
10-
INTERFACES_REF: "main"
11+
INTERFACES_REF: "develop"
1112
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
1213
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
1314

@@ -92,7 +93,7 @@ jobs:
9293
- name: Apply patches ThunderTools
9394
run: |
9495
cd $GITHUB_WORKSPACE/ThunderTools
95-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
96+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
9697
cd -
9798
9899
- name: Build ThunderTools
@@ -112,10 +113,10 @@ jobs:
112113
- name: Apply patches Thunder
113114
run: |
114115
cd $GITHUB_WORKSPACE/Thunder
115-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
116-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
117-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
118-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
116+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
117+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
118+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
119+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
119120
cd -
120121
- name: Build Thunder
121122
run: >
@@ -195,7 +196,6 @@ jobs:
195196
rdk/iarmbus/libIBus.h
196197
rdk/iarmbus/libIBusDaemon.h
197198
rdk/iarmmgrs-hal/mfrMgr.h
198-
rdk/iarmmgrs-hal/pwrMgr.h
199199
rdk/iarmmgrs-hal/sysMgr.h
200200
rdk/iarmbus/iarmUtil.h
201201
rfcapi.h

‎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)

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ string(TOLOWER ${NAMESPACE} STORAGE_DIRECTORY)
3737
include(CmakeHelperFunctions)
3838

3939
if(RDK_SERVICE_L2_TEST)
40-
add_subdirectory(Tests/L2Tests)
40+
# add_subdirectory(Tests/L2Tests)
4141
endif()
4242

4343
if(RDK_SERVICES_L1_TEST)

‎HdcpProfile/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if (RDK_SERVICE_L2_TEST)
7575
find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib)
7676
if (TESTMOCKLIB_LIBRARIES)
7777
message ("linking mock libraries ${TESTMOCKLIB_LIBRARIES} library")
78-
target_link_libraries(${MODULE_NAME} PRIVATE ${TESTMOCKLIB_LIBRARIES})
78+
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${TESTMOCKLIB_LIBRARIES})
7979
else (TESTMOCKLIB_LIBRARIES)
8080
message ("Require ${TESTMOCKLIB_LIBRARIES} library")
8181
endif (TESTMOCKLIB_LIBRARIES)

‎HdmiCecSink/HdmiCecSink.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,7 @@ namespace WPEFramework
824824
{
825825
if(_powerManagerPlugin)
826826
{
827+
_powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
827828
_powerManagerPlugin.Reset();
828829
}
829830
_registeredEventHandlers = false;

‎HdmiCecSource/HdmiCecSource.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ namespace WPEFramework
150150
}
151151

152152
_connectionId = 0;
153+
_service->Unregister(&_notification);
153154
_service->Release();
154155
_service = nullptr;
155156
LOGINFO("HdmiCecSource plugin is deactivated. Successfully deactivated HdmiCecSource Plugin");

‎HdmiCecSource/HdmiCecSourceImplementation.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ namespace WPEFramework
385385

386386
if(_powerManagerPlugin)
387387
{
388+
_powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
388389
_powerManagerPlugin.Reset();
389390
}
390391
_registeredEventHandlers = false;

‎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;

0 commit comments

Comments
 (0)