From 07eae575b6e77e685218a771343e243555f8325f Mon Sep 17 00:00:00 2001
From: Saurabh Dubey <sdubey@codeaurora.org>
Date: Mon, 12 Mar 2018 21:58:49 +0530
Subject: [PATCH] qdMetaData: Remove USE_COLOR_METADATA macro

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

Change-Id: I7980fbb8bc64b82bce66949d0db440d3ab9bf0c4
CRs-Fixed: 2205473
---
 libqdutils/qdMetaData.cpp | 6 +-----
 libqdutils/qdMetaData.h   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/libqdutils/qdMetaData.cpp b/libqdutils/qdMetaData.cpp
index 5c39133a..e7ab48cd 100644
--- a/libqdutils/qdMetaData.cpp
+++ b/libqdutils/qdMetaData.cpp
@@ -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
  * 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);
             break;
         case COLOR_METADATA:
-#ifdef USE_COLOR_METADATA
             data->color = *((ColorMetaData *)param);
-#endif
             break;
         case SET_UBWC_CR_STATS_INFO: {
              struct UBWCStats* stats = (struct UBWCStats*)param;
@@ -252,12 +250,10 @@ int getMetaDataVa(MetaData_t *data, DispFetchParamType paramType,
             }
             break;
         case GET_COLOR_METADATA:
-#ifdef USE_COLOR_METADATA
             if (data->operation & COLOR_METADATA) {
                 *((ColorMetaData *)param) = data->color;
                 ret = 0;
             }
-#endif
             break;
         case GET_UBWC_CR_STATS_INFO:
             if (data->operation & SET_UBWC_CR_STATS_INFO) {
diff --git a/libqdutils/qdMetaData.h b/libqdutils/qdMetaData.h
index 237c6f84..65ab1b7c 100644
--- a/libqdutils/qdMetaData.h
+++ b/libqdutils/qdMetaData.h
@@ -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
  * modification, are permitted provided that the following conditions are
@@ -30,9 +30,7 @@
 #ifndef _QDMETADATA_H
 #define _QDMETADATA_H
 
-#ifdef USE_COLOR_METADATA
 #include <color_metadata.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -126,10 +124,8 @@ struct MetaData_t {
 
     /* Set by camera to program the VT Timestamp */
     uint64_t vtTimeStamp;
-#ifdef USE_COLOR_METADATA
     /* Color Aspects + HDR info */
     ColorMetaData color;
-#endif
     /* Consumer should read this data as follows based on
      * Gralloc flag "interlaced" listed above.
      * [0] : If it is progressive.