Skip to content

Commit 24e3e67

Browse files
committed
RDKEMW-5197 : Discard CMS Changes
1 parent 0365734 commit 24e3e67

File tree

2 files changed

+4
-37
lines changed

2 files changed

+4
-37
lines changed

AVOutput/AVOutputTV.h

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373
#define STRING_COLORTEMPERATURE "ColorTemperature."
7474
#define CREATE_DIRTY(__X__) (__X__+=STRING_DIRTY)
7575
#define CAPABLITY_FILE_NAME "pq_capabilities.ini"
76-
#define CAPABILITY_FILE_NAMEV2 "/etc/pq_capabilities.json"
77-
7876

7977
class CIniFile
8078
{
@@ -439,38 +437,6 @@ class AVOutputTV : public AVOutputBase {
439437
static void initializeReverseMaps();
440438
static const std::unordered_map<std::string, int> backlightModeReverseMap;
441439

442-
tvError_t ReadJsonFile(JsonObject& root);
443-
tvError_t ExtractContextCaps(const JsonObject& data, tvContextCaps_t** context_caps);
444-
tvError_t ExtractRangeInfo(const JsonObject& data, int* max_value);
445-
std::vector<tvConfigContext_t> ParseContextCaps(const JsonObject& context);
446-
tvContextCaps_t* AllocateContextCaps(const std::vector<tvConfigContext_t>& contexts);
447-
tvError_t GetCaps(const std::string& key, int* max_value, tvContextCaps_t** context_caps);
448-
449-
tvError_t GetDVCalibrationCaps(tvDVCalibrationSettings_t **min_values, tvDVCalibrationSettings_t **max_values, tvContextCaps_t **context_caps);
450-
tvError_t GetBacklightModeCaps(tvBacklightMode_t** backlight_mode, size_t* num_backlight_mode, tvContextCaps_t** context_caps);
451-
tvError_t GetLocalContrastEnhancementCaps(int* maxLocalContrastEnhancement, tvContextCaps_t** context_caps);
452-
tvError_t GetMPEGNoiseReductionCaps(int* maxMPEGNoiseReduction, tvContextCaps_t** context_caps);
453-
tvError_t GetDigitalNoiseReductionCaps(int* maxDigitalNoiseReduction, tvContextCaps_t** context_caps);
454-
tvError_t GetMultiPointWBCaps(int* num_hal_matrix_points,
455-
int* rgb_min,
456-
int* rgb_max,
457-
int* num_ui_matrix_points,
458-
double** ui_matrix_positions,
459-
tvContextCaps_t** context_caps);
460-
tvError_t GetCMSCaps(int* max_hue,
461-
int* max_saturation,
462-
int* max_luma,
463-
tvDataComponentColor_t** color,
464-
tvComponentType_t** component,
465-
size_t* num_color,
466-
size_t* num_component,
467-
tvContextCaps_t** context_caps);
468-
tvError_t GetCustom2PointWhiteBalanceCaps( int *min_gain,
469-
int *min_offset, int *max_gain,
470-
int *max_offset, tvWBColor_t **color,
471-
tvWBControl_t **control, size_t* num_color,
472-
size_t* num_control, tvContextCaps_t ** context_caps);
473-
474440
uint32_t getPQCapabilityWithContext(
475441
const std::function<tvError_t(tvContextCaps_t**, int*)>& getCapsFunc,
476442
const JsonObject& parameters,

AVOutput/AVOutputTVHelper.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,8 +1377,9 @@ namespace Plugin {
13771377
if (m_MEMCStatus == tvERROR_NONE) {
13781378
updateAVoutputTVParamV2("sync", "MEMC", paramJson, PQ_PARAM_MEMC, level);
13791379
}
1380-
1381-
m_cmsStatus = GetCMSCaps(&m_maxCmsHue, &m_maxCmsSaturation, &m_maxCmsLuma,
1380+
1381+
//Commented due to missing HAL implementation
1382+
/*m_cmsStatus = GetCMSCaps(&m_maxCmsHue, &m_maxCmsSaturation, &m_maxCmsLuma,
13821383
&m_cmsColorArr, &m_cmsComponentArr,
13831384
&m_numColor, &m_numComponent, &m_cmsCaps);
13841385
if (m_cmsStatus == tvERROR_NONE) {
@@ -1391,7 +1392,7 @@ namespace Plugin {
13911392
m_cmsComponentList.push_back(componentStr);
13921393
}
13931394
syncCMSParamsV2();
1394-
}
1395+
}*/
13951396
if(m_cmsStatus == tvERROR_OPERATION_NOT_SUPPORTED)
13961397
{
13971398
syncCMSParams();

0 commit comments

Comments
 (0)