Skip to content

Commit 99d95ee

Browse files
Merge branch 'develop' of github.com:rdkcentral/entservices-apis into feature/RDKEMW-1017_1018_miracast_comrpc_support
Signed-off-by: yuvaramachandran_gurusamy <[email protected]>
2 parents 706ba1d + 4ab8acb commit 99d95ee

File tree

12 files changed

+566
-314
lines changed

12 files changed

+566
-314
lines changed

.github/workflows/Validate_Interface_headers_incremental.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,25 @@ jobs:
2525
git fetch origin ${{ github.event.pull_request.base.ref }} --depth=1
2626
git diff --name-only origin/${{ github.event.pull_request.base.ref }} > changed_files.txt
2727
28+
- name: Filter only existing changed files
29+
id: filter_existing
30+
run: |
31+
touch existing_files.txt
32+
while IFS= read -r file; do
33+
if [ -f "$file" ]; then
34+
echo "$file" >> existing_files.txt
35+
else
36+
echo " $file file has been removed in your PR,hence skipping validation for the removed file"
37+
fi
38+
done < changed_files.txt
39+
2840
- name: Run validation script
2941
run: |
30-
python .github/workflows/validate_interface_headers_incremental.py changed_files.txt
42+
if [ -s existing_files.txt ]; then
43+
python .github/workflows/validate_interface_headers_incremental.py existing_files.txt
44+
else
45+
echo "No valid changed files to validate."
46+
fi
3147
3248
- name: Remove changed_files.txt
3349
run: |

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,21 @@ 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.6.0](https://github.com/rdkcentral/entservices-apis/compare/1.5.1...1.6.0)
8+
9+
- IProvisioning.h Interface header not following coding guidelines [`#237`](https://github.com/rdkcentral/entservices-apis/pull/237)
10+
- IProvisioning.h Interface header not following coding guidelines [`#257`](https://github.com/rdkcentral/entservices-apis/pull/257)
11+
- RDKEMW-3385: Implement Caching in New PackageManager [`#248`](https://github.com/rdkcentral/entservices-apis/pull/248)
12+
- IProvisioning.h Interface header not following coding guidelines [`#249`](https://github.com/rdkcentral/entservices-apis/pull/249)
13+
- Merge tag '1.5.1' into develop [`2b988b6`](https://github.com/rdkcentral/entservices-apis/commit/2b988b65d2d7eae1c22538fa2475a1a04eb70143)
14+
715
#### [1.5.1](https://github.com/rdkcentral/entservices-apis/compare/1.5.0...1.5.1)
816

17+
> 6 June 2025
18+
919
- RDK-56578 : Changed deviceType from tv to IpTv [`#156`](https://github.com/rdkcentral/entservices-apis/pull/156)
1020
- RDKEMW-4872: lifecycle2.0 integration [`#242`](https://github.com/rdkcentral/entservices-apis/pull/242)
21+
- 1.5.1 release changelog updates [`b7bbff3`](https://github.com/rdkcentral/entservices-apis/commit/b7bbff3308e54efbb5db7d56c9548e8191bae382)
1122
- Merge tag '1.5.0' into develop [`a7793b3`](https://github.com/rdkcentral/entservices-apis/commit/a7793b312ddb00c8009d34f52031fd6e7f3b5646)
1223

1324
#### [1.5.0](https://github.com/rdkcentral/entservices-apis/compare/1.4.2...1.5.0)

apis/DeviceProvisioning/IProvisioning.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

apis/FrameRate/IFrameRate.h

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/*
2+
* If not stated otherwise in this file or this component's LICENSE file the
3+
* following copyright and licenses apply:
4+
*
5+
* Copyright 2025 RDK Management
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
20+
#pragma once
21+
#include "Module.h"
22+
23+
// @stubgen:include <com/IIteratorType.h>
24+
25+
namespace WPEFramework
26+
{
27+
namespace Exchange
28+
{
29+
/* @json 1.0.0 @text:keep */
30+
struct EXTERNAL IFrameRate : virtual public Core::IUnknown
31+
{
32+
enum { ID = ID_FRAMERATE };
33+
34+
// @event
35+
struct EXTERNAL INotification : virtual public Core::IUnknown
36+
{
37+
enum { ID = ID_FRAMERATE_NOTIFICATION };
38+
39+
// @text onFpsEvent
40+
// @brief Triggered by callback from FrameRate after onFpsEvent
41+
// @param average - in - int
42+
// @param min - in - int
43+
// @param max - in - int
44+
virtual void OnFpsEvent(const int average, const int min, const int max) {};
45+
46+
// @text onDisplayFrameRateChanging
47+
// @brief Triggered when the framerate changes started
48+
// @param displayFrameRate - in - string
49+
virtual void OnDisplayFrameRateChanging(const string& displayFrameRate) {};
50+
51+
// @text onDisplayFrameRateChanged
52+
// @brief Triggered when the framerate changed.
53+
// @param displayFrameRate - in - string
54+
virtual void OnDisplayFrameRateChanged(const string& displayFrameRate) {};
55+
};
56+
57+
virtual Core::hresult Register(IFrameRate::INotification* notification) = 0;
58+
virtual Core::hresult Unregister(IFrameRate::INotification* notification) = 0;
59+
60+
/** Gets the Display Frame Rate*/
61+
// @text getDisplayFrameRate
62+
// @brief Gets the current display frame rate values.
63+
// @param framerate - out - string
64+
// @param success - out - boolean
65+
virtual Core::hresult GetDisplayFrameRate(string& framerate /* @out */, bool& success /* @out */) = 0;
66+
67+
/** Gets framerate mode */
68+
// @text getFrmMode
69+
// @brief Gets the current auto framerate mode.
70+
// @param frmmode - out - int
71+
// @param success - out - boolean
72+
virtual Core::hresult GetFrmMode(int &framerateMode /* @out @text:auto-frm-mode */, bool& success /* @out */) = 0;
73+
74+
/** Sets the FPS data collection interval */
75+
// @text setCollectionFrequency
76+
// @brief Sets the FPS data collection interval.
77+
// @param frequency - in - int
78+
// @param success - out - boolean
79+
virtual Core::hresult SetCollectionFrequency(const int frequency, bool& success /* @out */) = 0;
80+
81+
/** Sets the display framerate values */
82+
// @text setDisplayFrameRate
83+
// @brief Sets the display framerate values.
84+
// @param framerate - in - string
85+
// @param success - out - boolean
86+
virtual Core::hresult SetDisplayFrameRate(const string& framerate, bool& success /* @out */) = 0;
87+
88+
/** Sets the auto framerate mode */
89+
// @text setFrmMode
90+
// @brief Set the Frm mode.
91+
// @param frmmode - in - int
92+
// @param success - out - boolean
93+
virtual Core::hresult SetFrmMode(const int frmmode /* @in */, bool& success /* @out */) = 0;
94+
95+
/** Starts the FPS data collection */
96+
// @text startFpsCollection
97+
// @brief Starts the FPS data collection. Starts the FPS data collection
98+
// @param success - out - boolean
99+
virtual Core::hresult StartFpsCollection(bool& success /* @out */) = 0;
100+
101+
/** Stops the FPS data collection */
102+
// @text stopFpsCollection
103+
// @brief Stops the FPS data collection
104+
// @param success - out - boolean
105+
virtual Core::hresult StopFpsCollection(bool& success /* @out */) = 0;
106+
107+
/** Update the FPS value */
108+
// @text updateFps
109+
// @brief Update the FPS value
110+
// @param newFpsValue - in - int
111+
// @param success - out - boolean
112+
virtual Core::hresult UpdateFps(const int newFpsValue, bool& success /* @out */) = 0;
113+
};
114+
} // namespace Exchange
115+
} // namespace WPEFramework

apis/Ids.h

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ namespace Exchange {
7575
ID_CONTENTDECRYPTION = ID_ENTOS_OFFSET + 0x030,
7676
ID_CONTENTDECRYPTION_NOTIFICATION = ID_CONTENTDECRYPTION + 1,
7777

78-
ID_PROVISIONING = ID_ENTOS_OFFSET + 0x040,
79-
ID_PROVISIONING_NOTIFICATION = ID_PROVISIONING + 1,
78+
ID_FRAMERATE = ID_ENTOS_OFFSET + 0x040,
79+
ID_FRAMERATE_NOTIFICATION = ID_FRAMERATE + 1,
8080

8181
ID_CAPTURE = ID_ENTOS_OFFSET + 0x050,
8282

@@ -276,9 +276,18 @@ namespace Exchange {
276276
ID_HDCPPROFILE = ID_ENTOS_OFFSET + 0x390,
277277
ID_HDCPPROFILE_NOTIFICATION = ID_HDCPPROFILE + 1,
278278

279-
ID_LEDCONTROL = ID_ENTOS_OFFSET + 0x3A0,
279+
ID_LEDCONTROL = ID_ENTOS_OFFSET + 0x3A0,
280280

281-
ID_MIRACAST_SERVICE = ID_ENTOS_OFFSET + 0x3B0,
281+
ID_SHARED_STORAGE = ID_ENTOS_OFFSET + 0x3B0,
282+
ID_SHARED_STORAGE_NOTIFICATION = ID_SHARED_STORAGE + 1,
283+
ID_SHARED_STORAGE_INSPECTOR = ID_SHARED_STORAGE + 2,
284+
ID_SHARED_STORAGE_INSPECTOR_NAMESPACE_SIZE_ITERATOR = ID_SHARED_STORAGE + 3,
285+
ID_SHARED_STORAGE_LIMIT = ID_SHARED_STORAGE + 4,
286+
ID_SHARED_STORAGE_LIMIT_NOTIFICATION = ID_SHARED_STORAGE + 5,
287+
ID_SHARED_STORAGE_LIMIT_INSPECTOR = ID_SHARED_STORAGE + 6,
288+
ID_SHARED_STORAGE_CACHE = ID_SHARED_STORAGE + 7,
289+
290+
ID_MIRACAST_SERVICE = ID_ENTOS_OFFSET + 0x3C0,
282291
ID_MIRACAST_SERVICE_NOTIFICATION = ID_MIRACAST_SERVICE + 1,
283292
ID_MIRACAST_PLAYER = ID_MIRACAST_SERVICE + 2,
284293
ID_MIRACAST_PLAYER_NOTIFICATION = ID_MIRACAST_SERVICE + 3,

0 commit comments

Comments
 (0)