gh #25 updated pq capabilities

rdkcentral · Nov 8, 2024 · d5ef30e · d5ef30e
1 parent d37668d
commit d5ef30e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 77 deletions.
diff --git a/config/pq_capablities.ini b/config/pq_capablities.ini
@@ -1,46 +1,46 @@
 [Brightness]
 range_from  = 0
 range_to = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Vivid,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [Contrast]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Vivid,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [Saturation]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [Sharpness]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [Hue]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ColorTemperature]
 range  = Standard,Warm,Cold,UserDefined
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
@@ -114,159 +114,159 @@ platformsupport = true
 [Backlight]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentSaturationRed]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentSaturationBlue]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentSaturationGreen]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentSaturationYellow]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentSaturationCyan]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentSaturationMagenta]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentHueRed]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentHueBlue]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentHueGreen]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentHueYellow]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentHueCyan]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentHueMagenta]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentLumaRed]
 range_from  = 0
 range_to  = 30
-pqmode = Expert
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentLumaBlue]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentLumaGreen]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentLumaYellow]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentLumaCyan]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [ComponentLumaMagenta]
 range_from  = 0
 range_to  = 100
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
 
 [DimmingMode]
 range  = local,fixed
 index  = 1,0
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,Composite1,HDMI1,HDMI2,HDMI3,IP,Tuner
 platformsupport = true
@@ -282,23 +282,23 @@ platformsupport = true
 [DolbyVisionMode]
 range  = Dark,Bright
 index  = 0,1
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = none
 source = All,HDMI1,HDMI2,HDMI3,IP,Tuner,Composite1
 platformsupport = true
 
 [HDR10Mode]
 range  = Dark,Bright
 index  = 3,4
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = none
 source = All,HDMI1,HDMI2,HDMI3,IP,Tuner,Composite1
 platformsupport = true
 
 [HLGMode]
 range  = Dark,Bright
 index  = 6,7
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = none
 source = All,HDMI1,HDMI2,HDMI3,IP,Tuner,Composite1
 platformsupport = true
@@ -314,21 +314,21 @@ platformsupport = true
 [LowLatencyState]
 range_from  = 0
 range_to  = 1
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,HDMI1,HDMI2,HDMI3,IP,Tuner,Composite1
 platformsupport = true
 
 [LocalDimmingLevel]
 range = 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,255
-pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
+pqmode = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
 format = SDR,HDR10,HLG,DV
 source = All,HDMI1,HDMI2,HDMI3,IP,Tuner,Composite1
 platformsupport = true
 
 [PictureMode]
-range  = Entertainment,Dynamic,Expert,Movie,Sports,Graphics
-index = 0,1,3,4,8,9
+range  = Entertainment,Dynamic,Expert,Movie,Sports,Graphics,Dynamic2
+index = 0,1,3,4,8,9,11
 pqmode = none
 format = SDR,HDR10,HLG,DV
 source = All,HDMI1,HDMI2,HDMI3,IP,Tuner,Composite1
@@ -364,4 +364,4 @@ DimmingLevel = nonboost,boost,burst
 pqmode = none
 format = none
 source = none
-isPlatformSupport = true
+platformsupport = true
diff --git a/include/tvSettings.h b/include/tvSettings.h
@@ -1288,48 +1288,6 @@ tvError_t SetDynamicGamma(double tvGammaValue);
  */
 tvError_t GetTVSupportedDolbyVisionModes(tvDolbyMode_t *dvModes[],unsigned short *count);
 
-/**
- * @brief Gets the supported HDR10 modes and their count
- *
- * This function returns the supported HDR10 modes and their count
- *
- * @param[out] HDR10Modes[]            - List of available HDR10 modes. Refer ::tvDolbyMode_t @n
- *                                     Valid values are member of ::tvDolbyMode_t
- * @param[out] count                - Count of supported HDR10 modes. Max is tvMode_Max and min is 0
- *
- * @return tvError_t
- *
- * @retval tvERROR_NONE                      - Success
- * @retval tvERROR_INVALID_PARAM             - Parameter is invalid
- * @retval tvERROR_INVALID_STATE             - Interface is not initialized
- * @retval tvERROR_OPERATION_NOT_SUPPORTED   - Operation is not supported
- * @retval tvERROR_GENERAL                   - Underlying failures - SoC, memory, etc
- *
- * @pre TvInit() should be called before calling this API
- */
-tvError_t GetTVSupportedHDR10Modes(tvDolbyMode_t *HDR10Modes[],unsigned short *count)
-
-/**
- * @brief Gets the supported HLG modes and their count
- *
- * This function returns the supported Dolby Vision modes and their count
- *
- * @param[out] HLGModes[]            - List of available HLG modes. Refer ::tvDolbyMode_t @n
- *                                    Valid values are member of ::tvDolbyMode_t
- * @param[out] count                - Count of supported HLG modes. Max is tvMode_Max and min is 0
- *
- * @return tvError_t
- *
- * @retval tvERROR_NONE                      - Success
- * @retval tvERROR_INVALID_PARAM             - Parameter is invalid
- * @retval tvERROR_INVALID_STATE             - Interface is not initialized
- * @retval tvERROR_OPERATION_NOT_SUPPORTED   - Operation is not supported
- * @retval tvERROR_GENERAL                   - Underlying failures - SoC, memory, etc
- *
- * @pre TvInit() should be called before calling this API
- */
-tvError_t GetTVSupportedHLGModes(tvDolbyMode_t *HLGModes[],unsigned short *count)
-
 /**
  * @brief Sets dolby vision mode
  *
@@ -2353,7 +2311,7 @@ tvError_t SetGammaPattern(int is_10_bit, int R_Value, int G_Value, int B_Value);
  * @pre TvInit() should be called before calling this API
  */
 
-tvError_t GetTVGammaTarget(tvColorTemp_t colorTemp,double *x, double *y)
+tvError_t GetTVGammaTarget(tvColorTemp_t colorTemp,double *x, double *y);
 
 /**
  * @brief Sets the gamma pattern mode

diff --git a/include/tvTypes.h b/include/tvTypes.h
@@ -327,6 +327,7 @@ typedef enum tvPQModeIndex {
     PQ_MODE_SPORTS =8 ,                         //!< Picture mode is "Sports" */
     PQ_MODE_GRAPHICS =9 ,                       //!< Picture mode is "Graphics" */
     PQ_MODE_FMM =10,                            //!< Picture mode is "Filmmaker" */
+    PQ_MODE_VIVID2 =11,                         //!< Picture mode is "Vivid2 or Dynamic2" */
     PQ_MODE_MAX=15                              //!< End of enum
 }tvPQModeIndex_t;