Merge branch 'release/1.3.0'

rdkcentral · Jul 12, 2024 · c041ef9 · c041ef9
2 parents 43bc67f + 25743a5
commit c041ef9
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,23 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.3.0](https://github.com/rdkcentral/rdkv-halif-tvsettings/compare/1.2.0...1.3.0)
+
+- gh #23 HAL Interface update for default values [`#24`](https://github.com/rdkcentral/rdkv-halif-tvsettings/pull/24)
+- gh #19 PQ capabilites_ini_changes [`#15`](https://github.com/rdkcentral/rdkv-halif-tvsettings/pull/15)
+- gh #17 Post Requirement changes for the TV setting interface. [`#18`](https://github.com/rdkcentral/rdkv-halif-tvsettings/pull/18)
+- gh #19 Added index for different capabilities [`36b298f`](https://github.com/rdkcentral/rdkv-halif-tvsettings/commit/36b298feaaa2264f32748d9aad6e76e1297eb34b)
+- gh #19 Updated hal spec document for composite input [`86cc71b`](https://github.com/rdkcentral/rdkv-halif-tvsettings/commit/86cc71bdf50db36690c81c9c5e7d7191316a71d5)
+- gh #23 review comment update for FMM AVI infoframe [`fcb8764`](https://github.com/rdkcentral/rdkv-halif-tvsettings/commit/fcb8764b5c144518772af324aa78fd894111c747)
+
 #### [1.2.0](https://github.com/rdkcentral/rdkv-halif-tvsettings/compare/1.1.7...1.2.0)
 
+> 7 March 2024
+
 - gh #12 Add supercool wb support [`#13`](https://github.com/rdkcentral/rdkv-halif-tvsettings/pull/13)
+- bumped change log [`b90c8b7`](https://github.com/rdkcentral/rdkv-halif-tvsettings/commit/b90c8b70371988bf3132483ef33978ddf64156fd)
 - gh #12 addressed review comment [`0e6e503`](https://github.com/rdkcentral/rdkv-halif-tvsettings/commit/0e6e5034a0e3fb79ae29e00b2d635a6efb699763)
 - gh #12 change enum sequnce for backward compatibility [`5504305`](https://github.com/rdkcentral/rdkv-halif-tvsettings/commit/55043055b7bafa2ba8771f3d64af18c80a21e922)
-- Merge tag '1.1.7' into develop [`613b55e`](https://github.com/rdkcentral/rdkv-halif-tvsettings/commit/613b55ed739b92cbba885e252719ecc06ddfd429)
 
 #### [1.1.7](https://github.com/rdkcentral/rdkv-halif-tvsettings/compare/1.1.6...1.1.7)
 

diff --git a/config/pq_capablities.ini b/config/pq_capablities.ini
@@ -217,39 +217,39 @@ format = SDR,HDR10,HLG,DV
 source = Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
-[ComponentHueBlue]
+[ComponentLumaBlue]
 range_from  = 0
 range_to  = 100
 pqmode = Entertainment,Dynamic,Expert,Movie,Sports
 format = SDR,HDR10,HLG,DV
 source = Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
-[ComponentHueGreen]
+[ComponentLumaGreen]
 range_from  = 0
 range_to  = 100
 pqmode = Entertainment,Dynamic,Expert,Movie,Sports
 format = SDR,HDR10,HLG,DV
 source = Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
-[ComponentHueYellow]
+[ComponentLumaYellow]
 range_from  = 0
 range_to  = 100
 pqmode = Entertainment,Dynamic,Expert,Movie,Sports
 format = SDR,HDR10,HLG,DV
 source = Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
-[ComponentHueCyan]
+[ComponentLumaCyan]
 range_from  = 0
 range_to  = 100
 pqmode = Entertainment,Dynamic,Expert,Movie,Sports
 format = SDR,HDR10,HLG,DV
 source = Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
-[ComponentHueMagenta]
+[ComponentLumaMagenta]
 range_from  = 0
 range_to  = 100
 pqmode = Entertainment,Dynamic,Expert,Movie,Sports
@@ -259,25 +259,29 @@ platformsupport = true
 
 [DimmingMode]
 range  = local,fixed
+index  = 1,0
 pqmode = Entertainment,Dynamic,Expert,Movie,Sports
 format = SDR,HDR10,HLG,DV
 source = Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 
 [BacklightControl]
 range  = manual,ambient
+index  = 1,2
 pqmode = none
 source = none
 format = none
 
 [DolbyVisionMode]
 range  = Dark,Bright
+index  = 0,1
 pqmode = Entertainment,Dynamic,Expert,Movie,Sports
 format = none
 source = HDMI1,HDMI2,HDMI3,IP,Tuner,Composite1
 platformsupport = true
 
 [AspectRatio]
 range  = TV AUTO,TV DIRECT,TV NORMAL,TV 16X9 STRETCH,TV 4X3 PILLARBOX,TV ZOOM
+index = 4,5,3,1,0,6
 pqmode = none
 source = none
 format = none

diff --git a/docs/pages/tv-settings_halSpec.md b/docs/pages/tv-settings_halSpec.md
@@ -127,9 +127,9 @@ Picture profile database will have 5 types of tables:
 | HDMI3 | Repeat as HDMI1 |
 | Tunner | Repeat as HDMI1 |
 | IP | Repeat as HDMI1 |
-| Composite | Repeat as HDMI1 for SDR and Entertainment |
+| Composite | Repeat as HDMI1 |
 
-Note: Currently Dolby mode is treated as a picture property and not a picture mode. In future Dolby mode might be treated as picture mode.
+Note: Currently Dolby mode is treated as a picture property and not a picture mode. In future Dolby mode might be treated as picture mode. Values of index in pq_capabilites.ini are mapped to enum values in tvTypes.h
 
 ##### Picture Association Table
 | Video Source | Video Format | Picture Mode |
@@ -150,7 +150,7 @@ Note: Currently Dolby mode is treated as a picture property and not a picture mo
 | HDMI3 | Repeat as HDMI1 |
 | Tunner | Repeat as HDMI1 |
 | IP | Repeat as HDMI1 |
-| Composite | Repeat as HDMI1 for SDR and Entertainment |
+| Composite | Repeat as HDMI1 |
 
 ##### WB Table
 | Video Source | White Balance | Property | Value Range |
@@ -172,7 +172,7 @@ Note: Currently Dolby mode is treated as a picture property and not a picture mo
 | HDMI3 | Repeat as HDMI1 |
 | Tunner | Repeat as HDMI1 |
 | IP | Repeat as HDMI1 |
-| Composite | Repeat as HDMI1 for SDR and Entertainment |
+| Composite | Repeat as HDMI1 |
 
 ##### Gamma Table
 | Gamma | Index | Property | Value Range |