From 70e2192a73259d151e4b2a45e6c93e6c60040fe1 Mon Sep 17 00:00:00 2001 From: agampa263 <133222558+agampa263@users.noreply.github.com> Date: Wed, 21 May 2025 17:35:47 +0530 Subject: [PATCH 1/7] RDKEMW-4139: Coverity integration with Entservices-inputoutput repo (#116) * RDKEMW-4139: Coverity integration with Entservices-inputoutput repo Reason for change: Coverity integration with middleware component workflow Test Procedure: Verify checks in github Risks: Low Signed-off-by:AkshayKumar_Gampa AkshayKumar_Gampa@comcast.com * RDKEMW-4139: Coverity integration with Entservices-inputoutput repo Reason for change: Coverity integration with middleware component workflow Test Procedure: Verify checks in github Risks: Low Signed-off-by:AkshayKumar_Gampa AkshayKumar_Gampa@comcast.com * RDKEMW-4139: Coverity integration with Entservices-inputoutput repo Reason for change: Coverity integration with middleware component workflow Test Procedure: Verify checks in github Risks: Low Signed-off-by:AkshayKumar_Gampa AkshayKumar_Gampa@comcast.com * RDKEMW-4139: Coverity integration with Entservices-inputoutput repo Reason for change: Coverity integration with middleware component workflow Test Procedure: Verify checks in github Risks: Low Signed-off-by:AkshayKumar_Gampa AkshayKumar_Gampa@comcast.com --- cov_build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cov_build.sh b/cov_build.sh index d3915245..bde2bce8 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -25,6 +25,7 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \ -DDS_FOUND=ON \ -DPLUGIN_HDMICECSOURCE=ON \ -DPLUGIN_HDCPPROFILE=ON \ +-DPLUGIN_HDMICECSINK=ON \ -DCMAKE_CXX_FLAGS="-DEXCEPTIONS_ENABLE=ON \ -I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers \ -I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/audiocapturemgr \ @@ -33,6 +34,9 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \ -I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal \ -I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/ccec/drivers \ -I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/network \ +-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks \ +-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/thunder \ +-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/devicesettings \ -include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/devicesettings.h \ -include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/Iarm.h \ -include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/Rfc.h \ @@ -45,7 +49,7 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \ -include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/wpa_ctrl_mock.h \ -include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/secure_wrappermock.h \ -include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/HdmiCec.h \ ---coverage -Wall -Werror -Wno-error=format \ +-Wall -Wno-unused-result -Werror -Wno-error=format \ -Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog \ -DENABLE_TELEMETRY_LOGGING -DUSE_IARMBUS \ -DENABLE_SYSTEM_GET_STORE_DEMO_LINK -DENABLE_DEEP_SLEEP \ @@ -55,4 +59,4 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \ cmake --build build/entservices-inputoutput --target install echo "======================================================================================" -exit 0 \ No newline at end of file +exit 0 From ef949f33acf40334bb06bad85da419cf971fa0c5 Mon Sep 17 00:00:00 2001 From: Leena D <74546271+leenaS-d@users.noreply.github.com> Date: Wed, 21 May 2025 13:20:57 -0400 Subject: [PATCH 2/7] RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change (#104) * RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change Signed-off-by: leenaS-d * RDKEMW-4220 : Fix wpeframework crash on reactivating HdmiCecSource plugin and launch cobalt/htmlapp/webkitbrowser Reason for changes: The service unregister call is missed during HdmiCecSource plugin deactivation. Test Procedure: Verified build, tested. --------- Signed-off-by: leenaS-d Co-authored-by: Arun P Madhavan <54109113+arun-madhavan-013@users.noreply.github.com> Co-authored-by: tkathi259 --- HdmiCecSink/HdmiCecSink.cpp | 1 + HdmiCecSource/HdmiCecSource.cpp | 1 + HdmiCecSource/HdmiCecSourceImplementation.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/HdmiCecSink/HdmiCecSink.cpp b/HdmiCecSink/HdmiCecSink.cpp index f986fb61..26aef24c 100644 --- a/HdmiCecSink/HdmiCecSink.cpp +++ b/HdmiCecSink/HdmiCecSink.cpp @@ -824,6 +824,7 @@ namespace WPEFramework { if(_powerManagerPlugin) { + _powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface()); _powerManagerPlugin.Reset(); } _registeredEventHandlers = false; diff --git a/HdmiCecSource/HdmiCecSource.cpp b/HdmiCecSource/HdmiCecSource.cpp index 68b38a9a..e00fba1d 100644 --- a/HdmiCecSource/HdmiCecSource.cpp +++ b/HdmiCecSource/HdmiCecSource.cpp @@ -150,6 +150,7 @@ namespace WPEFramework } _connectionId = 0; + _service->Unregister(&_notification); _service->Release(); _service = nullptr; LOGINFO("HdmiCecSource plugin is deactivated. Successfully deactivated HdmiCecSource Plugin"); diff --git a/HdmiCecSource/HdmiCecSourceImplementation.cpp b/HdmiCecSource/HdmiCecSourceImplementation.cpp index 3660a33e..4a4e3e64 100644 --- a/HdmiCecSource/HdmiCecSourceImplementation.cpp +++ b/HdmiCecSource/HdmiCecSourceImplementation.cpp @@ -385,6 +385,7 @@ namespace WPEFramework if(_powerManagerPlugin) { + _powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface()); _powerManagerPlugin.Reset(); } _registeredEventHandlers = false; From 3034d01fe527e1d5c339ec029c1d5c0f87ea7c85 Mon Sep 17 00:00:00 2001 From: Santosh Kumar G <149996998+santoshcomcast@users.noreply.github.com> Date: Fri, 30 May 2025 10:55:24 +0530 Subject: [PATCH 3/7] RDKEMW-4196: Cleanup and remove pwrmgr references from workflows (#126) Reason for change: Cleanup and remove pwrmgr references from workflows Test Procedure: build Risks: Medium Signed-off-by:gsanto722 grandhi_santoshkumar@comcast.com --- .github/workflows/L1-tests.yml | 1 - .github/workflows/L2-tests.yml | 1 - L2HalMock/build.sh | 3 +-- Tests/L1Tests/tests/test_HdcpProfile.cpp | 11 ----------- Tests/L1Tests/tests/test_HdmiCecSource.cpp | 11 ----------- build_dependencies.sh | 1 - cmake/FindIARMBus.cmake | 5 ++--- 7 files changed, 3 insertions(+), 30 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 9d741808..336d9d38 100755 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -252,7 +252,6 @@ jobs: rdk/iarmbus/libIBusDaemon.h rdk/halif/deepsleep-manager/deepSleepMgr.h rdk/iarmmgrs-hal/mfrMgr.h - rdk/iarmmgrs-hal/pwrMgr.h rdk/iarmmgrs-hal/sysMgr.h network/wifiSrvMgrIarmIf.h network/netsrvmgrIarm.h diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 11cb4f3b..c8fbcf6c 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -195,7 +195,6 @@ jobs: rdk/iarmbus/libIBus.h rdk/iarmbus/libIBusDaemon.h rdk/iarmmgrs-hal/mfrMgr.h - rdk/iarmmgrs-hal/pwrMgr.h rdk/iarmmgrs-hal/sysMgr.h rdk/iarmbus/iarmUtil.h rfcapi.h diff --git a/L2HalMock/build.sh b/L2HalMock/build.sh index 31ab3ef5..5f123247 100644 --- a/L2HalMock/build.sh +++ b/L2HalMock/build.sh @@ -184,8 +184,7 @@ cp $SCRIPTS_DIR/patches/rdkservices/files/wdmp-c.h /usr/local/include/wdmp-c cd /usr/include/ mkdir rdk cd /usr/include/rdk -mkdir iarmmgrs-hal -cp $WORKSPACE/deps/rdk/iarmmgrs/hal/include/pwrMgr.h /usr/include/rdk/iarmmgrs-hal + sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSource/HdmiCecSource.cpp sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSink/HdmiCecSink.cpp diff --git a/Tests/L1Tests/tests/test_HdcpProfile.cpp b/Tests/L1Tests/tests/test_HdcpProfile.cpp index dbcd5562..f0f6a06f 100755 --- a/Tests/L1Tests/tests/test_HdcpProfile.cpp +++ b/Tests/L1Tests/tests/test_HdcpProfile.cpp @@ -31,7 +31,6 @@ #include "dsMgr.h" #include "dsDisplay.h" #include "ThunderPortability.h" -#include "pwrMgr.h" #include "PowerManagerMock.h" #include @@ -505,16 +504,6 @@ TEST_F(HDCPProfileEventIarmTest, onHdmiOutputHDCPStatusEvent) return Core::ERROR_NONE; })); - ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call) - .WillByDefault( - [](const char* ownerName, const char* methodName, void* arg, size_t argLen) { - if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) { - auto* param = static_cast(arg); - param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON; - } - return IARM_RESULT_SUCCESS; - }); - EVENT_SUBSCRIBE(0, _T("onDisplayConnectionChanged"), _T("client.events"), message); IARM_Bus_DSMgr_EventData_t eventData; diff --git a/Tests/L1Tests/tests/test_HdmiCecSource.cpp b/Tests/L1Tests/tests/test_HdmiCecSource.cpp index 9a08cadb..3ae56adb 100755 --- a/Tests/L1Tests/tests/test_HdmiCecSource.cpp +++ b/Tests/L1Tests/tests/test_HdmiCecSource.cpp @@ -26,7 +26,6 @@ #include "HdmiCecSourceImplementation.h" #include "HdmiCec.h" #include "HdmiCecSource.h" -#include "pwrMgr.h" #include "PowerManagerMock.h" #include "FactoriesImplementation.h" #include "IarmBusMock.h" @@ -365,16 +364,6 @@ class HdmiCecSourceTest : public ::testing::Test { return IARM_RESULT_SUCCESS; })); - - ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call) - .WillByDefault( - [](const char* ownerName, const char* methodName, void* arg, size_t argLen) { - if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) { - auto* param = static_cast(arg); - param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON; - } - return IARM_RESULT_SUCCESS; - }); } virtual ~HdmiCecSourceTest() override diff --git a/build_dependencies.sh b/build_dependencies.sh index d03a3082..c085255d 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -153,7 +153,6 @@ touch rdk/iarmbus/libIBus.h touch rdk/iarmbus/libIBusDaemon.h touch rdk/iarmmgrs-hal/deepSleepMgr.h touch rdk/iarmmgrs-hal/mfrMgr.h -touch rdk/iarmmgrs-hal/pwrMgr.h touch rdk/iarmmgrs-hal/sysMgr.h touch network/wifiSrvMgrIarmIf.h touch network/netsrvmgrIarm.h diff --git a/cmake/FindIARMBus.cmake b/cmake/FindIARMBus.cmake index 7d32a1ba..da1d5877 100644 --- a/cmake/FindIARMBus.cmake +++ b/cmake/FindIARMBus.cmake @@ -28,11 +28,10 @@ find_package(PkgConfig) find_library(IARMBUS_LIBRARIES NAMES IARMBus) find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus) find_path(IARMRECEIVER_INCLUDE_DIRS NAMES receiverMgr.h PATH_SUFFIXES rdk/iarmmgrs/receiver) -find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal) set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library") -set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS}) -set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include") +set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS}) +set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include") include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES) From cc36a8724992acd843748c7d4a6252c998b12bf8 Mon Sep 17 00:00:00 2001 From: Prathyushakothuru <142974139+Prathyushakothuru@users.noreply.github.com> Date: Fri, 30 May 2025 22:12:06 +0530 Subject: [PATCH 4/7] [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to specific entservices for inputoutput repo (#123) * modifying the path name of the patch files for all the yml's * Update L1-tests.yml * patch set * Modifying INTERFACES_REF * Modifying build_dependencies.sh --------- Co-authored-by: Pesala Lakshmi Jwala Priya Co-authored-by: PriyaPesala <116076033+PriyaPesala@users.noreply.github.com> --- .github/workflows/L1-tests.yml | 13 +++++++------ .github/workflows/L2-tests.yml | 12 ++++++------ build_dependencies.sh | 10 +++++----- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 336d9d38..259d11b7 100755 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -9,7 +9,7 @@ on: env: BUILD_TYPE: Debug THUNDER_REF: "R4.4.1" - INTERFACES_REF: "main" + INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}} @@ -124,7 +124,7 @@ jobs: - name: Apply patches ThunderTools run: | cd $GITHUB_WORKSPACE/ThunderTools - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch cd - - name: Build ThunderTools @@ -145,10 +145,10 @@ jobs: - name: Apply patches Thunder run: | cd $GITHUB_WORKSPACE/Thunder - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch cd - - name: Build Thunder @@ -638,3 +638,4 @@ jobs: rdkL1TestResultsWithoutValgrind.json rdkL1TestResultsWithValgrind.json if-no-files-found: warn + diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index c8fbcf6c..81a39441 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -7,7 +7,7 @@ on: env: BUILD_TYPE: Debug THUNDER_REF: "R4.4.1" - INTERFACES_REF: "main" + INTERFACES_REF: "develop" AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}} AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}} @@ -92,7 +92,7 @@ jobs: - name: Apply patches ThunderTools run: | cd $GITHUB_WORKSPACE/ThunderTools - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch cd - - name: Build ThunderTools @@ -112,10 +112,10 @@ jobs: - name: Apply patches Thunder run: | cd $GITHUB_WORKSPACE/Thunder - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch - patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch + patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch cd - - name: Build Thunder run: > diff --git a/build_dependencies.sh b/build_dependencies.sh index c085255d..92d10f7f 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -40,7 +40,7 @@ git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework. echo "======================================================================================" echo "buliding thunderTools" cd ThunderTools -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch cd - @@ -59,10 +59,10 @@ echo "========================================================================== echo "buliding thunder" cd Thunder -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch +patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch cd - cmake -G Ninja -S Thunder -B build/Thunder \ From 07fd812fe6f7ebcfb2f5716cef46dcee1dfb677c Mon Sep 17 00:00:00 2001 From: Srikanth <107277821+srikanth-vv@users.noreply.github.com> Date: Fri, 6 Jun 2025 13:37:37 -0400 Subject: [PATCH 5/7] RDK-57440: Enable HdcpProfile for contract test (#132) Reason for Change: Added for CT Test Procedure: Check for regressions Risks: Low Priority: P1 --- .github/workflows/L2-tests.yml | 1 + CMakeLists.txt | 2 +- HdcpProfile/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 81a39441..7224e70b 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -1,6 +1,7 @@ name: L2-tests #enable the workflow incase of any plugin/testcase changes +#Add "Tests/L2Tests" subdirectory in CMakeLists.txt, when enabling L2Tests on: workflow_dispatch: diff --git a/CMakeLists.txt b/CMakeLists.txt index a3036b26..df70686a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ string(TOLOWER ${NAMESPACE} STORAGE_DIRECTORY) include(CmakeHelperFunctions) if(RDK_SERVICE_L2_TEST) - add_subdirectory(Tests/L2Tests) +# add_subdirectory(Tests/L2Tests) endif() if(RDK_SERVICES_L1_TEST) diff --git a/HdcpProfile/CMakeLists.txt b/HdcpProfile/CMakeLists.txt index 3a65466f..9341cc08 100644 --- a/HdcpProfile/CMakeLists.txt +++ b/HdcpProfile/CMakeLists.txt @@ -75,7 +75,7 @@ if (RDK_SERVICE_L2_TEST) find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib) if (TESTMOCKLIB_LIBRARIES) message ("linking mock libraries ${TESTMOCKLIB_LIBRARIES} library") - target_link_libraries(${MODULE_NAME} PRIVATE ${TESTMOCKLIB_LIBRARIES}) + target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${TESTMOCKLIB_LIBRARIES}) else (TESTMOCKLIB_LIBRARIES) message ("Require ${TESTMOCKLIB_LIBRARIES} library") endif (TESTMOCKLIB_LIBRARIES) From f7638f052616c77463c9c921aaa2d17b2ed5b5f0 Mon Sep 17 00:00:00 2001 From: aishwariya15 <75303024+aishwariya15@users.noreply.github.com> Date: Wed, 11 Jun 2025 21:57:39 +0530 Subject: [PATCH 6/7] RDKEMW-5124: Higher framerate support in Thunder (#134) --- AVInput/AVInput.cpp | 25 ++++++++++++++++++++++++- HdmiInput/HdmiInput.cpp | 25 ++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp index 8c71c7a6..fccde076 100644 --- a/AVInput/AVInput.cpp +++ b/AVInput/AVInput.cpp @@ -868,7 +868,30 @@ void AVInput::AVInputVideoModeUpdate( int port , dsVideoPortResolution_t resolut params["frameRateN"] = 60000; params["frameRateD"] = 1001; break; - + case dsVIDEO_FRAMERATE_100: + params["frameRateN"] = 100000; + params["frameRateD"] = 1000; + break; + case dsVIDEO_FRAMERATE_119dot88: + params["frameRateN"] = 120000; + params["frameRateD"] = 1001; + break; + case dsVIDEO_FRAMERATE_120: + params["frameRateN"] = 120000; + params["frameRateD"] = 1000; + break; + case dsVIDEO_FRAMERATE_200: + params["frameRateN"] = 200000; + params["frameRateD"] = 1000; + break; + case dsVIDEO_FRAMERATE_239dot76: + params["frameRateN"] = 240000; + params["frameRateD"] = 1001; + break; + case dsVIDEO_FRAMERATE_240: + params["frameRateN"] = 240000; + params["frameRateD"] = 100; + break; default: params["frameRateN"] = 60000; params["frameRateD"] = 1000; diff --git a/HdmiInput/HdmiInput.cpp b/HdmiInput/HdmiInput.cpp index e45efa09..ef53a03a 100644 --- a/HdmiInput/HdmiInput.cpp +++ b/HdmiInput/HdmiInput.cpp @@ -718,7 +718,30 @@ namespace WPEFramework params["frameRateN"] = 60000; params["frameRateD"] = 1001; break; - + case dsVIDEO_FRAMERATE_100: + params["frameRateN"] = 100000; + params["frameRateD"] = 1000; + break; + case dsVIDEO_FRAMERATE_119dot88: + params["frameRateN"] = 120000; + params["frameRateD"] = 1001; + break; + case dsVIDEO_FRAMERATE_120: + params["frameRateN"] = 120000; + params["frameRateD"] = 1000; + break; + case dsVIDEO_FRAMERATE_200: + params["frameRateN"] = 200000; + params["frameRateD"] = 1000; + break; + case dsVIDEO_FRAMERATE_239dot76: + params["frameRateN"] = 240000; + params["frameRateD"] = 1001; + break; + case dsVIDEO_FRAMERATE_240: + params["frameRateN"] = 240000; + params["frameRateD"] = 100; + break; default: params["frameRateN"] = 60000; params["frameRateD"] = 1000; From 6b11c5b379c1bfdfc533fc090d73245d4cfe264e Mon Sep 17 00:00:00 2001 From: apatel859 Date: Wed, 11 Jun 2025 16:39:37 +0000 Subject: [PATCH 7/7] 1.1.1 release change log updates --- CHANGELOG.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73149475..cfb49314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.1.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.1.0...1.1.1) + +- RDKEMW-5124: Higher framerate support in Thunder [`#134`](https://github.com/rdkcentral/entservices-inputoutput/pull/134) +- RDK-57440: Enable HdcpProfile for contract test [`#132`](https://github.com/rdkcentral/entservices-inputoutput/pull/132) +- [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to specific entservices for inputoutput repo [`#123`](https://github.com/rdkcentral/entservices-inputoutput/pull/123) +- RDKEMW-4196: Cleanup and remove pwrmgr references from workflows [`#126`](https://github.com/rdkcentral/entservices-inputoutput/pull/126) +- RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change [`#104`](https://github.com/rdkcentral/entservices-inputoutput/pull/104) +- RDKEMW-4139: Coverity integration with Entservices-inputoutput repo [`#116`](https://github.com/rdkcentral/entservices-inputoutput/pull/116) +- Merge tag '1.1.0' into develop [`2ce89ed`](https://github.com/rdkcentral/entservices-inputoutput/commit/2ce89edb2c300ecc3275fab6673b48823578d053) + #### [1.1.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.12...1.1.0) +> 20 May 2025 + - RDK-52028 : Add CMS,WB,ALS to AVOutput (#6139) [`#23`](https://github.com/rdkcentral/entservices-inputoutput/pull/23) - [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to entservices-inputoutput [`#107`](https://github.com/rdkcentral/entservices-inputoutput/pull/107) - [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). - RDK-55554 : Gtest for HdmiCecSource and sink [`#78`](https://github.com/rdkcentral/entservices-inputoutput/pull/78) - RDK-55373:[RDKServices] Coverity integration with middleware componen… [`#96`](https://github.com/rdkcentral/entservices-inputoutput/pull/96) - RDK-55373:[RDKServices] Coverity integration with middleware component workflow [`#94`](https://github.com/rdkcentral/entservices-inputoutput/pull/94) +- 1.1.0 release changelog updates [`d6c91fa`](https://github.com/rdkcentral/entservices-inputoutput/commit/d6c91fa3fb9bda7e296ce9321921cc8882b2d50d) - Merge tag '1.0.12' into develop [`2019c9f`](https://github.com/rdkcentral/entservices-inputoutput/commit/2019c9f8d72eba911fe9030cf4476ce99c2127de) #### [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). - Enabling workflow for L1 and L2 [`4049a2e`](https://github.com/rdkcentral/entservices-inputoutput/commit/4049a2eb188efede1c1547be50847d29ddcb9e03) - Merge tag '1.0.6' into develop [`f46b084`](https://github.com/rdkcentral/entservices-inputoutput/commit/f46b084ed21e61d89e20868eacdea4ba8198266d) -#### [1.0.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.5...1.0.6) +#### [1.0.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.6-RDK7.1...1.0.6) > 27 March 2025 +#### [1.0.6-RDK7.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.5...1.0.6-RDK7.1) + +> 22 May 2025 + +- RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change [`#104`](https://github.com/rdkcentral/entservices-inputoutput/pull/104) - Removed Cec host header [`#35`](https://github.com/rdkcentral/entservices-inputoutput/pull/35) - 1.0.9 release change log updates [`8abd094`](https://github.com/rdkcentral/entservices-inputoutput/commit/8abd09439355af4041436e562c4590769b55bc0c) - Merge tag '1.0.5' into develop [`3b26eeb`](https://github.com/rdkcentral/entservices-inputoutput/commit/3b26eebfdf0e992e369e5cd3cdc981748c9cdb69)