LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdMetaData: Remove USE_COLOR_METADATA macro

Browse Source 
Remove USE_COLOR_METADATA macro from all places
and execute color_metadata specific code unconditionally.

Change-Id: I7980fbb8bc64b82bce66949d0db440d3ab9bf0c4
CRs-Fixed: 2205473
This commit is contained in:
Saurabh Dubey
2018-03-12 21:58:49 +05:30
committed by Gerrit - the friendly Code Review server
parent 11142edc2d
commit 07eae575b6
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libqdutils/qdMetaData.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -120,9 +120,7 @@ int setMetaDataVa(MetaData_t *data, DispParamType paramType,
data->vtTimeStamp = *((uint64_t *)param); data->vtTimeStamp = *((uint64_t *)param);
break; break;
case COLOR_METADATA: case COLOR_METADATA:
#ifdef USE_COLOR_METADATA
data->color = *((ColorMetaData *)param); data->color = *((ColorMetaData *)param);
#endif
break; break;
case SET_UBWC_CR_STATS_INFO: { case SET_UBWC_CR_STATS_INFO: {
struct UBWCStats* stats = (struct UBWCStats*)param; struct UBWCStats* stats = (struct UBWCStats*)param;
@@ -252,12 +250,10 @@ int getMetaDataVa(MetaData_t *data, DispFetchParamType paramType,
} }
break; break;
case GET_COLOR_METADATA: case GET_COLOR_METADATA:
#ifdef USE_COLOR_METADATA
if (data->operation & COLOR_METADATA) { if (data->operation & COLOR_METADATA) {
*((ColorMetaData *)param) = data->color; *((ColorMetaData *)param) = data->color;
ret = 0; ret = 0;
} }
#endif
break; break;
case GET_UBWC_CR_STATS_INFO: case GET_UBWC_CR_STATS_INFO:
if (data->operation & SET_UBWC_CR_STATS_INFO) { if (data->operation & SET_UBWC_CR_STATS_INFO) {

6
libqdutils/qdMetaData.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -30,9 +30,7 @@
#ifndef _QDMETADATA_H #ifndef _QDMETADATA_H
#define _QDMETADATA_H #define _QDMETADATA_H
#ifdef USE_COLOR_METADATA
#include <color_metadata.h> #include <color_metadata.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -126,10 +124,8 @@ struct MetaData_t {
/* Set by camera to program the VT Timestamp */ /* Set by camera to program the VT Timestamp */
uint64_t vtTimeStamp; uint64_t vtTimeStamp;
#ifdef USE_COLOR_METADATA
/* Color Aspects + HDR info */ /* Color Aspects + HDR info */
ColorMetaData color; ColorMetaData color;
#endif
/* Consumer should read this data as follows based on /* Consumer should read this data as follows based on
* Gralloc flag "interlaced" listed above. * Gralloc flag "interlaced" listed above.
* [0] : If it is progressive. * [0] : If it is progressive.