Skip to content

Commit 84e11ba

Browse files
authored
Merge branch 'develop' into topic/RDKEMW-4778-tag
2 parents 4ea5e65 + 008fa89 commit 84e11ba

File tree

5 files changed

+59
-12
lines changed

5 files changed

+59
-12
lines changed

.github/workflows/L1-tests.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: L1-tests
22

33
on:
4-
push:
5-
branches: [ main, develop, 'sprint/**', 'release/**' ]
6-
pull_request:
7-
branches: [ main, develop, 'sprint/**', 'release/**' ]
4+
workflow_call:
5+
secrets:
6+
RDKCM_RDKE:
7+
required: true
88

99
env:
1010
BUILD_TYPE: Debug
@@ -66,6 +66,10 @@ jobs:
6666
python-version: '3.x'
6767
- run: pip install jsonref
6868

69+
- name: ACK External Trigger
70+
run: |
71+
echo "Message: External Trigger Received for L1 Tests"
72+
6973
- name: Set up CMake
7074
uses: jwlawson/[email protected]
7175
with:
@@ -119,7 +123,9 @@ jobs:
119123
- name: Checkout entservices-inputoutput
120124
uses: actions/checkout@v3
121125
with:
126+
repository: rdkcentral/entservices-inputoutput
122127
path: entservices-inputoutput
128+
ref: develop
123129

124130
- name: Checkout googletest
125131
if: steps.cache.outputs.cache-hit != 'true'
@@ -667,7 +673,7 @@ jobs:
667673
if: ${{ !env.ACT }}
668674
uses: actions/upload-artifact@v4
669675
with:
670-
name: artifacts
676+
name: artifacts-L1-inputoutput
671677
path: |
672678
coverage/
673679
valgrind_log

.github/workflows/L2-tests.yml

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

33
on:
4-
push:
5-
branches: [ main, develop, 'sprint/**', 'release/**' ]
6-
pull_request:
7-
branches: [ main, develop, 'sprint/**', 'release/**' ]
4+
workflow_call:
5+
secrets:
6+
RDKCM_RDKE:
7+
required: true
88

99
env:
1010
BUILD_TYPE: Debug
@@ -36,6 +36,10 @@ jobs:
3636
python-version: '3.x'
3737
- run: pip install jsonref
3838

39+
- name: ACK External Trigger
40+
run: |
41+
echo "Message: External Trigger Received for L2 Tests"
42+
3943
- name: Set up CMake
4044
uses: jwlawson/[email protected]
4145
with:
@@ -81,7 +85,9 @@ jobs:
8185
- name: Checkout entservices-inputoutput
8286
uses: actions/checkout@v3
8387
with:
88+
repository: rdkcentral/entservices-inputoutput
8489
path: entservices-inputoutput
90+
ref: develop
8591

8692
- name: Checkout entservices-testframework
8793
uses: actions/checkout@v3
@@ -375,7 +381,7 @@ jobs:
375381
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal
376382
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
377383
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
378-
-I $GITHUB_WORKSPACE/entservices-deviceanddisplay/helpers
384+
-I $GITHUB_WORKSPACE/entservices-inputoutput/helpers
379385
-I $GITHUB_WORKSPACE/install/usr/include
380386
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
381387
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
@@ -581,7 +587,7 @@ jobs:
581587
if: ${{ !env.ACT }}
582588
uses: actions/upload-artifact@v4
583589
with:
584-
name: artifacts
590+
name: artifacts-L2-inputoutput
585591
path: |
586592
coverage/
587593
valgrind_log
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
permissions:
2+
contents: read
3+
name: main-workflow
4+
5+
on:
6+
push:
7+
branches: [ main, develop, 'sprint/**', 'release/**' ]
8+
pull_request:
9+
branches: [ main, develop, 'sprint/**', 'release/**' ]
10+
11+
jobs:
12+
trigger-L1:
13+
uses: ./.github/workflows/L1-tests.yml
14+
secrets:
15+
RDKCM_RDKE: ${{ secrets.RDKCM_RDKE }}
16+
17+
trigger-L2:
18+
uses: ./.github/workflows/L2-tests.yml
19+
secrets:
20+
RDKCM_RDKE: ${{ secrets.RDKCM_RDKE }}
21+

AVOutput/AVOutputTV.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2016,6 +2016,10 @@ namespace Plugin {
20162016
returnResponse(false);
20172017
}
20182018

2019+
if (isPlatformSupport("DimmingMode") != 0) {
2020+
returnResponse(false);
2021+
}
2022+
20192023
if (getParamIndex("DimmingMode",inputInfo,indexInfo) == -1) {
20202024
LOGERR("%s: getParamIndex failed to get \n", __FUNCTION__);
20212025
returnResponse(false);
@@ -2072,6 +2076,10 @@ namespace Plugin {
20722076
returnResponse(false);
20732077
}
20742078

2079+
if (isPlatformSupport("DimmingMode") != 0) {
2080+
returnResponse(false);
2081+
}
2082+
20752083
if( !isCapablityCheckPassed( "DimmingMode" , inputInfo )) {
20762084
LOGERR("%s: CapablityCheck failed for DimmingMode\n", __FUNCTION__);
20772085
returnResponse(false);
@@ -2118,6 +2126,10 @@ namespace Plugin {
21182126
returnResponse(false);
21192127
}
21202128

2129+
if (isPlatformSupport("DimmingMode") != 0) {
2130+
returnResponse(false);
2131+
}
2132+
21212133
int retval= updateAVoutputTVParam("reset","DimmingMode", inputInfo,PQ_PARAM_DIMMINGMODE,dMode);
21222134

21232135
if(retval != 0 ) {
@@ -2171,6 +2183,8 @@ namespace Plugin {
21712183
returnResponse(false);
21722184
}
21732185
else {
2186+
response["platformSupport"] = (info.isPlatformSupportVector[0].compare("true") == 0) ? true : false;
2187+
21742188
for (index = 0; index < info.rangeVector.size(); index++) {
21752189
supportedDimmingModeArray.Add(info.rangeVector[index]);
21762190
}

AVOutput/AVOutputTVHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2302,7 +2302,7 @@ namespace Plugin {
23022302

23032303
}
23042304

2305-
if ((param == "DolbyVisionMode") || (param == "Backlight") || (param == "CMS") || (param == "CustomWhiteBalance") || (param == "HDRMode") || (param == "BacklightControl")) {
2305+
if ((param == "DolbyVisionMode") || (param == "Backlight") || (param == "CMS") || (param == "CustomWhiteBalance") || (param == "HDRMode") || (param == "BacklightControl") || (param == "DimmingMode")) {
23062306
configString = param + ".platformsupport";
23072307
info.isPlatformSupport = inFile.Get<std::string>(configString);
23082308
printf(" platformsupport : %s\n",info.isPlatformSupport.c_str() );

0 commit comments

Comments
 (0)