Skip to content

Commit 1e58a4a

Browse files
Merge pull request #246 from rdkcentral/develop
rebase
2 parents edcb205 + bef0aa3 commit 1e58a4a

File tree

7 files changed

+42
-4
lines changed

7 files changed

+42
-4
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

.github/workflows/component-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Clone the project and start release
3333
run: |
3434
set -e
35-
git clone https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} project
35+
git clone https://x-access-token:${{ secrets.RDKCM_RDKE }}@github.com/${{ github.repository }} project
3636
cd project
3737
git fetch --all
3838
git checkout main || git checkout -b main origin/main

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,36 @@ 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.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.5...1.4.6)
8+
9+
- Feature/rdkemw 7169 [`#245`](https://github.com/rdkcentral/entservices-inputoutput/pull/245)
10+
- Merge tag '1.4.5' into develop [`7268514`](https://github.com/rdkcentral/entservices-inputoutput/commit/7268514652bf9f0cda3f3a6433a0f0720bf9d63c)
11+
12+
#### [1.4.5](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.4...1.4.5)
13+
14+
> 3 September 2025
15+
16+
- RDKEMW-7169 - Gtest Add missing empty files [`#241`](https://github.com/rdkcentral/entservices-inputoutput/pull/241)
17+
- 1.4.5 release changelog updates [`4354afa`](https://github.com/rdkcentral/entservices-inputoutput/commit/4354afac08c4671cbed356d81a2ed2f612139464)
18+
- Merge tag '1.4.4' into develop [`0fabfaf`](https://github.com/rdkcentral/entservices-inputoutput/commit/0fabfaf0816dda67077fd7fe59e074a962e644ef)
19+
20+
#### [1.4.4](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.3...1.4.4)
21+
22+
> 1 September 2025
23+
24+
- Update component-release.yml [`#242`](https://github.com/rdkcentral/entservices-inputoutput/pull/242)
25+
- RDKEMW-6515: Scan and Fix coverity issues of Entservices and rdkservices-cpc [`#234`](https://github.com/rdkcentral/entservices-inputoutput/pull/234)
26+
- 1.4.4 release changelog updates [`feec135`](https://github.com/rdkcentral/entservices-inputoutput/commit/feec135c1c56d36401582981b6dfcd11993358fb)
27+
- Merge tag '1.4.3' into develop [`3b90d4b`](https://github.com/rdkcentral/entservices-inputoutput/commit/3b90d4b70baabf9367bfda236f4695b8a7974313)
28+
729
#### [1.4.3](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.2...1.4.3)
830

31+
> 19 August 2025
32+
933
- RDKEMW-6681: getDolbyVisionMode api fails to return "Dark/Bright" in … [`#223`](https://github.com/rdkcentral/entservices-inputoutput/pull/223)
1034
- RDKEMW-4778 : Automate git flow merges to main branch for entservices repos [`#209`](https://github.com/rdkcentral/entservices-inputoutput/pull/209)
1135
- RDKEMW-6681: getDolbyVisionMode api fails to return "Dark/Bright" in response for AVOutput plugins. [`9db7ba4`](https://github.com/rdkcentral/entservices-inputoutput/commit/9db7ba48bd2c1d6b45c7f575ae5bacec2b0f8308)
36+
- 1.4.3 release changelog updates [`ef1583d`](https://github.com/rdkcentral/entservices-inputoutput/commit/ef1583d9967693a1607839f41057fb2a8f0f3060)
1237
- Merge tag '1.4.2' into develop [`be41736`](https://github.com/rdkcentral/entservices-inputoutput/commit/be41736e250601991249354d91777def97c17546)
1338

1439
#### [1.4.2](https://github.com/rdkcentral/entservices-inputoutput/compare/1.4.1...1.4.2)

HdmiCecSource/HdmiCecSourceImplementation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ namespace WPEFramework {
118118
std::unique_lock<std::mutex> lk;
119119

120120
CECDeviceInfo_2()
121-
: m_logicalAddress(0),m_vendorID(0,0,0),m_osdName("NA"), m_isOSDNameUpdated (false), m_isVendorIDUpdated (false)
121+
: m_logicalAddress(0),m_vendorID(0,0,0),m_osdName("NA"), m_deviceInfoStatus(0), m_isOSDNameUpdated (false), m_isVendorIDUpdated (false)
122122
{
123123
BITMASK_CLEAR(m_deviceInfoStatus, 0xFFFF); //Clear all bits
124124
}

build_dependencies.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ touch rbus.h
162162
touch telemetry_busmessage_sender.h
163163
touch maintenanceMGR.h
164164
touch pkg.h
165+
touch edid-parser.hpp
165166
touch secure_wrapper.h
166167
touch wpa_ctrl.h
167168
touch btmgr.h

cov_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \
3737
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks \
3838
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/thunder \
3939
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/devicesettings \
40+
-I /usr/include/libdrm \
4041
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/devicesettings.h \
4142
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/Iarm.h \
4243
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/Rfc.h \

0 commit comments

Comments
 (0)