Skip to content

Commit 0f3cf04

Browse files
authored
Merge pull request #256 from rdkcentral/develop
rebase with develop
2 parents 71b8500 + 1ea0522 commit 0f3cf04

File tree

13 files changed

+235
-13
lines changed

13 files changed

+235
-13
lines changed

.github/workflows/L1-tests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,9 @@ jobs:
274274
rdk/ds/frontPanelIndicator.hpp
275275
rdk/ds/frontPanelConfig.hpp
276276
rdk/ds/frontPanelTextDisplay.hpp
277+
rdk/ds/audioOutputPortType.hpp
278+
rdk/ds/audioOutputPortConfig.hpp
279+
rdk/ds/pixelResolution.hpp
277280
rdk/iarmbus/libIARM.h
278281
rdk/iarmbus/libIBus.h
279282
rdk/iarmbus/libIBusDaemon.h
@@ -290,14 +293,15 @@ jobs:
290293
telemetry_busmessage_sender.h
291294
maintenanceMGR.h
292295
pkg.h
296+
edid-parser.hpp
293297
secure_wrapper.h
294298
wpa_ctrl.h
295299
proc/readproc.h
296300
systemaudioplatform.h
297301
gdialservice.h
298302
gdialservicecommon.h
299303
&&
300-
cp -r /usr/include/gstreamer-1.0/gst /usr/include/glib-2.0/* /usr/lib/x86_64-linux-gnu/glib-2.0/include/* /usr/local/include/trower-base64/base64.h .
304+
cp -r /usr/include/gstreamer-1.0/gst /usr/include/glib-2.0/* /usr/lib/x86_64-linux-gnu/glib-2.0/include/* /usr/local/include/trower-base64/base64.h /usr/include/libdrm/drm.h /usr/include/libdrm/drm_mode.h /usr/include/xf86drm.h .
301305
302306
- name: Set clang toolchain
303307
if: ${{ matrix.compiler == 'clang' }}
@@ -358,6 +362,7 @@ jobs:
358362
-I $GITHUB_WORKSPACE/Thunder/Source
359363
-I $GITHUB_WORKSPACE/Thunder/Source/core
360364
-I $GITHUB_WORKSPACE/install/usr/include
365+
-I ./usr/include/libdrm
361366
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
362367
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
363368
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -495,6 +500,7 @@ jobs:
495500
-I $GITHUB_WORKSPACE/Thunder/Source/core
496501
-I $GITHUB_WORKSPACE/install/usr/include
497502
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
503+
-I ./usr/include/libdrm
498504
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
499505
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
500506
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h

.github/workflows/L2-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ jobs:
220220
rdk/ds/manager.hpp
221221
rdk/ds/dsTypes.h
222222
rdk/ds/dsUtl.h
223+
rdk/ds/audioOutputPortType.hpp
224+
rdk/ds/audioOutputPortConfig.hpp
225+
rdk/ds/pixelResolution.hpp
223226
rdk/iarmbus/libIARM.h
224227
rdk/iarmbus/libIBus.h
225228
rdk/iarmbus/libIBusDaemon.h
@@ -234,6 +237,7 @@ jobs:
234237
systemaudioplatform.h
235238
maintenanceMGR.h
236239
pkg.h
240+
edid-parser.hpp
237241
btmgr.h
238242
tvError.h
239243
tvTypes.h
@@ -249,7 +253,7 @@ jobs:
249253
rdk/ds/VideoDFC.hpp
250254
dsRpc.h
251255
&&
252-
cp -r /usr/include/gstreamer-1.0/gst /usr/include/glib-2.0/* /usr/lib/x86_64-linux-gnu/glib-2.0/include/* /usr/local/include/trower-base64/base64.h .
256+
cp -r /usr/include/gstreamer-1.0/gst /usr/include/glib-2.0/* /usr/lib/x86_64-linux-gnu/glib-2.0/include/* /usr/local/include/trower-base64/base64.h /usr/include/libdrm/drm.h /usr/include/libdrm/drm_mode.h /usr/include/xf86drm.h .
253257
254258
- name: Set clang toolchain
255259
if: ${{ matrix.compiler == 'clang' }}
@@ -397,6 +401,7 @@ jobs:
397401
-I $GITHUB_WORKSPACE/entservices-inputoutput/helpers
398402
-I $GITHUB_WORKSPACE/install/usr/include
399403
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
404+
-I ./usr/include/libdrm
400405
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
401406
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
402407
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
name: Component Release
2+
3+
permissions:
4+
contents: write
5+
6+
on:
7+
pull_request:
8+
types: [closed]
9+
branches:
10+
- develop
11+
12+
jobs:
13+
release:
14+
if: github.event.pull_request.merged == true
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@v3
20+
21+
- name: Set up Git
22+
run: |
23+
git config --global user.name "GitHub Actions"
24+
git config --global user.email "[email protected]"
25+
26+
- name: Install git-flow and auto-changelog
27+
run: |
28+
sudo apt-get update
29+
sudo apt-get install -y git-flow
30+
npm install -g auto-changelog
31+
32+
- name: Clone the project and start release
33+
run: |
34+
set -e
35+
git clone https://x-access-token:${{ secrets.RDKCM_RDKE }}@github.com/${{ github.repository }} project
36+
cd project
37+
git fetch --all
38+
git checkout main || git checkout -b main origin/main
39+
git checkout develop || git checkout -b develop origin/develop
40+
41+
git config gitflow.branch.master main
42+
git config gitflow.branch.develop develop
43+
git config gitflow.prefix.feature feature/
44+
git config gitflow.prefix.bugfix bugfix/
45+
git config gitflow.prefix.release release/
46+
git config gitflow.prefix.hotfix hotfix/
47+
git config gitflow.prefix.support support/
48+
git config gitflow.prefix.versiontag ''
49+
50+
echo "git config completed"
51+
# Extract version from PR description
52+
PR_DESC="${{ github.event.pull_request.body }}"
53+
# Get top tag from CHANGELOG.md
54+
TOP_TAG=$(grep -m 1 -oP '^#### \[\K[^\]]+' CHANGELOG.md)
55+
if [[ -z "$TOP_TAG" ]]; then
56+
echo "No version found in CHANGELOG.md!"
57+
exit 1
58+
fi
59+
# Validate TOP_TAG format (semantic versioning: major.minor.patch)
60+
if [[ ! "$TOP_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
61+
echo "Invalid version format in CHANGELOG.md: $TOP_TAG. Expected format: major.minor.patch"
62+
exit 1
63+
fi
64+
IFS='.' read -r major minor patch <<< "$TOP_TAG"
65+
VERSION_TYPE=$(echo "$PR_DESC" | grep -oiP 'version\s*:\s*\K(major|minor|patch)' | tr '[:upper:]' '[:lower:]')
66+
if [[ -z "$VERSION_TYPE" ]]; then
67+
echo "No version type found in PR description, defaulting to PATCH increment."
68+
patch=$((patch + 1))
69+
elif [[ "$VERSION_TYPE" == "major" ]]; then
70+
major=$((major + 1))
71+
minor=0
72+
patch=0
73+
elif [[ "$VERSION_TYPE" == "minor" ]]; then
74+
minor=$((minor + 1))
75+
patch=0
76+
elif [[ "$VERSION_TYPE" == "patch" ]]; then
77+
patch=$((patch + 1))
78+
else
79+
echo "Invalid version type in PR description: $VERSION_TYPE"
80+
exit 1
81+
fi
82+
RELEASE_VERSION="$major.$minor.$patch"
83+
echo "Using calculated version: $RELEASE_VERSION"
84+
echo "RELEASE_VERSION=$RELEASE_VERSION"
85+
echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV
86+
# Check if tag already exists
87+
if git rev-parse "refs/tags/$RELEASE_VERSION" >/dev/null 2>&1; then
88+
echo "Tag $RELEASE_VERSION already exists. Skipping release."
89+
exit 0
90+
fi
91+
git flow release start $RELEASE_VERSION
92+
auto-changelog -v $RELEASE_VERSION
93+
git add CHANGELOG.md
94+
git commit -m "$RELEASE_VERSION release changelog updates"
95+
git flow release publish
96+
97+
- name: Finish release and push (default git-flow messages)
98+
run: |
99+
set -e
100+
cd project
101+
git flow release finish -m "$RELEASE_VERSION release" $RELEASE_VERSION
102+
git push origin main
103+
git push origin --tags
104+
git push origin develop
105+
106+
- name: Cleanup tag if workflow fails
107+
if: failure()
108+
run: |
109+
cd project
110+
git tag -d $RELEASE_VERSION || true
111+
git push origin :refs/tags/$RELEASE_VERSION || true

AVOutput/AVOutputTV.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,6 +2252,7 @@ namespace Plugin {
22522252
paramIndex_t indexInfo;
22532253
int dolbyMode = 0;
22542254
int err = 0;
2255+
tvVideoFormatType_t video_type = VIDEO_FORMAT_NONE;
22552256

22562257
if (parsingGetInputArgument(parameters, "DolbyVisionMode",inputInfo) != 0) {
22572258
LOGINFO("%s: Failed to parse argument\n", __FUNCTION__);
@@ -2262,6 +2263,12 @@ namespace Plugin {
22622263
returnResponse(false);
22632264
}
22642265

2266+
GetCurrentVideoFormat(&video_type);
2267+
if(video_type != VIDEO_FORMAT_DV)
2268+
{
2269+
LOGERR("%s: Invalid video format: %d \n", __FUNCTION__,video_type);
2270+
returnResponse(false);
2271+
}
22652272

22662273
if (getParamIndex("DolbyVisionMode",inputInfo,indexInfo) == -1) {
22672274
LOGERR("%s: getParamIndex failed to get \n", __FUNCTION__);

AVOutput/AVOutputTVHelper.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,6 +1209,13 @@ namespace Plugin {
12091209
LOGERR("Backlight Sync to cache Failed !!!\n");
12101210
}
12111211

1212+
if( !updateAVoutputTVParam("sync","LowLatencyState",info,PQ_PARAM_LOWLATENCY_STATE,level) ) {
1213+
LOGINFO("LowLatencyState Successfully Synced to Drive Cache\n");
1214+
}
1215+
else {
1216+
LOGERR("LowLatencyState Sync to cache Failed !!!\n");
1217+
}
1218+
12121219
syncCMSParams(); //sync CMS
12131220

12141221
syncWBParams();

AVOutput/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ All notable changes to this RDK Service will be documented in this file.
1414

1515
* Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development.
1616

17+
<<<<<<< HEAD
18+
## [1.1.4] - 2025-09-08
19+
### Fixed
20+
- Sync low latency for AVOutput initialization
21+
22+
## [1.1.3] - 2025-08-08
23+
### Fixed
24+
- Fixed getDolbyVisionMode() for non DV content
25+
1726
## [1.1.2] - 2025-07-01
1827
### Fixed
1928
- Phase2 ODM

CHANGELOG.md

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,71 @@ 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.4.7](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.6...1.4.7)
8+
9+
- RDKEMW-7712: Sync low latency for AVOutput initialization (#6338) [`#249`](https://github.com/rdkcentral/entservices-inputoutput/pull/249)
10+
- Merge tag '1.4.6' into develop [`bef0aa3`](https://github.com/rdkcentral/entservices-inputoutput/commit/bef0aa3bf2638d0223008f10babecde595d850df)
11+
12+
#### [1.4.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.5...1.4.6)
13+
14+
> 4 September 2025
15+
16+
- Feature/rdkemw 7169 [`#245`](https://github.com/rdkcentral/entservices-inputoutput/pull/245)
17+
- 1.4.6 release changelog updates [`7a0d569`](https://github.com/rdkcentral/entservices-inputoutput/commit/7a0d569f253b8a08926e959509e329159aa2d509)
18+
- Merge tag '1.4.5' into develop [`7268514`](https://github.com/rdkcentral/entservices-inputoutput/commit/7268514652bf9f0cda3f3a6433a0f0720bf9d63c)
19+
20+
#### [1.4.5](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.4...1.4.5)
21+
22+
> 3 September 2025
23+
24+
- RDKEMW-7169 - Gtest Add missing empty files [`#241`](https://github.com/rdkcentral/entservices-inputoutput/pull/241)
25+
- 1.4.5 release changelog updates [`4354afa`](https://github.com/rdkcentral/entservices-inputoutput/commit/4354afac08c4671cbed356d81a2ed2f612139464)
26+
- Merge tag '1.4.4' into develop [`0fabfaf`](https://github.com/rdkcentral/entservices-inputoutput/commit/0fabfaf0816dda67077fd7fe59e074a962e644ef)
27+
28+
#### [1.4.4](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.3...1.4.4)
29+
30+
> 1 September 2025
31+
32+
- Update component-release.yml [`#242`](https://github.com/rdkcentral/entservices-inputoutput/pull/242)
33+
- RDKEMW-6515: Scan and Fix coverity issues of Entservices and rdkservices-cpc [`#234`](https://github.com/rdkcentral/entservices-inputoutput/pull/234)
34+
- 1.4.4 release changelog updates [`feec135`](https://github.com/rdkcentral/entservices-inputoutput/commit/feec135c1c56d36401582981b6dfcd11993358fb)
35+
- Merge tag '1.4.3' into develop [`3b90d4b`](https://github.com/rdkcentral/entservices-inputoutput/commit/3b90d4b70baabf9367bfda236f4695b8a7974313)
36+
37+
#### [1.4.3](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.2...1.4.3)
38+
39+
> 19 August 2025
40+
41+
- RDKEMW-6681: getDolbyVisionMode api fails to return "Dark/Bright" in … [`#223`](https://github.com/rdkcentral/entservices-inputoutput/pull/223)
42+
- RDKEMW-4778 : Automate git flow merges to main branch for entservices repos [`#209`](https://github.com/rdkcentral/entservices-inputoutput/pull/209)
43+
- RDKEMW-6681: getDolbyVisionMode api fails to return "Dark/Bright" in response for AVOutput plugins. [`9db7ba4`](https://github.com/rdkcentral/entservices-inputoutput/commit/9db7ba48bd2c1d6b45c7f575ae5bacec2b0f8308)
44+
- 1.4.3 release changelog updates [`ef1583d`](https://github.com/rdkcentral/entservices-inputoutput/commit/ef1583d9967693a1607839f41057fb2a8f0f3060)
45+
- Merge tag '1.4.2' into develop [`be41736`](https://github.com/rdkcentral/entservices-inputoutput/commit/be41736e250601991249354d91777def97c17546)
46+
47+
#### [1.4.2](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.1...1.4.2)
48+
49+
> 4 August 2025
50+
51+
- RDKEMW-4708: Replacing IARM Power manager with Power Manager Plugin [`#194`](https://github.com/rdkcentral/entservices-inputoutput/pull/194)
52+
- 1.4.2 release change log updates [`e2a57a7`](https://github.com/rdkcentral/entservices-inputoutput/commit/e2a57a710780328c582d3b62c5c559409c83e9f4)
53+
- Merge tag '1.4.1' into develop [`263272d`](https://github.com/rdkcentral/entservices-inputoutput/commit/263272d6c89623461ace94af863e746fda34f9c3)
54+
55+
#### [1.4.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.0...1.4.1)
56+
57+
> 1 August 2025
58+
59+
- RDKEMW-6582: Improve the ARC volume logo smoothness during the Volume +/- press and hold scenario [`#215`](https://github.com/rdkcentral/entservices-inputoutput/pull/215)
60+
- [RDKEMW-5410] RDKEMW-6572 : Compilation error was not reported for the PR branch [`#211`](https://github.com/rdkcentral/entservices-inputoutput/pull/211)
61+
- 1.4.1 release change log updates [`f6c7916`](https://github.com/rdkcentral/entservices-inputoutput/commit/f6c7916aff03d41fb65e8b631f5c05f666ec92c6)
62+
- Merge tag '1.4.0' into develop [`152ff74`](https://github.com/rdkcentral/entservices-inputoutput/commit/152ff74a4066cd3b6fc10800d1b3835fe7d3b543)
63+
764
#### [1.4.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.3.5...1.4.0)
865

66+
> 28 July 2025
67+
968
- RDKEMW-2942 : Remove the HdmiInput plugin and replace its references with AVInput [`#205`](https://github.com/rdkcentral/entservices-inputoutput/pull/205)
1069
- [RDKEMW-3513] PR action to run with latest change [`#163`](https://github.com/rdkcentral/entservices-inputoutput/pull/163)
1170
- RDKEMW-6325: platfromSupport is missing from dimmingMode capabilities [`#198`](https://github.com/rdkcentral/entservices-inputoutput/pull/198)
71+
- RDKTV-37015 - Changelog updates for 1.4.0 [`b969871`](https://github.com/rdkcentral/entservices-inputoutput/commit/b969871181dd194dd835750ec8eb908b66d34537)
1272
- Merge tag '1.3.5' into develop [`024be52`](https://github.com/rdkcentral/entservices-inputoutput/commit/024be52d58d512b138b84aee9b12609e603d7110)
1373

1474
#### [1.3.5](https://github.com/rdkcentral/entservices-inputoutput/compare/1.3.4...1.3.5)

0 commit comments

Comments
 (0)