From 3948c467b81ef18a24036d7f4aa18298d13db784 Mon Sep 17 00:00:00 2001 From: arjunbinu <51983664+arjunbinu@users.noreply.github.com> Date: Tue, 3 Dec 2024 17:28:31 +0000 Subject: [PATCH] gh #44 Remove ODM specific apis - phase2 --- include/tvSettingsODM.h | 97 ---------------------------------------- include/tvTypesODM.h | 99 ----------------------------------------- 2 files changed, 196 deletions(-) diff --git a/include/tvSettingsODM.h b/include/tvSettingsODM.h index de54776..3c46e18 100644 --- a/include/tvSettingsODM.h +++ b/include/tvSettingsODM.h @@ -149,103 +149,6 @@ tvError_t GetWBctrl(char *inputSrc, char *colortemp, char *color, char *ctrl, in */ tvError_t SaveColorTemperatureUser(tvRGBType_t rgbType, int value,int boost); - -/** - * @brief Gets the supported HLG modes and their count. To be deprecated soon. - * @note SOC vendors can stub these ODM functions and mark it as weak - * - * This function returns the supported HLG modes and their count - * - * @param[out] dvModes[] - List of available HLG modes. Refer ::pic_modes_t and ::tvDolbyMode_t @n - * Valid values are "dark" and & "bright" for ::pic_modes_t.name @n - * Valid values are member of ::tvDolbyMode_t tvHLGMode_Dark and ::tvDolbyMode_t tvHLGMode_Bright @n - * for ::pic_modes_t.value. - * @param[out] count - Count of supported HLG modes. Max and min is 2 - * - * @return tvError_t - * - * @retval tvERROR_NONE - Success - * @retval tvERROR_INVALID_PARAM - Input parameter is invalid - * @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 GetTVSupportedHLGModesODM(pic_modes_t *dvModes[],unsigned short *count); - -/** - * @brief Sets the HLG mode. To be deprecated soon. - * @note SOC vendors can stub these ODM functions and mark it as weak - * - * This function sets the HLG mode in Dolby vision core. - * The change takes effect for current primary video source selected, primary video format if handled via Dolby vision core - * and picture mode selected, but not saved for future use. The value is discarded if primary video format or - * primary video source or picture mode changes. - * - * @param[in] hlgMode - HLG mode to be set. Valid values can be one of the - * strings from ::pic_modes_t.name parameter returned by GetTVSupportedHLGModesODM - * - * - * @return tvError_t - * - * @retval tvERROR_NONE - Success - * - * @retval tvERROR_INVALID_PARAM - Input 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 SetTVHLGModeODM(const char * hlgMode); - -/** - * @brief Gets the supported HDR10 modes and their count. To be deprecated soon. - * @note SOC vendors can stub these ODM functions and mark it as weak - * - * This function returns the supported HDR10 modes and their count - * - * @param[out] dvModes[] - List of available HDR10 modes. Refer ::pic_modes_t and ::tvDolbyMode_t @n - * Valid values are "dark" and & "bright" for ::pic_modes_t.name @n - * Valid values are member of ::tvDolbyMode_t tvHDR10Mode_Dark and ::tvDolbyMode_t tvHDR10Mode_Bright @n - * for ::pic_modes_t.value. - * @param[out] count - Count of supported HDR10 modes. Max and min is 2 - * - * @return tvError_t - * - * @retval tvERROR_NONE - Success - * @retval tvERROR_INVALID_PARAM - Input parameter is invalid - * @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 GetTVSupportedHDR10ModesODM(pic_modes_t *dvModes[],unsigned short *count); - -/** - * @brief Sets the HDR10 mode. To be deprecated soon. - * @note SOC vendors can stub these ODM functions and mark it as weak - * - * This function sets the HDR10 mode in Dolby vision core. - * The change takes effect for current primary video source selected, primary video format if handled via Dolby vision core - * and picture mode selected, but not saved for future use. The value is discarded if primary video format or - * primary video source or picture mode changes. - * - * @param[in] hdr10Mode - HDR10 mode to be set. Valid values can be one of the - * strings from ::pic_modes_t.name parameter returned by GetTVSupportedHDR10ModesODM - * - * @return tvError_t - * - * @retval tvERROR_NONE - Success - * @retval tvERROR_INVALID_PARAM - Input 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 SetTVHDR10ModeODM(const char * hdr10Mode); - #ifdef __cplusplus } #endif diff --git a/include/tvTypesODM.h b/include/tvTypesODM.h index f1f37e9..047cc21 100644 --- a/include/tvTypesODM.h +++ b/include/tvTypesODM.h @@ -58,105 +58,6 @@ extern "C" //ODM Specific Macros #define MAX_STRING_SIZE (15) //!< Defines the maximum size of string #define CONTROL_COUNT (2) //!< Defines the maximum WB control count -#define BACKLIGHT_CURVE_MAX_INDEX (101) -#define GENERIC_MODE_CONFIG_FILE "/etc/tv/allmodes.conf" -#define ALS_LUT_MAX_INDEX (513) -#define ALS_LUT_FILE_NAME "ALSToBackLightLUT.ini" - -typedef short int tvPictureMode_t; //!< Picture mode struct variable - - -/** - * @brief Enumeration defining supported HDR video formats - */ -typedef enum -{ - tvVideoHDRFormat_NONE= 0x00, //!< No video format - tvVideoHDRFormat_SDR = 0x01, //!< video format is SDR - tvVideoHDRFormat_HLG = 0x02, //!< video format is HLG - tvVideoHDRFormat_HDR10 = 0x04, //!< video format is HDR10 - tvVideoHDRFormat_HDR10PLUS = 0x08, //!< video format is HDR10plus - tvVideoHDRFormat_DV = 0x010, //!< video format is DV - tvVideoHDRFormat_MAX = 0x11 //!< End of enum -}tvVideoHDRFormat_t; - -#ifndef __VE_HDR_TYPE__ -#define __VE_HDR_TYPE__ -/** - * @brief Enumeration defining supported hdr types - */ -typedef enum tvhdr_type_e -{ - HDR_TYPE_NONE = 0, //!< No HDR Type - HDR_TYPE_HDR10 = 1, //!< HDR Type is HDR10 - HDR_TYPE_HDR10PLUS = 2, //!< HDR Type is HDR10PLUS - HDR_TYPE_DOVI = 3, //!< HDR Type is DOVI - HDR_TYPE_PRIMESL = 4, //!< HDR Type is PRIMESL - HDR_TYPE_HLG = 5, //!< HDR Type is HLG - HDR_TYPE_SDR = 6, //!< HDR Type is SDR - HDR_TYPE_MVC = 7, //!< HDR Type is MVC - HDR_TYPE_MAX //!< End of enum -} tvhdr_type_t; -#endif - -// ODM Specific. To be Depricated -typedef enum { - tvContentFormatType_NONE= 0x00, - tvContentFormatType_SDR = 0x01, - tvContentFormatType_HLG = 0x02, - tvContentFormatType_HDR10 = 0x03, - tvContentFormatType_HDR10PLUS = 0x04, - tvContentFormatType_DOVI = 0x05, - tvContentFormatType_MAX -}tvContentFormatType_t; - -//ODM specific. To be Depricated -/** - * @brief Enumeration defining supported component color types - */ -typedef enum -{ - COLOR_NONE = 0, //!< Color is None - COLOR_RED, //!< Color is Red - COLOR_GREEN, //!< Color is Green - COLOR_BLUE, //!< Color is Blue - COLOR_CYAN, //!< Color is Cyan - COLOR_MAGENTA, //!< Color is Megenta - COLOR_YELLOW, //!< Color is Yellow - COLOR_MAX //!< End of enum -}tvcomponent_color_type_t; - -//ODM specific. To be Depricated -/** - * @brief Enumeration defining supported component states - */ -typedef enum -{ - COMPONENT_DISABLE = 0, //!< State is Disable - COMPONENT_ENABLE, //!< State is Enable - COMPONENT_RESET, //!< State is Reset - COMPONENT_MAX //!< End of enum -}tvcomponent_state_t; - -//ODM specific. To be Depricated -typedef enum { - mfrColorTemp_STANDARD = 0, - mfrColorTemp_COLD, - mfrColorTemp_WARM, - mfrColorTemp_USER, - mfrColorTemp_MAX -}fp_mfrColorTemp_t; - -//ODM specific. To be Depricated -/** - * @brief Enumeration defining the colour temperature offset from different sources - */ - typedef enum input_source_offset_e { - HDMI_OFFSET_NEW = 0, //!< Color temperature offset for the source HDMI - TV_OFFSET_NEW = 4, //!< Color temperature offset for the source TV - AV_OFFSET_NEW = 8, //!< Color temperature offset for the source AV - MAX_OFFSET_NEW //!< End of enum -} input_source_offset_t; typedef struct getWBInfo { char wbControls[CONTROL_COUNT][MAX_STRING_SIZE];