sanders: add camera configs

This commit is contained in:
Vachounet
2017-09-20 13:45:12 +02:00
parent ca5f9ba096
commit 248ecd6b43
8 changed files with 411 additions and 223 deletions

View File

@@ -1,5 +1,5 @@
<!-- <!--
Copyright (c) 2016 Qualcomm Technologies, Inc. Copyright (c) 2015 Qualcomm Technologies, Inc.
All Rights Reserved. All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc. Confidential and Proprietary - Qualcomm Technologies, Inc.
--> -->
@@ -78,32 +78,30 @@ special_mode_mask values:
<ChromatixConfigurationRoot> <ChromatixConfigurationRoot>
<CommonChromatixInfo> <CommonChromatixInfo>
<ChromatixName special_mode_mask="0"> <ChromatixName>
<ISPCommon>mot_ov5695_common</ISPCommon> <ISPCommon>imx219_common</ISPCommon>
<PostProc>mot_ov5695_postproc</PostProc> <PostProc>imx219_postproc</PostProc>
<CPPPreview>mot_ov5695_cpp_snapshot</CPPPreview> <CPPPreview>imx219_cpp_preview</CPPPreview>
<CPPSnapshot>mot_ov5695_cpp_snapshot</CPPSnapshot> <CPPSnapshot>imx219_cpp_snapshot</CPPSnapshot>
<CPPLiveshot>mot_ov5695_cpp_liveshot</CPPLiveshot> <CPPLiveshot>imx219_cpp_liveshot</CPPLiveshot>
</ChromatixName> </ChromatixName>
</CommonChromatixInfo> </CommonChromatixInfo>
<ResolutionChromatixInfo> <ResolutionChromatixInfo>
<ChromatixName sensor_resolution_index="0" special_mode_mask="0"> <ChromatixName sensor_resolution_index="0">
<ISPPreview>mot_ov5695_snapshot</ISPPreview> <ISPPreview>imx219_snapshot</ISPPreview>
<ISPSnapshot>mot_ov5695_snapshot</ISPSnapshot> <ISPSnapshot>imx219_snapshot</ISPSnapshot>
<ISPVideo>mot_ov5695_default_video</ISPVideo> <ISPVideo>imx219_video_full</ISPVideo>
<ISPLiveshot>mot_ov5695_snapshot</ISPLiveshot> <CPPVideo>imx219_cpp_video_full</CPPVideo>
<CPPVideo>mot_ov5695_cpp_video</CPPVideo> <A3Preview>imx219_zsl_preview_3a</A3Preview>
<A3Preview>mot_ov5695_snapshot_3a</A3Preview> <A3Video>imx219_zsl_video_3a</A3Video>
<A3Video>mot_ov5695_default_video_3a</A3Video>
</ChromatixName> </ChromatixName>
<ChromatixName sensor_resolution_index="1" special_mode_mask="0"> <ChromatixName sensor_resolution_index="1">
<ISPPreview>mot_ov5695_hfr_120</ISPPreview> <ISPPreview>imx219_hfr_120</ISPPreview>
<ISPSnapshot>mot_ov5695_hfr_120</ISPSnapshot> <ISPSnapshot>imx219_hfr_120</ISPSnapshot>
<ISPVideo>mot_ov5695_hfr_120</ISPVideo> <ISPVideo>imx219_hfr_120</ISPVideo>
<ISPLiveshot>mot_ov5695_hfr_120</ISPLiveshot> <CPPVideo>imx219_cpp_hfr_120</CPPVideo>
<CPPVideo>mot_ov5695_cpp_hfr_120</CPPVideo> <A3Preview>imx219_hfr_120_3a</A3Preview>
<A3Preview>mot_ov5695_hfr_120_3a</A3Preview> <A3Video>imx219_hfr_120_3a</A3Video>
<A3Video>mot_ov5695_hfr_120_3a</A3Video>
</ChromatixName> </ChromatixName>
</ResolutionChromatixInfo> </ResolutionChromatixInfo>
</ChromatixConfigurationRoot> </ChromatixConfigurationRoot>

View File

@@ -78,57 +78,46 @@ special_mode_mask values:
<ChromatixConfigurationRoot> <ChromatixConfigurationRoot>
<CommonChromatixInfo> <CommonChromatixInfo>
<ChromatixName special_mode_mask="0"> <ChromatixName>
<ISPCommon>mot_s5k2l7sa_common</ISPCommon> <ISPCommon>mot_imx258_bear_common</ISPCommon>
<PostProc>mot_s5k2l7sa_postproc</PostProc> <PostProc>mot_imx258_bear_postproc</PostProc>
</ChromatixName> <CPPPreview>mot_imx258_bear_cpp_preview</CPPPreview>
<ChromatixName special_mode_mask="MOT_4K_VIDEO"> <CPPSnapshot>mot_imx258_bear_cpp_snapshot</CPPSnapshot>
<ISPVideo>mot_s5k2l7sa_video_4k</ISPVideo> <CPPLiveshot>mot_imx258_bear_cpp_liveshot</CPPLiveshot>
<CPPVideo>mot_s5k2l7sa_cpp_video_4k</CPPVideo>
<A3Video>mot_s5k2l7sa_4k_video_3a</A3Video>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_ALTM_IHDR_VIDEO">
<ISPVideo>mot_s5k2l7sa_ihdr_video</ISPVideo>
<A3Video>mot_s5k2l7sa_ihdr_video_3a</A3Video>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_4K_IHDR_VIDEO">
<ISPVideo>mot_s5k2l7sa_ihdr_video_4k</ISPVideo>
<A3Video>mot_s5k2l7sa_4k_ihdr_video_3a</A3Video>
</ChromatixName> </ChromatixName>
</CommonChromatixInfo> </CommonChromatixInfo>
<ResolutionChromatixInfo> <ResolutionChromatixInfo>
<ChromatixName sensor_resolution_index="0" special_mode_mask="0"> <ChromatixName sensor_resolution_index="0">
<ISPPreview>mot_s5k2l7sa_snapshot</ISPPreview> <ISPPreview>mot_imx258_bear_snapshot</ISPPreview>
<ISPSnapshot>mot_s5k2l7sa_snapshot</ISPSnapshot> <ISPSnapshot>mot_imx258_bear_snapshot</ISPSnapshot>
<ISPVideo>mot_s5k2l7sa_default_video</ISPVideo> <ISPVideo>mot_imx258_bear_default_video</ISPVideo>
<CPPPreview>mot_s5k2l7sa_cpp_preview</CPPPreview> <CPPVideo>mot_imx258_bear_cpp_video</CPPVideo>
<CPPSnapshot>mot_s5k2l7sa_cpp_snapshot</CPPSnapshot> <A3Preview>mot_imx258_bear_zsl_preview_3a</A3Preview>
<CPPVideo>mot_s5k2l7sa_cpp_video</CPPVideo> <A3Video>mot_imx258_bear_zsl_video_3a</A3Video>
<CPPLiveshot>mot_s5k2l7sa_cpp_liveshot</CPPLiveshot>
<A3Preview>mot_s5k2l7sa_fullsize_preview_3a</A3Preview>
<A3Video>mot_s5k2l7sa_fullsize_video_3a</A3Video>
</ChromatixName> </ChromatixName>
<ChromatixName sensor_resolution_index="1" special_mode_mask="0"> <ChromatixName sensor_resolution_index="1">
<ISPPreview>mot_s5k2l7sa_hfr_60</ISPPreview> <ISPPreview>mot_imx258_bear_preview</ISPPreview>
<ISPSnapshot>mot_s5k2l7sa_hfr_60</ISPSnapshot> <ISPSnapshot>mot_imx258_bear_preview</ISPSnapshot>
<ISPVideo>mot_s5k2l7sa_hfr_60</ISPVideo> <ISPVideo>mot_imx258_bear_preview</ISPVideo>
<CPPPreview>mot_s5k2l7sa_cpp_hfr_60</CPPPreview> <CPPVideo>mot_imx258_bear_cpp_video</CPPVideo>
<CPPSnapshot>mot_s5k2l7sa_cpp_hfr_60</CPPSnapshot> <A3Preview>mot_imx258_bear_4k_preview_3a</A3Preview>
<CPPVideo>mot_s5k2l7sa_cpp_hfr_60</CPPVideo> <A3Video>mot_imx258_bear_4k_video_3a</A3Video>
<CPPLiveshot>mot_s5k2l7sa_cpp_hfr_60</CPPLiveshot>
<A3Preview>mot_s5k2l7sa_hfr_60_3a</A3Preview>
<A3Video>mot_s5k2l7sa_hfr_60_3a</A3Video>
</ChromatixName> </ChromatixName>
<ChromatixName sensor_resolution_index="2" special_mode_mask="0"> <ChromatixName sensor_resolution_index="2">
<ISPPreview>mot_s5k2l7sa_hfr_120</ISPPreview> <ISPPreview>mot_imx258_bear_hfr_60</ISPPreview>
<ISPSnapshot>mot_s5k2l7sa_hfr_120</ISPSnapshot> <ISPSnapshot>mot_imx258_bear_hfr_60</ISPSnapshot>
<ISPVideo>mot_s5k2l7sa_hfr_120</ISPVideo> <ISPVideo>mot_imx258_bear_hfr_60</ISPVideo>
<CPPPreview>mot_s5k2l7sa_cpp_hfr_120</CPPPreview> <CPPVideo>mot_imx258_bear_cpp_hfr_60</CPPVideo>
<CPPSnapshot>mot_s5k2l7sa_cpp_hfr_120</CPPSnapshot> <A3Preview>mot_imx258_bear_hfr_60_3a</A3Preview>
<CPPVideo>mot_s5k2l7sa_cpp_hfr_120</CPPVideo> <A3Video>mot_imx258_bear_hfr_60_3a</A3Video>
<CPPLiveshot>mot_s5k2l7sa_cpp_hfr_120</CPPLiveshot> </ChromatixName>
<A3Preview>mot_s5k2l7sa_hfr_120_3a</A3Preview> <ChromatixName sensor_resolution_index="3">
<A3Video>mot_s5k2l7sa_hfr_120_3a</A3Video> <ISPPreview>mot_imx258_bear_hfr_120</ISPPreview>
<ISPSnapshot>mot_imx258_bear_hfr_120</ISPSnapshot>
<ISPVideo>mot_imx258_bear_hfr_120</ISPVideo>
<CPPVideo>mot_imx258_bear_cpp_hfr_120</CPPVideo>
<A3Preview>mot_imx258_bear_hfr_120_3a</A3Preview>
<A3Video>mot_imx258_bear_hfr_120_3a</A3Video>
</ChromatixName> </ChromatixName>
</ResolutionChromatixInfo> </ResolutionChromatixInfo>
</ChromatixConfigurationRoot> </ChromatixConfigurationRoot>

View File

@@ -0,0 +1,123 @@
<!--
Copyright (c) 2016 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>mot_imx258_mono_common</ISPCommon>
<PostProc>mot_imx258_mono_postproc</PostProc>
<CPPPreview>mot_imx258_mono_cpp_preview</CPPPreview>
<CPPSnapshot>mot_imx258_mono_cpp_snapshot</CPPSnapshot>
<CPPLiveshot>mot_imx258_mono_cpp_liveshot</CPPLiveshot>
</ChromatixName>
</CommonChromatixInfo>
<ResolutionChromatixInfo>
<ChromatixName sensor_resolution_index="0">
<ISPPreview>mot_imx258_mono_snapshot</ISPPreview>
<ISPSnapshot>mot_imx258_mono_snapshot</ISPSnapshot>
<ISPVideo>mot_imx258_mono_default_video</ISPVideo>
<CPPVideo>mot_imx258_mono_cpp_video</CPPVideo>
<A3Preview>mot_imx258_mono_zsl_preview_3a</A3Preview>
<A3Video>mot_imx258_mono_zsl_video_3a</A3Video>
</ChromatixName>
<ChromatixName sensor_resolution_index="1">
<ISPPreview>mot_imx258_mono_preview</ISPPreview>
<ISPSnapshot>mot_imx258_mono_preview</ISPSnapshot>
<ISPVideo>mot_imx258_mono_preview</ISPVideo>
<CPPVideo>mot_imx258_mono_cpp_video</CPPVideo>
<A3Preview>mot_imx258_mono_4k_preview_3a</A3Preview>
<A3Video>mot_imx258_mono_4k_video_3a</A3Video>
</ChromatixName>
<ChromatixName sensor_resolution_index="2">
<ISPPreview>mot_imx258_mono_hfr_60</ISPPreview>
<ISPSnapshot>mot_imx258_mono_hfr_60</ISPSnapshot>
<ISPVideo>mot_imx258_mono_hfr_60</ISPVideo>
<CPPVideo>mot_imx258_mono_cpp_hfr_60</CPPVideo>
<A3Preview>mot_imx258_mono_hfr_60_3a</A3Preview>
<A3Video>mot_imx258_mono_hfr_60_3a</A3Video>
</ChromatixName>
<ChromatixName sensor_resolution_index="3">
<ISPPreview>mot_imx258_mono_hfr_120</ISPPreview>
<ISPSnapshot>mot_imx258_mono_hfr_120</ISPSnapshot>
<ISPVideo>mot_imx258_mono_hfr_120</ISPVideo>
<CPPVideo>mot_imx258_mono_cpp_hfr_120</CPPVideo>
<A3Preview>mot_imx258_mono_hfr_120_3a</A3Preview>
<A3Video>mot_imx258_mono_hfr_120_3a</A3Video>
</ChromatixName>
</ResolutionChromatixInfo>
</ChromatixConfigurationRoot>

View File

@@ -79,56 +79,57 @@ special_mode_mask values:
<ChromatixConfigurationRoot> <ChromatixConfigurationRoot>
<CommonChromatixInfo> <CommonChromatixInfo>
<ChromatixName special_mode_mask="0"> <ChromatixName special_mode_mask="0">
<ISPCommon>mot_s5k2l7_common</ISPCommon> <ISPCommon>mot_s5k3l8_bear_common</ISPCommon>
<PostProc>mot_s5k2l7_postproc</PostProc> <PostProc>mot_s5k3l8_bear_postproc</PostProc>
</ChromatixName> </ChromatixName>
<ChromatixName special_mode_mask="MOT_4K_VIDEO"> <ChromatixName special_mode_mask="MOT_CPP_CUSTOM">
<ISPVideo>mot_s5k2l7_video_4k</ISPVideo> <CPPSnapshot>mot_s5k3l8_bear_cpp_snapshot_custom</CPPSnapshot>
<CPPVideo>mot_s5k2l7_cpp_video_4k</CPPVideo>
<A3Video>mot_s5k2l7_4k_video_3a</A3Video>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_ALTM_IHDR_VIDEO">
<ISPVideo>mot_s5k2l7_ihdr_video</ISPVideo>
<A3Video>mot_s5k2l7_ihdr_video_3a</A3Video>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_4K_IHDR_VIDEO">
<ISPVideo>mot_s5k2l7_ihdr_video_4k</ISPVideo>
<A3Video>mot_s5k2l7_4k_ihdr_video_3a</A3Video>
</ChromatixName> </ChromatixName>
</CommonChromatixInfo> </CommonChromatixInfo>
<ResolutionChromatixInfo> <ResolutionChromatixInfo>
<ChromatixName sensor_resolution_index="0" special_mode_mask="0"> <ChromatixName sensor_resolution_index="0" special_mode_mask="0">
<ISPPreview>mot_s5k2l7_snapshot</ISPPreview> <ISPPreview>mot_s5k3l8_bear_snapshot</ISPPreview>
<ISPSnapshot>mot_s5k2l7_snapshot</ISPSnapshot> <ISPSnapshot>mot_s5k3l8_bear_snapshot</ISPSnapshot>
<ISPVideo>mot_s5k2l7_default_video</ISPVideo> <ISPVideo>mot_s5k3l8_bear_snapshot</ISPVideo>
<CPPPreview>mot_s5k2l7_cpp_preview</CPPPreview> <CPPPreview>mot_s5k3l8_bear_cpp_preview</CPPPreview>
<CPPSnapshot>mot_s5k2l7_cpp_snapshot</CPPSnapshot> <CPPSnapshot>mot_s5k3l8_bear_cpp_snapshot</CPPSnapshot>
<CPPVideo>mot_s5k2l7_cpp_video</CPPVideo> <CPPVideo>mot_s5k3l8_bear_cpp_video</CPPVideo>
<CPPLiveshot>mot_s5k2l7_cpp_liveshot</CPPLiveshot> <CPPLiveshot>mot_s5k3l8_bear_cpp_liveshot</CPPLiveshot>
<A3Preview>mot_s5k2l7_fullsize_preview_3a</A3Preview> <A3Preview>mot_s5k3l8_bear_zsl_preview_3a</A3Preview>
<A3Video>mot_s5k2l7_fullsize_video_3a</A3Video> <A3Video>mot_s5k3l8_bear_zsl_video_3a</A3Video>
</ChromatixName> </ChromatixName>
<ChromatixName sensor_resolution_index="1" special_mode_mask="0"> <ChromatixName sensor_resolution_index="1" special_mode_mask="0">
<ISPPreview>mot_s5k2l7_hfr_60</ISPPreview> <ISPPreview>mot_s5k3l8_bear_preview</ISPPreview>
<ISPSnapshot>mot_s5k2l7_hfr_60</ISPSnapshot> <ISPSnapshot>mot_s5k3l8_bear_preview</ISPSnapshot>
<ISPVideo>mot_s5k2l7_hfr_60</ISPVideo> <ISPVideo>mot_s5k3l8_bear_preview</ISPVideo>
<CPPPreview>mot_s5k2l7_cpp_hfr_60</CPPPreview> <CPPPreview>mot_s5k3l8_bear_cpp_preview</CPPPreview>
<CPPSnapshot>mot_s5k2l7_cpp_hfr_60</CPPSnapshot> <CPPSnapshot>mot_s5k3l8_bear_cpp_snapshot</CPPSnapshot>
<CPPVideo>mot_s5k2l7_cpp_hfr_60</CPPVideo> <CPPVideo>mot_s5k3l8_bear_cpp_video</CPPVideo>
<CPPLiveshot>mot_s5k2l7_cpp_hfr_60</CPPLiveshot> <CPPLiveshot>mot_s5k3l8_bear_cpp_liveshot</CPPLiveshot>
<A3Preview>mot_s5k2l7_hfr_60_3a</A3Preview> <A3Preview>mot_s5k3l8_bear_default_preview_3a</A3Preview>
<A3Video>mot_s5k2l7_hfr_60_3a</A3Video> <A3Video>mot_s5k3l8_bear_default_video_3a</A3Video>
</ChromatixName> </ChromatixName>
<ChromatixName sensor_resolution_index="2" special_mode_mask="0"> <ChromatixName sensor_resolution_index="2" special_mode_mask="0">
<ISPPreview>mot_s5k2l7_hfr_120</ISPPreview> <ISPPreview>mot_s5k3l8_bear_hfr_60</ISPPreview>
<ISPSnapshot>mot_s5k2l7_hfr_120</ISPSnapshot> <ISPSnapshot>mot_s5k3l8_bear_hfr_60</ISPSnapshot>
<ISPVideo>mot_s5k2l7_hfr_120</ISPVideo> <ISPVideo>mot_s5k3l8_bear_hfr_60</ISPVideo>
<CPPPreview>mot_s5k2l7_cpp_hfr_120</CPPPreview> <CPPPreview>mot_s5k3l8_bear_cpp_hfr_60</CPPPreview>
<CPPSnapshot>mot_s5k2l7_cpp_hfr_120</CPPSnapshot> <CPPSnapshot>mot_s5k3l8_bear_cpp_hfr_60</CPPSnapshot>
<CPPVideo>mot_s5k2l7_cpp_hfr_120</CPPVideo> <CPPVideo>mot_s5k3l8_bear_cpp_hfr_60</CPPVideo>
<CPPLiveshot>mot_s5k2l7_cpp_hfr_120</CPPLiveshot> <CPPLiveshot>mot_s5k3l8_bear_cpp_hfr_60</CPPLiveshot>
<A3Preview>mot_s5k2l7_hfr_120_3a</A3Preview> <A3Preview>mot_s5k3l8_bear_hfr_60_3a</A3Preview>
<A3Video>mot_s5k2l7_hfr_120_3a</A3Video> <A3Video>mot_s5k3l8_bear_hfr_60_3a</A3Video>
</ChromatixName>
<ChromatixName sensor_resolution_index="3" special_mode_mask="0">
<ISPPreview>mot_s5k3l8_bear_hfr_120</ISPPreview>
<ISPSnapshot>mot_s5k3l8_bear_hfr_120</ISPSnapshot>
<ISPVideo>mot_s5k3l8_bear_hfr_120</ISPVideo>
<CPPPreview>mot_s5k3l8_bear_cpp_hfr_120</CPPPreview>
<CPPSnapshot>mot_s5k3l8_bear_cpp_hfr_120</CPPSnapshot>
<CPPVideo>mot_s5k3l8_bear_cpp_hfr_120</CPPVideo>
<CPPLiveshot>mot_s5k3l8_bear_cpp_hfr_120</CPPLiveshot>
<A3Preview>mot_s5k3l8_bear_hfr_120_3a</A3Preview>
<A3Video>mot_s5k3l8_bear_hfr_120_3a</A3Video>
</ChromatixName> </ChromatixName>
</ResolutionChromatixInfo> </ResolutionChromatixInfo>
</ChromatixConfigurationRoot> </ChromatixConfigurationRoot>

View File

@@ -79,56 +79,46 @@ special_mode_mask values:
<ChromatixConfigurationRoot> <ChromatixConfigurationRoot>
<CommonChromatixInfo> <CommonChromatixInfo>
<ChromatixName special_mode_mask="0"> <ChromatixName special_mode_mask="0">
<ISPCommon>mot_imx362_common</ISPCommon> <ISPCommon>mot_s5k3l8_mono_common</ISPCommon>
<PostProc>mot_imx362_postproc</PostProc> <PostProc>mot_s5k3l8_mono_postproc</PostProc>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_4K_VIDEO">
<ISPVideo>mot_imx362_video_4k</ISPVideo>
<CPPVideo>mot_imx362_cpp_video_4k</CPPVideo>
<A3Video>mot_imx362_4k_video_3a</A3Video>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_ALTM_IHDR_VIDEO">
<ISPVideo>mot_imx362_ihdr_video</ISPVideo>
<A3Video>mot_imx362_ihdr_video_3a</A3Video>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_4K_IHDR_VIDEO">
<ISPVideo>mot_imx362_ihdr_video_4k</ISPVideo>
<A3Video>mot_imx362_4k_ihdr_video_3a</A3Video>
</ChromatixName> </ChromatixName>
</CommonChromatixInfo> </CommonChromatixInfo>
<ChromatixName special_mode_mask="MOT_CPP_CUSTOM">
<CPPSnapshot>mot_s5k3l8_mono_cpp_snapshot_custom</CPPSnapshot>
</ChromatixName>
<ResolutionChromatixInfo> <ResolutionChromatixInfo>
<ChromatixName sensor_resolution_index="0" special_mode_mask="0"> <ChromatixName sensor_resolution_index="0" special_mode_mask="0">
<ISPPreview>mot_imx362_snapshot</ISPPreview> <ISPPreview>mot_s5k3l8_mono_snapshot</ISPPreview>
<ISPSnapshot>mot_imx362_snapshot</ISPSnapshot> <ISPSnapshot>mot_s5k3l8_mono_snapshot</ISPSnapshot>
<ISPVideo>mot_imx362_default_video</ISPVideo> <ISPVideo>mot_s5k3l8_mono_snapshot</ISPVideo>
<CPPPreview>mot_imx362_cpp_preview</CPPPreview> <CPPPreview>mot_s5k3l8_mono_cpp_preview</CPPPreview>
<CPPSnapshot>mot_imx362_cpp_snapshot</CPPSnapshot> <CPPSnapshot>mot_s5k3l8_mono_cpp_snapshot</CPPSnapshot>
<CPPVideo>mot_imx362_cpp_video</CPPVideo> <CPPVideo>mot_s5k3l8_mono_cpp_video</CPPVideo>
<CPPLiveshot>mot_imx362_cpp_liveshot</CPPLiveshot> <CPPLiveshot>mot_s5k3l8_mono_cpp_liveshot</CPPLiveshot>
<A3Preview>mot_imx362_fullsize_preview_3a</A3Preview> <A3Preview>mot_s5k3l8_mono_zsl_preview_3a</A3Preview>
<A3Video>mot_imx362_fullsize_video_3a</A3Video> <A3Video>mot_s5k3l8_mono_zsl_video_3a</A3Video>
</ChromatixName> </ChromatixName>
<ChromatixName sensor_resolution_index="1" special_mode_mask="0"> <ChromatixName sensor_resolution_index="1" special_mode_mask="0">
<ISPPreview>mot_imx362_hfr_60</ISPPreview> <ISPPreview>mot_s5k3l8_mono_preview</ISPPreview>
<ISPSnapshot>mot_imx362_hfr_60</ISPSnapshot> <ISPSnapshot>mot_s5k3l8_mono_preview</ISPSnapshot>
<ISPVideo>mot_imx362_hfr_60</ISPVideo> <ISPVideo>mot_s5k3l8_mono_preview</ISPVideo>
<CPPPreview>mot_imx362_cpp_hfr_60</CPPPreview> <CPPPreview>mot_s5k3l8_mono_cpp_preview</CPPPreview>
<CPPSnapshot>mot_imx362_cpp_hfr_60</CPPSnapshot> <CPPSnapshot>mot_s5k3l8_mono_cpp_snapshot</CPPSnapshot>
<CPPVideo>mot_imx362_cpp_hfr_60</CPPVideo> <CPPVideo>mot_s5k3l8_mono_cpp_video</CPPVideo>
<CPPLiveshot>mot_imx362_cpp_hfr_60</CPPLiveshot> <CPPLiveshot>mot_s5k3l8_mono_cpp_liveshot</CPPLiveshot>
<A3Preview>mot_imx362_hfr_60_3a</A3Preview> <A3Preview>mot_s5k3l8_mono_default_preview_3a</A3Preview>
<A3Video>mot_imx362_hfr_60_3a</A3Video> <A3Video>mot_s5k3l8_mono_default_video_3a</A3Video>
</ChromatixName> </ChromatixName>
<ChromatixName sensor_resolution_index="2" special_mode_mask="0"> <ChromatixName sensor_resolution_index="2" special_mode_mask="0">
<ISPPreview>mot_imx362_hfr_120</ISPPreview> <ISPPreview>mot_s5k3l8_mono_hfr_120</ISPPreview>
<ISPSnapshot>mot_imx362_hfr_120</ISPSnapshot> <ISPSnapshot>mot_s5k3l8_mono_hfr_120</ISPSnapshot>
<ISPVideo>mot_imx362_hfr_120</ISPVideo> <ISPVideo>mot_s5k3l8_mono_hfr_120</ISPVideo>
<CPPPreview>mot_imx362_cpp_hfr_120</CPPPreview> <CPPPreview>mot_s5k3l8_mono_cpp_hfr_120</CPPPreview>
<CPPSnapshot>mot_imx362_cpp_hfr_120</CPPSnapshot> <CPPSnapshot>mot_s5k3l8_mono_cpp_hfr_120</CPPSnapshot>
<CPPVideo>mot_imx362_cpp_hfr_120</CPPVideo> <CPPVideo>mot_s5k3l8_mono_cpp_hfr_120</CPPVideo>
<CPPLiveshot>mot_imx362_cpp_hfr_120</CPPLiveshot> <CPPLiveshot>mot_s5k3l8_mono_cpp_hfr_120</CPPLiveshot>
<A3Preview>mot_imx362_hfr_120_3a</A3Preview> <A3Preview>mot_s5k3l8_mono_hfr_120_3a</A3Preview>
<A3Video>mot_imx362_hfr_120_3a</A3Video> <A3Video>mot_s5k3l8_mono_hfr_120_3a</A3Video>
</ChromatixName> </ChromatixName>
</ResolutionChromatixInfo> </ResolutionChromatixInfo>
</ChromatixConfigurationRoot> </ChromatixConfigurationRoot>

View File

@@ -1,5 +1,5 @@
<!-- <!--
Copyright (c) 2015 Qualcomm Technologies, Inc. Copyright (c) 2015-2016 Qualcomm Technologies, Inc.
All Rights Reserved. All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc. Confidential and Proprietary - Qualcomm Technologies, Inc.
--> -->
@@ -9,6 +9,7 @@ CameraModuleConfig :
It contain all information about the module present. It contain all information about the module present.
The number of nodes of CameraModuleConfig indicate number of modules The number of nodes of CameraModuleConfig indicate number of modules
to be probed on the device. to be probed on the device.
Maximum number of CameraModuleConfig nodes is 10
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*CameraId : *CameraId :
@@ -34,10 +35,8 @@ ChromatixName :
Tuning file contains the list of chromatix library names. Tuning file contains the list of chromatix library names.
If there is no tuning xml file remove the <ChromatixName> node. If there is no tuning xml file remove the <ChromatixName> node.
Position : Position :
Position of the sensor module. Valid values are 0, 1 and 2. Position of the sensor module. Valid values are:
For CAMERA_POSITION_BACK use 0. BACK, FRONT and BACK_AUX
For CAMERA_POSITION_FRONT use 1.
For CAMERA_POSITON_BACK_AUX use 2.
MountAngle : MountAngle :
Angle at which the sensor is mounted. Valid values are 0, 90, 180, 270 and 360. 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. To use default mountangle mentioned in kernel use 360.
@@ -56,18 +55,19 @@ CsiInfo : This node contains information about the receiver configuration.
LaneMask[4] for DL3 LaneMask[4] for DL3
*LaneAssign : *LaneAssign :
Number which describes the lane mapping between sensor and PHY. Number which describes the lane mapping between sensor and PHY.
LaneAssign[0:3] is sensor lane number connected to data lane 0 of a PHY on the MSM side 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 a PHY on the MSM side 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 a PHY on the MSM side 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 a PHY on the MSM side 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. NOTE : Lane 1 is reserved for the clock lane.
Wiring and setting it to a data lane is prohibited.
ComboMode : ComboMode :
Flag to enable combo mode. Flag to enable combo mode.
This flag is enabled if multiple sensors are using same CSI-PHY receiver This flag is enabled if multiple sensors are using same CSI-PHY receiver
LensInfo : Information of the lens present in the module. LensInfo : Information of the lens present in the module.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*FocalLength : *FocalLength :
FocalLength of the lens in micometers. FocalLength of the lens in micometers.
@@ -86,11 +86,11 @@ LensInfo : Information of the lens present in the module.
<CameraConfigurationRoot> <CameraConfigurationRoot>
<CameraModuleConfig> <CameraModuleConfig>
<CameraId>0</CameraId> <CameraId>0</CameraId>
<SensorName>mot_imx362</SensorName> <SensorName>mot_s5k3l8_bear</SensorName>
<EepromName>imx362</EepromName> <EepromName>gt24c64_bear</EepromName>
<ActuatorName>mot_ak7371</ActuatorName> <ActuatorName>mot_ak7371_bear</ActuatorName>
<FlashName>pmic</FlashName> <FlashName>pmic</FlashName>
<ChromatixName>mot_imx362_chromatix</ChromatixName> <ChromatixName>mot_s5k3l8_bear_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported> <ModesSupported>1</ModesSupported>
<Position>BACK</Position> <Position>BACK</Position>
<MountAngle>90</MountAngle> <MountAngle>90</MountAngle>
@@ -101,84 +101,59 @@ LensInfo : Information of the lens present in the module.
<ComboMode>0</ComboMode> <ComboMode>0</ComboMode>
</CSIInfo> </CSIInfo>
<LensInfo> <LensInfo>
<FocalLength>4.28</FocalLength> <FocalLength>3.59</FocalLength>
<FNumber>1.7</FNumber> <FNumber>2.0</FNumber>
<TotalFocusDistance>0.187</TotalFocusDistance> <TotalFocusDistance>1.9</TotalFocusDistance>
<HorizontalViewAngle>65.0</HorizontalViewAngle> <HorizontalViewAngle>65.90</HorizontalViewAngle>
<VerticalViewAngle>51.0</VerticalViewAngle> <VerticalViewAngle>51.50</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance> <MinFocusDistance>0.1</MinFocusDistance>
</LensInfo> </LensInfo>
</CameraModuleConfig> </CameraModuleConfig>
<CameraModuleConfig> <CameraModuleConfig>
<CameraId>1</CameraId> <CameraId>1</CameraId>
<SensorName>mot_s5k2l7</SensorName> <SensorName>mot_s5k3l8_mono</SensorName>
<EepromName>s5k2l7</EepromName> <EepromName>gt24c64_mono</EepromName>
<ActuatorName>mot_ak7371</ActuatorName> <ActuatorName>mot_ak7371_mono</ActuatorName>
<FlashName>pmic</FlashName> <ChromatixName>mot_s5k3l8_mono_chromatix</ChromatixName>
<ChromatixName>mot_s5k2l7_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported> <ModesSupported>1</ModesSupported>
<Position>BACK</Position> <Position>BACK_AUX</Position>
<MountAngle>90</MountAngle> <MountAngle>90</MountAngle>
<CSIInfo> <CSIInfo>
<CSIDCore>0</CSIDCore> <CSIDCore>1</CSIDCore>
<LaneMask>0x1F</LaneMask> <LaneMask>0x1F</LaneMask>
<LaneAssign>0x4320</LaneAssign> <LaneAssign>0x4320</LaneAssign>
<ComboMode>0</ComboMode> <ComboMode>0</ComboMode>
</CSIInfo> </CSIInfo>
<LensInfo> <LensInfo>
<FocalLength>4.28</FocalLength> <FocalLength>3.59</FocalLength>
<FNumber>1.7</FNumber> <FNumber>2.0</FNumber>
<TotalFocusDistance>0.187</TotalFocusDistance> <TotalFocusDistance>1.9</TotalFocusDistance>
<HorizontalViewAngle>65.0</HorizontalViewAngle> <HorizontalViewAngle>65.90</HorizontalViewAngle>
<VerticalViewAngle>51.0</VerticalViewAngle> <VerticalViewAngle>51.50</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance> <MinFocusDistance>0.1</MinFocusDistance>
</LensInfo> </LensInfo>
</CameraModuleConfig> </CameraModuleConfig>
<CameraModuleConfig> <CameraModuleConfig>
<CameraId>2</CameraId> <CameraId>2</CameraId>
<SensorName>mot_s5k2l7sa</SensorName> <SensorName>s5k4h8</SensorName>
<EepromName>s5k2l7</EepromName> <EepromName>l4h8f20</EepromName>
<ActuatorName>mot_ak7371</ActuatorName> <FlashName>aw3641</FlashName>
<FlashName>pmic</FlashName> <ChromatixName>s5k4h8_chromatix</ChromatixName>
<ChromatixName>mot_s5k2l7sa_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported>
<Position>BACK</Position>
<MountAngle>90</MountAngle>
<CSIInfo>
<CSIDCore>0</CSIDCore>
<LaneMask>0x1F</LaneMask>
<LaneAssign>0x4320</LaneAssign>
<ComboMode>0</ComboMode>
</CSIInfo>
<LensInfo>
<FocalLength>4.28</FocalLength>
<FNumber>1.7</FNumber>
<TotalFocusDistance>0.187</TotalFocusDistance>
<HorizontalViewAngle>65.0</HorizontalViewAngle>
<VerticalViewAngle>51.0</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance>
</LensInfo>
</CameraModuleConfig>
<CameraModuleConfig>
<CameraId>3</CameraId>
<SensorName>mot_ov5695</SensorName>
<EepromName>ov5695</EepromName>
<ChromatixName>mot_ov5695_chromatix</ChromatixName>
<ModesSupported>1</ModesSupported> <ModesSupported>1</ModesSupported>
<Position>FRONT</Position> <Position>FRONT</Position>
<MountAngle>270</MountAngle> <MountAngle>270</MountAngle>
<CSIInfo> <CSIInfo>
<CSIDCore>2</CSIDCore> <CSIDCore>2</CSIDCore>
<LaneMask>0x07</LaneMask> <LaneMask>0x1F</LaneMask>
<LaneAssign>0x4320</LaneAssign> <LaneAssign>0x4320</LaneAssign>
<ComboMode>0</ComboMode> <ComboMode>0</ComboMode>
</CSIInfo> </CSIInfo>
<LensInfo> <LensInfo>
<FocalLength>2.44</FocalLength> <FocalLength>2.51</FocalLength>
<FNumber>2.2</FNumber> <FNumber>2.0</FNumber>
<TotalFocusDistance>1.26</TotalFocusDistance> <TotalFocusDistance>1.2</TotalFocusDistance>
<HorizontalViewAngle>72.95</HorizontalViewAngle> <HorizontalViewAngle>71.69</HorizontalViewAngle>
<VerticalViewAngle>57.60</VerticalViewAngle> <VerticalViewAngle>56.62</VerticalViewAngle>
<MinFocusDistance>0.1</MinFocusDistance> <MinFocusDistance>0.1</MinFocusDistance>
</LensInfo> </LensInfo>
</CameraModuleConfig> </CameraModuleConfig>

View File

@@ -0,0 +1,110 @@
<!--
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>s5k4h8_common</ISPCommon>
<PostProc>s5k4h8_postproc</PostProc>
<CPPPreview>s5k4h8_cpp_preview</CPPPreview>
<CPPSnapshot>s5k4h8_cpp_snapshot</CPPSnapshot>
<CPPLiveshot>s5k4h8_cpp_liveshot</CPPLiveshot>
</ChromatixName>
<ChromatixName special_mode_mask="MOT_CPP_CUSTOM">
<CPPSnapshot>s5k4h8_cpp_snapshot_custom</CPPSnapshot>
</ChromatixName>
</CommonChromatixInfo>
<ResolutionChromatixInfo>
<ChromatixName sensor_resolution_index="0">
<ISPPreview>s5k4h8_snapshot</ISPPreview>
<ISPSnapshot>s5k4h8_snapshot</ISPSnapshot>
<ISPVideo>s5k4h8_video_full</ISPVideo>
<CPPVideo>s5k4h8_cpp_video_full</CPPVideo>
<A3Preview>s5k4h8_zsl_preview_3a</A3Preview>
<A3Video>s5k4h8_zsl_video_3a</A3Video>
</ChromatixName>
<ChromatixName sensor_resolution_index="1">
<ISPPreview>s5k4h8_hfr_120</ISPPreview>
<ISPSnapshot>s5k4h8_hfr_120</ISPSnapshot>
<ISPVideo>s5k4h8_hfr_120</ISPVideo>
<CPPVideo>s5k4h8_cpp_hfr_120</CPPVideo>
<A3Preview>s5k4h8_hfr_120_3a</A3Preview>
<A3Video>s5k4h8_hfr_120_3a</A3Video>
</ChromatixName>
</ResolutionChromatixInfo>
</ChromatixConfigurationRoot>

View File

@@ -107,11 +107,13 @@ PRODUCT_PACKAGES += \
libshims_camera libshims_camera
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/camera/msm8953_mot_potter_camera.xml:system/etc/camera/msm8953_mot_potter_camera.xml \ $(LOCAL_PATH)/configs/camera/imx219_chromatix.xml:system/etc/camera/imx219_chromatix.xml \
$(LOCAL_PATH)/configs/camera/mot_ov5695_chromatix.xml:system/etc/camera/mot_ov5695_chromatix.xml \ $(LOCAL_PATH)/configs/camera/mot_imx258_bear_chromatix.xml:system/etc/camera/mot_imx258_bear_chromatix.xml \
$(LOCAL_PATH)/configs/camera/mot_imx362_chromatix.xml:system/etc/camera/mot_imx362_chromatix.xml \ $(LOCAL_PATH)/configs/camera/mot_imx258_mono_chromatix.xml:system/etc/camera/mot_imx258_mono_chromatix.xml \
$(LOCAL_PATH)/configs/camera/mot_s5k2l7_chromatix.xml:system/etc/camera/mot_s5k2l7_chromatix.xml \ $(LOCAL_PATH)/configs/camera/mot_s5k3l8_bear_chromatix.xml:system/etc/camera/mot_s5k3l8_bear_chromatix.xml \
$(LOCAL_PATH)/configs/camera/mot_s5k2l7sa_chromatix.xml:system/etc/camera/mot_s5k2l7sa_chromatix.xml \ $(LOCAL_PATH)/configs/camera/mot_s5k3l8_mono_chromatix.xml:system/etc/camera/mot_s5k3l8_mono_chromatix.xml \
$(LOCAL_PATH)/configs/camera/mot_s5k3l8_mono_chromatix.xml:system/etc/camera/mot_s5k3l8_mono_chromatix.xml \
$(LOCAL_PATH)/configs/camera/s5k4h8_chromatix.xml:system/etc/camera/s5k4h8_chromatix.xml \
$(LOCAL_PATH)/configs/camera/vfwconfig.json:system/etc/camera/vfwconfig.json $(LOCAL_PATH)/configs/camera/vfwconfig.json:system/etc/camera/vfwconfig.json
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \