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
diff --git a/libqdutils/qdMetaData.h b/libqdutils/qdMetaData.h
index 237c6f8..65ab1b7 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 @@
/* 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.