From 75ff5a7f85f6417c03b5f5d736438d332dc71be3 Mon Sep 17 00:00:00 2001
From: davidevinavil <davidevinavil@gmail.com>
Date: Thu, 23 Mar 2017 20:30:46 +0100
Subject: camera: Move config xml to vendor

---
 configs/camera/msm8996_camera.xml     | 135 --------------------------------
 configs/camera/ov8865_chromatix.xml   | 138 --------------------------------
 configs/camera/s5k2m8sx_chromatix.xml | 143 ----------------------------------
 device.mk                             |   5 +-
 4 files changed, 1 insertion(+), 420 deletions(-)
 delete mode 100644 configs/camera/msm8996_camera.xml
 delete mode 100644 configs/camera/ov8865_chromatix.xml
 delete mode 100644 configs/camera/s5k2m8sx_chromatix.xml

diff --git a/configs/camera/msm8996_camera.xml b/configs/camera/msm8996_camera.xml
deleted file mode 100644
index c8e3d8f..0000000
--- a/configs/camera/msm8996_camera.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<!--
-  Copyright (c) 2015 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<!--
-CameraModuleConfig :
-	This node must be added for each module prosent in the device.
-	It contain all information about the module present.
-	The number of nodes of CameraModuleConfig indicate number of modules
-	to be probed on the device.
-	Maximum number of CameraModuleConfig nodes is 10
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-*CameraId :
-	Camera Id is the Slot number in which the mode is plugged.
-	Valid values are 0, 1, 2 and 3.
-*SensorName :
-	Name of the sensor present on the module.
-	The sensor library name should be of the form libmmcamera_<SensorName>.so
-ActuatorName :
-	Name of the actuator on this module.
-	The actuator library name should be of the form libactuator_<ActuatorName>.so.
-	If there is no actuator remove the <ActuatorName> node.
-EepromName :
-	Name of the eeprom on this module.
-	Eeprom lib name should be of the form libmmcamera_<EepromName>_eeprom.so
-	If there is no eeprom remove the <EepromName> node.
-FlashName :
-	Name of the flash on this module.
-	The flash library name should be of the form libflash_<FlashName>.so.
-	If there is no flash remove the <FlashName> node.
-ChromatixName :
-	Name of the tuning xml file.
-	Tuning file contains the list of chromatix library names.
-	If there is no tuning xml file remove the <ChromatixName> node.
-Position :
-	Position of the sensor module. Valid values are:
-	BACK, FRONT and BACK_AUX
-MountAngle :
-	Angle at which the sensor is mounted. Valid values are 0, 90, 180, 270 and 360.
-	To use default mountangle mentioned in kernel use 360.
-
-CsiInfo : This node contains information about the receiver configuration.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-*CSIDCore :
-	CSID core to receive the data. Valid values are 0, 1, 2 and 3.
-*LaneMask :
-	Mask to mention which lane is enabled.
-	LaneMask[0] for DL0.
-	LaneMask[1] for CLK.
-	LaneMask[2] for DL1.
-	LaneMask[3] for DL2.
-	LaneMask[4] for DL3
-*LaneAssign :
-	Number which describes the lane mapping between sensor and PHY.
-	LaneAssign[0:3] is sensor lane number connected to data lane 0 of PHY on MSM
-	LaneAssign[4:7] is sensor lane number connected to data lane 2 of PHY on MSM
-	LaneAssign[8:11] is sensor lane number connected to data lane 3 of PHY on MSM
-	LaneAssign[12:15] is sensor lane number connected to data lane 4 of PHY on MSM
-
-	NOTE : Lane 1 is reserved for the clock lane.
-		Wiring and setting it to a data lane is prohibited.
-ComboMode :
-	Flag to enable combo mode.
-	This flag is enabled if multiple sensors are using same CSI-PHY receiver
-
-LensInfo : Information of the lens present in the module.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-*FocalLength :
-	FocalLength of the lens in micometers.
-	Distance between the center of curvature to the focal point.
-*FNumber :
-	FNumber of the lens.
-*TotalFocusDistance : The total distance in meters the lens could focus.
-*HorizontalViewAngle : HorizontalViewAngle in degrees
-*VerticalViewAngle : VerticalViewAngle in degrees
-*MinFocusDistance : Minimum distance in meters the lens could focus.
-
-*VARIABLES MARKED WITH ASTRICK (*) ARE MANDATORY.
-
--->
-
-<CameraConfigurationRoot>
-  <CameraModuleConfig>
-    <CameraId>0</CameraId>
-    <SensorName>s5k2m8sx</SensorName>
-    <ActuatorName>dw9767</ActuatorName>
-    <EepromName>onsemi_cat24c64</EepromName>
-    <FlashName>pmic</FlashName>
-    <ChromatixName>s5k2m8sx_chromatix</ChromatixName>
-    <ModesSupported>1</ModesSupported>
-    <Position>BACK</Position>
-    <MountAngle>360</MountAngle>
-    <CSIInfo>
-      <CSIDCore>0</CSIDCore>
-      <LaneMask>0x1F</LaneMask>
-      <LaneAssign>0x4320</LaneAssign>
-      <ComboMode>0</ComboMode>
-    </CSIInfo>
-    <LensInfo>
-      <FocalLength>3.881</FocalLength>
-      <FNumber>2.2</FNumber>
-      <TotalFocusDistance>1.9</TotalFocusDistance>
-      <HorizontalViewAngle>67.52</HorizontalViewAngle>
-      <VerticalViewAngle>50.64</VerticalViewAngle>
-      <MinFocusDistance>0.1</MinFocusDistance>
-    </LensInfo>
-  </CameraModuleConfig>
-  <CameraModuleConfig>
-    <CameraId>2</CameraId>
-    <SensorName>ov8865</SensorName>
-    <EepromName>gt24c08h</EepromName>
-    <ChromatixName>ov8865_chromatix</ChromatixName>
-    <ModesSupported>1</ModesSupported>
-    <Position>FRONT</Position>
-    <MountAngle>360</MountAngle>
-    <CSIInfo>
-      <CSIDCore>2</CSIDCore>
-      <LaneMask>0x1F</LaneMask>
-      <LaneAssign>0x4320</LaneAssign>
-      <ComboMode>0</ComboMode>
-    </CSIInfo>
-    <LensInfo>
-      <FocalLength>3.47</FocalLength>
-      <FNumber>2.0</FNumber>
-      <TotalFocusDistance>1.97</TotalFocusDistance>
-      <HorizontalViewAngle>63.12</HorizontalViewAngle>
-      <VerticalViewAngle>47.34</VerticalViewAngle>
-      <MinFocusDistance>0.1</MinFocusDistance>
-    </LensInfo>
-  </CameraModuleConfig>
-</CameraConfigurationRoot>
diff --git a/configs/camera/ov8865_chromatix.xml b/configs/camera/ov8865_chromatix.xml
deleted file mode 100644
index 03d8992..0000000
--- a/configs/camera/ov8865_chromatix.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
-  Copyright (c) 2015 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!--
-CommonChromatixInfo:
-	CommonChromatixInfo is the information about chromatix needed for
-		various use cases.
-	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
-		3A and SW PostProc.
-	Entries in this node are common for all sensor modes.
-
-ResolutionChromatixInfo:
-	ResolutionChromatixInfo is the information about chromatix needed for
-		various use cases.
-	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
-		3A and SW PostProc.
-	Entries in this node are specific to sensor resolution.
-
-ChromatixName:
-	Contains the list of chromatix names for all modules.
-	special_mode_mask:
-		It is the bit mask for special modes, which is used for
-			chromatix selection.
-		Special modes can be any mode that needs a special chromatix.
-		Ex:- scene mode, DZOOM mode, OIS capture mode, flash mode
-		This is applicable for CommonChromatixInfo and
-			ResolutionChromatixInfo.
-		special_mode_mask="0" means none of the special modes are
-			selected.
-	sensor_resolution_index:
-		It is the sensor resolution index for which chromatix libraries
-			will be choosen.
-		It is applicable only in ResolutionChromatixInfo.
-
-ISPCommon :
-	Common tuning library name for ISP
-ISPPreview :
-	Preview tuning library name for ISP
-ISPSnapshot :
-	Snapshot tuning library name for ISP
-CPPCommon :
-	Common tuning library name for CPP
-CPPPreview :
-	Preview tuning library name for CPP
-CPPSnapshot :
-	Snapshot tuning library name for CPP
-CPPLiveshot :
-	Liveshot tuning library name for CPP
-PostProc :
-	Tuning library name for postproc module
-A3Preview :
-	Preview tuning library for 3A
-A3Video :
-	Video tuning library for 3A
-
-Order of Resolution Pick:
-	Assume the current sensor mode is "r" and special mode mask is "s".
-	Chromatix for a module and type is choosen in this order till we find a
-		valid chroamtix file name or else NULL is returned.
-	1) From ResolutionChromatixInfo node for which sensor_resolution_index
-		is "r" and special_mode_mask is "s".
-	2) From CommonChromatixInfo node for which special_mode_mask is "s".
-	3) From ResolutionChromatixInfo node for which sensor_resolution_index
-		is "r" and special_mode_mask is "0".
-	4) From CommonChromatixInfo node for which special_mode_mask is "0".
-	5) NULL is returned if we dont find in any of the above cases.
-
-special_mode_mask values:
-	SENSOR_SPECIAL_MODE_NONE = 0,
-	SENSOR_SPECIAL_MODE_FLASH = 1,
-	SENSOR_SPECIAL_MODE_ZOOM_UPSCALE = 2,
-	SENSOR_SPECIAL_MODE_ZOOM_DOWNSCALE = 4,
-	SENSOR_SPECIAL_MODE_OIS_CAPTURE = 8,
--->
-
-<ChromatixConfigurationRoot>
-  <CommonChromatixInfo>
-    <ChromatixName>
-      <ISPCommon>ov8865_common</ISPCommon>
-      <PostProc>ov8865_postproc</PostProc>
-      <CPPPreview>ov8865_cpp_preview</CPPPreview>
-      <CPPSnapshot>ov8865_cpp_snapshot</CPPSnapshot>
-      <CPPLiveshot>ov8865_cpp_liveshot</CPPLiveshot>
-    </ChromatixName>
-    <ChromatixName special_mode_mask="ZOOM_UPSCALE">
-      <CPPSnapshot>ov8865_cpp_us_chromatix</CPPSnapshot>
-    </ChromatixName>
-    <ChromatixName special_mode_mask="ZOOM_DOWNSCALE">
-      <CPPSnapshot>ov8865_cpp_ds_chromatix</CPPSnapshot>
-    </ChromatixName>
-  </CommonChromatixInfo>
-  <ResolutionChromatixInfo>
-    <ChromatixName sensor_resolution_index="0">
-      <ISPPreview>ov8865_snapshot</ISPPreview>
-      <ISPSnapshot>ov8865_snapshot</ISPSnapshot>
-      <ISPVideo>ov8865_video_full</ISPVideo>
-      <CPPPreview>ov8865_cpp_snapshot</CPPPreview>
-      <CPPVideo>ov8865_cpp_video_full</CPPVideo>
-      <A3Preview>ov8865_zsl_preview</A3Preview>
-      <A3Video>ov8865_zsl_video</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="1">
-      <ISPPreview>ov8865_preview</ISPPreview>
-      <ISPSnapshot>ov8865_snapshot</ISPSnapshot>
-      <ISPVideo>ov8865_default_video</ISPVideo>
-      <CPPVideo>ov8865_cpp_video</CPPVideo>
-      <A3Preview>ov8865_default_preview_none</A3Preview>
-      <A3Video>ov8865_default_video_none</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="2">
-      <ISPPreview>ov8865_hfr_60</ISPPreview>
-      <ISPSnapshot>ov8865_hfr_60</ISPSnapshot>
-      <ISPVideo>ov8865_hfr_60</ISPVideo>
-      <CPPVideo>ov8865_cpp_hfr_60</CPPVideo>
-      <A3Preview>ov8865_hfr_60_none</A3Preview>
-      <A3Video>ov8865_hfr_60_none</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="3">
-      <ISPPreview>ov8865_hfr_90</ISPPreview>
-      <ISPSnapshot>ov8865_hfr_90</ISPSnapshot>
-      <ISPVideo>ov8865_hfr_90</ISPVideo>
-      <CPPVideo>ov8865_cpp_hfr_90</CPPVideo>
-      <A3Preview>ov8865_hfr_90_none</A3Preview>
-      <A3Video>ov8865_hfr_90_none</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="4">
-      <ISPPreview>ov8865_hfr_120</ISPPreview>
-      <ISPSnapshot>ov8865_hfr_120</ISPSnapshot>
-      <ISPVideo>ov8865_hfr_120</ISPVideo>
-      <CPPVideo>ov8865_cpp_hfr_120</CPPVideo>
-      <A3Preview>ov8865_hfr_120_none</A3Preview>
-      <A3Video>ov8865_hfr_120_none</A3Video>
-    </ChromatixName>
-  </ResolutionChromatixInfo>
-</ChromatixConfigurationRoot>
diff --git a/configs/camera/s5k2m8sx_chromatix.xml b/configs/camera/s5k2m8sx_chromatix.xml
deleted file mode 100644
index f55ecc4..0000000
--- a/configs/camera/s5k2m8sx_chromatix.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<!--
-  Copyright (c) 2015 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!--
-CommonChromatixInfo:
-	CommonChromatixInfo is the information about chromatix needed for
-		various use cases.
-	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
-		3A and SW PostProc.
-	Entries in this node are common for all sensor modes.
-
-ResolutionChromatixInfo:
-	ResolutionChromatixInfo is the information about chromatix needed for
-		various use cases.
-	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
-		3A and SW PostProc.
-	Entries in this node are specific to sensor resolution.
-
-ChromatixName:
-	Contains the list of chromatix names for all modules.
-	special_mode_mask:
-		It is the bit mask for special modes, which is used for
-			chromatix selection.
-		Special modes can be any mode that needs a special chromatix.
-		Ex:- scene mode, DZOOM mode, OIS capture mode, flash mode
-		This is applicable for CommonChromatixInfo and
-			ResolutionChromatixInfo.
-		special_mode_mask="0" means none of the special modes are
-			selected.
-	sensor_resolution_index:
-		It is the sensor resolution index for which chromatix libraries
-			will be choosen.
-		It is applicable only in ResolutionChromatixInfo.
-
-ISPCommon :
-	Common tuning library name for ISP
-ISPPreview :
-	Preview tuning library name for ISP
-ISPSnapshot :
-	Snapshot tuning library name for ISP
-CPPCommon :
-	Common tuning library name for CPP
-CPPPreview :
-	Preview tuning library name for CPP
-CPPSnapshot :
-	Snapshot tuning library name for CPP
-CPPLiveshot :
-	Liveshot tuning library name for CPP
-PostProc :
-	Tuning library name for postproc module
-A3Preview :
-	Preview tuning library for 3A
-A3Video :
-	Video tuning library for 3A
-
-Order of Resolution Pick:
-	Assume the current sensor mode is "r" and special mode mask is "s".
-	Chromatix for a module and type is choosen in this order till we find a
-		valid chroamtix file name or else NULL is returned.
-	1) From ResolutionChromatixInfo node for which sensor_resolution_index
-		is "r" and special_mode_mask is "s".
-	2) From CommonChromatixInfo node for which special_mode_mask is "s".
-	3) From ResolutionChromatixInfo node for which sensor_resolution_index
-		is "r" and special_mode_mask is "0".
-	4) From CommonChromatixInfo node for which special_mode_mask is "0".
-	5) NULL is returned if we dont find in any of the above cases.
-
-special_mode_mask values:
-	SENSOR_SPECIAL_MODE_NONE = 0,
-	SENSOR_SPECIAL_MODE_FLASH = 1,
-	SENSOR_SPECIAL_MODE_ZOOM_UPSCALE = 2,
-	SENSOR_SPECIAL_MODE_ZOOM_DOWNSCALE = 4,
-	SENSOR_SPECIAL_MODE_OIS_CAPTURE = 8,
--->
-
-<ChromatixConfigurationRoot>
-  <CommonChromatixInfo>
-    <ChromatixName>
-      <ISPCommon>s5k2m8sx_common</ISPCommon>
-      <PostProc>s5k2m8sx_postproc</PostProc>
-    </ChromatixName>
-  </CommonChromatixInfo>
-  <ResolutionChromatixInfo>
-    <ChromatixName sensor_resolution_index="0">
-      <ISPPreview>s5k2m8sx_snapshot</ISPPreview>
-      <ISPSnapshot>s5k2m8sx_snapshot</ISPSnapshot>
-      <ISPVideo>s5k2m8sx_snapshot</ISPVideo>
-      <CPPPreview>s5k2m8sx_cpp_preview</CPPPreview>
-      <CPPSnapshot>s5k2m8sx_cpp_snapshot</CPPSnapshot>
-      <CPPVideo>s5k2m8sx_cpp_video</CPPVideo>
-      <CPPLiveshot>s5k2m8sx_cpp_liveshot</CPPLiveshot>
-      <A3Preview>s5k2m8sx_zsl_preview_dw9767</A3Preview>
-      <A3Video>s5k2m8sx_zsl_video_dw9767</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="1">
-      <ISPPreview>s5k2m8sx_preview</ISPPreview>
-      <ISPSnapshot>s5k2m8sx_preview</ISPSnapshot>
-      <ISPVideo>s5k2m8sx_preview</ISPVideo>
-      <CPPPreview>s5k2m8sx_cpp_preview</CPPPreview>
-      <CPPSnapshot>s5k2m8sx_cpp_snapshot</CPPSnapshot>
-      <CPPVideo>s5k2m8sx_cpp_video</CPPVideo>
-      <CPPLiveshot>s5k2m8sx_cpp_liveshot</CPPLiveshot>
-      <A3Preview>s5k2m8sx_default_preview_dw9767</A3Preview>
-      <A3Video>s5k2m8sx_default_video_dw9767</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="2">
-      <ISPPreview>s5k2m8sx_hfr_60</ISPPreview>
-      <ISPSnapshot>s5k2m8sx_hfr_60</ISPSnapshot>
-      <ISPVideo>s5k2m8sx_hfr_60</ISPVideo>
-      <CPPPreview>s5k2m8sx_cpp_hfr_60</CPPPreview>
-      <CPPSnapshot>s5k2m8sx_cpp_hfr_60</CPPSnapshot>
-      <CPPVideo>s5k2m8sx_cpp_hfr_60</CPPVideo>
-      <CPPLiveshot>s5k2m8sx_cpp_hfr_60</CPPLiveshot>
-      <A3Preview>s5k2m8sx_hfr_60_dw9767</A3Preview>
-      <A3Video>s5k2m8sx_hfr_60_dw9767</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="3">
-      <ISPPreview>s5k2m8sx_hfr_90</ISPPreview>
-      <ISPSnapshot>s5k2m8sx_hfr_90</ISPSnapshot>
-      <ISPVideo>s5k2m8sx_hfr_90</ISPVideo>
-      <CPPPreview>s5k2m8sx_cpp_hfr_90</CPPPreview>
-      <CPPSnapshot>s5k2m8sx_cpp_hfr_90</CPPSnapshot>
-      <CPPVideo>s5k2m8sx_cpp_hfr_90</CPPVideo>
-      <CPPLiveshot>s5k2m8sx_cpp_hfr_90</CPPLiveshot>
-      <A3Preview>s5k2m8sx_hfr_90_dw9767</A3Preview>
-      <A3Video>s5k2m8sx_hfr_90_dw9767</A3Video>
-    </ChromatixName>
-    <ChromatixName sensor_resolution_index="4">
-      <ISPPreview>s5k2m8sx_hfr_120</ISPPreview>
-      <ISPSnapshot>s5k2m8sx_hfr_120</ISPSnapshot>
-      <ISPVideo>s5k2m8sx_hfr_120</ISPVideo>
-      <CPPPreview>s5k2m8sx_cpp_hfr_120</CPPPreview>
-      <CPPSnapshot>s5k2m8sx_cpp_hfr_120</CPPSnapshot>
-      <CPPVideo>s5k2m8sx_cpp_hfr_120</CPPVideo>
-      <CPPLiveshot>s5k2m8sx_cpp_hfr_120</CPPLiveshot>
-      <A3Preview>s5k2m8sx_hfr_120_dw9767</A3Preview>
-      <A3Video>s5k2m8sx_hfr_120_dw9767</A3Video>
-    </ChromatixName>
-  </ResolutionChromatixInfo>
-</ChromatixConfigurationRoot>
diff --git a/device.mk b/device.mk
index 3b0da57..4d5d5e0 100755
--- a/device.mk
+++ b/device.mk
@@ -207,10 +207,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \
     $(LOCAL_PATH)/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
-    $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \
-    $(LOCAL_PATH)/configs/camera/msm8996_camera.xml:system/etc/camera/msm8996_camera.xml \
-    $(LOCAL_PATH)/configs/camera/ov8865_chromatix.xml:system/etc/camera/ov8865_chromatix.xml \
-    $(LOCAL_PATH)/configs/camera/s5k2m8sx_chromatix.xml:system/etc/camera/s5k2m8sx_chromatix.xml
+    $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml
 
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
-- 
cgit v1.2.3