Skip to content

Commit ace4f1f

Browse files
committed
Merge branch 'release/1.3.1' into main
2 parents c4ac377 + 88527ce commit ace4f1f

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

.github/workflows/L1-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ jobs:
435435
-DPLUGIN_AVINPUT=ON
436436
-DPLUGIN_HDMIINPUT=ON
437437
-DPLUGIN_HDCPPROFILE=ON
438-
-DPLUGIN_HDMICECSOURCE=OFF
438+
-DPLUGIN_HDMICECSOURCE=ON
439439
-DPLUGIN_HDMICECSINK=OFF
440440
-DUSE_THUNDER_R4=ON
441441
-DHIDE_NON_EXTERNAL_SYMBOLS=OFF
@@ -513,7 +513,7 @@ jobs:
513513
-DPLUGIN_AVINPUT=ON
514514
-DPLUGIN_HDMIINPUT=ON
515515
-DPLUGIN_HDCPPROFILE=ON
516-
-DPLUGIN_HDMICECSOURCE=OFF
516+
-DPLUGIN_HDMICECSOURCE=ON
517517
-DPLUGIN_HDMICECSINK=OFF
518518
-DRDK_SERVICES_L1_TEST=ON
519519
-DUSE_THUNDER_R4=ON

AVOutput/AVOutputTVHelper.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,13 @@ namespace Plugin {
321321
{
322322
tvDimmingMode_t index = tvDimmingMode_MAX;
323323

324-
if(mode.compare("local") == 0 ) {
324+
if(mode.compare("Local") == 0 ) {
325325
index=tvDimmingMode_Local;
326326
}
327-
else if(mode.compare("fixed") == 0 ) {
327+
else if(mode.compare("Fixed") == 0 ) {
328328
index=tvDimmingMode_Fixed;
329329
}
330-
else if(mode.compare("global") == 0 ) {
330+
else if(mode.compare("Global") == 0 ) {
331331
index=tvDimmingMode_Global;
332332
}
333333
else {
@@ -1514,13 +1514,13 @@ namespace Plugin {
15141514
return 0;
15151515
}
15161516
else if( forParam.compare("DimmingMode") == 0 ) {
1517-
if (strncmp(param.value, "fixed", strlen(param.value))==0) {
1517+
if (strncmp(param.value, "Fixed", strlen(param.value))==0) {
15181518
value=tvDimmingMode_Fixed;
15191519
}
1520-
else if (strncmp(param.value, "local", strlen(param.value))==0) {
1520+
else if (strncmp(param.value, "Local", strlen(param.value))==0) {
15211521
value=tvDimmingMode_Local;
15221522
}
1523-
else if (strncmp(param.value, "global", strlen(param.value))==0) {
1523+
else if (strncmp(param.value, "Global", strlen(param.value))==0) {
15241524
value=tvDimmingMode_Global;
15251525
}
15261526
return 0;
@@ -1683,9 +1683,9 @@ namespace Plugin {
16831683
void AVOutputTV::getDimmingModeStringFromEnum(int value, std::string &toStore)
16841684
{
16851685
const char *color_temp_string[] = {
1686-
[tvDimmingMode_Fixed] = "fixed",
1687-
[tvDimmingMode_Local] = "local",
1688-
[tvDimmingMode_Global] = "global",
1686+
[tvDimmingMode_Fixed] = "Fixed",
1687+
[tvDimmingMode_Local] = "Local",
1688+
[tvDimmingMode_Global] = "Global",
16891689
};
16901690
toStore.clear();
16911691
toStore+=color_temp_string[value];

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,19 @@ 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.3.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.3.0...1.3.1)
8+
9+
- RDKEMW-5512: Implement a fix for the SaveTVDimmingMode failure [`#157`](https://github.com/rdkcentral/entservices-inputoutput/pull/157)
10+
- RDKEMW-1015 - Update gtest [`#155`](https://github.com/rdkcentral/entservices-inputoutput/pull/155)
11+
- Merge tag '1.3.0' into develop [`2499e0b`](https://github.com/rdkcentral/entservices-inputoutput/commit/2499e0b71c2fbb9e9a303a342fbc4965da5b52c9)
12+
713
#### [1.3.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.2.0...1.3.0)
814

15+
> 20 June 2025
16+
917
- Feature/rdkemw 1015 comrpc [`#129`](https://github.com/rdkcentral/entservices-inputoutput/pull/129)
1018
- RDK-57440: Causing config issue for higher versions of cmake [`#146`](https://github.com/rdkcentral/entservices-inputoutput/pull/146)
19+
- RDK-57440 - Changelog updates for 1.3.0 [`cc4f369`](https://github.com/rdkcentral/entservices-inputoutput/commit/cc4f36979ba5a25a4ae96005b7e2c6dce1523044)
1120
- Merge tag '1.2.0' into develop [`7b1dccc`](https://github.com/rdkcentral/entservices-inputoutput/commit/7b1dccc6d7bbba3fdf649c900ad15996e6424a27)
1221

1322
#### [1.2.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.1.1...1.2.0)

Tests/L1Tests/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,10 @@ add_plugin_test_ex(PLUGIN_HDMIINPUT tests/test_HdmiInput.cpp "${HDMIINPUT_INC}"
114114
add_plugin_test_ex(PLUGIN_HDMICEC2 tests/test_HdmiCec2.cpp "../../HdmiCec_2" "${NAMESPACE}HdmiCec_2")
115115

116116
# PLUGIN_HDMICECSINK
117-
set (HDMICECSINK_INC ${CMAKE_SINK_DIR}/../entservices-inputoutput/HdmiCecSink ${CMAKE_SINK_DIR}/../entservices-inputoutput/helpers)
117+
set (HDMICECSINK_INC ${CMAKE_SOURCE_DIR}/../entservices-inputoutput/HdmiCecSink ${CMAKE_SOURCE_DIR}/../entservices-inputoutput/helpers)
118118
set (HDMICECSINK_LIBS ${NAMESPACE}HdmiCecSink ${NAMESPACE}HdmiCecSinkImplementation)
119119
add_plugin_test_ex(PLUGIN_HDMICECSINK tests/test_HdmiCecSink.cpp "${HDMICECSINK_INC}" "${HDMICECSINK_LIBS}")
120120

121-
122121
# PLUGIN_HDMICECSOURCE
123122
set (HDMICECSOURCE_INC ${CMAKE_SOURCE_DIR}/../entservices-inputoutput/HdmiCecSource ${CMAKE_SOURCE_DIR}/../entservices-inputoutput/helpers)
124123
set (HDMICECSOURCE_LIBS ${NAMESPACE}HdmiCecSource ${NAMESPACE}HdmiCecSourceImplementation)

Tests/L1Tests/tests/test_HdmiCecSink.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
#include <fstream>
2323
#include <string>
2424

25+
26+
#include "HdmiCecSinkImplementation.h"
27+
#include "HdmiCecSinkMock.h"
2528
#include "HdmiCecSink.h"
2629
#include "FactoriesImplementation.h"
2730
#include "IarmBusMock.h"

0 commit comments

Comments
 (0)