diff --git a/configs/camera/mot_ov5695_chromatix.xml b/configs/camera/imx219_chromatix.xml similarity index 70% rename from configs/camera/mot_ov5695_chromatix.xml rename to configs/camera/imx219_chromatix.xml index 846c342..fa9b2c2 100644 --- a/configs/camera/mot_ov5695_chromatix.xml +++ b/configs/camera/imx219_chromatix.xml @@ -1,5 +1,5 @@ @@ -78,32 +78,30 @@ special_mode_mask values: - - mot_ov5695_common - mot_ov5695_postproc - mot_ov5695_cpp_snapshot - mot_ov5695_cpp_snapshot - mot_ov5695_cpp_liveshot + + imx219_common + imx219_postproc + imx219_cpp_preview + imx219_cpp_snapshot + imx219_cpp_liveshot - - mot_ov5695_snapshot - mot_ov5695_snapshot - mot_ov5695_default_video - mot_ov5695_snapshot - mot_ov5695_cpp_video - mot_ov5695_snapshot_3a - mot_ov5695_default_video_3a + + imx219_snapshot + imx219_snapshot + imx219_video_full + imx219_cpp_video_full + imx219_zsl_preview_3a + imx219_zsl_video_3a - - mot_ov5695_hfr_120 - mot_ov5695_hfr_120 - mot_ov5695_hfr_120 - mot_ov5695_hfr_120 - mot_ov5695_cpp_hfr_120 - mot_ov5695_hfr_120_3a - mot_ov5695_hfr_120_3a + + imx219_hfr_120 + imx219_hfr_120 + imx219_hfr_120 + imx219_cpp_hfr_120 + imx219_hfr_120_3a + imx219_hfr_120_3a diff --git a/configs/camera/mot_s5k2l7sa_chromatix.xml b/configs/camera/mot_imx258_bear_chromatix.xml similarity index 54% rename from configs/camera/mot_s5k2l7sa_chromatix.xml rename to configs/camera/mot_imx258_bear_chromatix.xml index e1d4d8e..6b15bd0 100644 --- a/configs/camera/mot_s5k2l7sa_chromatix.xml +++ b/configs/camera/mot_imx258_bear_chromatix.xml @@ -78,57 +78,46 @@ special_mode_mask values: - - mot_s5k2l7sa_common - mot_s5k2l7sa_postproc - - - mot_s5k2l7sa_video_4k - mot_s5k2l7sa_cpp_video_4k - mot_s5k2l7sa_4k_video_3a - - - mot_s5k2l7sa_ihdr_video - mot_s5k2l7sa_ihdr_video_3a - - - mot_s5k2l7sa_ihdr_video_4k - mot_s5k2l7sa_4k_ihdr_video_3a + + mot_imx258_bear_common + mot_imx258_bear_postproc + mot_imx258_bear_cpp_preview + mot_imx258_bear_cpp_snapshot + mot_imx258_bear_cpp_liveshot - - mot_s5k2l7sa_snapshot - mot_s5k2l7sa_snapshot - mot_s5k2l7sa_default_video - mot_s5k2l7sa_cpp_preview - mot_s5k2l7sa_cpp_snapshot - mot_s5k2l7sa_cpp_video - mot_s5k2l7sa_cpp_liveshot - mot_s5k2l7sa_fullsize_preview_3a - mot_s5k2l7sa_fullsize_video_3a + + mot_imx258_bear_snapshot + mot_imx258_bear_snapshot + mot_imx258_bear_default_video + mot_imx258_bear_cpp_video + mot_imx258_bear_zsl_preview_3a + mot_imx258_bear_zsl_video_3a - - mot_s5k2l7sa_hfr_60 - mot_s5k2l7sa_hfr_60 - mot_s5k2l7sa_hfr_60 - mot_s5k2l7sa_cpp_hfr_60 - mot_s5k2l7sa_cpp_hfr_60 - mot_s5k2l7sa_cpp_hfr_60 - mot_s5k2l7sa_cpp_hfr_60 - mot_s5k2l7sa_hfr_60_3a - mot_s5k2l7sa_hfr_60_3a + + mot_imx258_bear_preview + mot_imx258_bear_preview + mot_imx258_bear_preview + mot_imx258_bear_cpp_video + mot_imx258_bear_4k_preview_3a + mot_imx258_bear_4k_video_3a - - mot_s5k2l7sa_hfr_120 - mot_s5k2l7sa_hfr_120 - mot_s5k2l7sa_hfr_120 - mot_s5k2l7sa_cpp_hfr_120 - mot_s5k2l7sa_cpp_hfr_120 - mot_s5k2l7sa_cpp_hfr_120 - mot_s5k2l7sa_cpp_hfr_120 - mot_s5k2l7sa_hfr_120_3a - mot_s5k2l7sa_hfr_120_3a + + mot_imx258_bear_hfr_60 + mot_imx258_bear_hfr_60 + mot_imx258_bear_hfr_60 + mot_imx258_bear_cpp_hfr_60 + mot_imx258_bear_hfr_60_3a + mot_imx258_bear_hfr_60_3a + + + mot_imx258_bear_hfr_120 + mot_imx258_bear_hfr_120 + mot_imx258_bear_hfr_120 + mot_imx258_bear_cpp_hfr_120 + mot_imx258_bear_hfr_120_3a + mot_imx258_bear_hfr_120_3a diff --git a/configs/camera/mot_imx258_mono_chromatix.xml b/configs/camera/mot_imx258_mono_chromatix.xml new file mode 100644 index 0000000..c66f536 --- /dev/null +++ b/configs/camera/mot_imx258_mono_chromatix.xml @@ -0,0 +1,123 @@ + + + + + + + + mot_imx258_mono_common + mot_imx258_mono_postproc + mot_imx258_mono_cpp_preview + mot_imx258_mono_cpp_snapshot + mot_imx258_mono_cpp_liveshot + + + + + mot_imx258_mono_snapshot + mot_imx258_mono_snapshot + mot_imx258_mono_default_video + mot_imx258_mono_cpp_video + mot_imx258_mono_zsl_preview_3a + mot_imx258_mono_zsl_video_3a + + + mot_imx258_mono_preview + mot_imx258_mono_preview + mot_imx258_mono_preview + mot_imx258_mono_cpp_video + mot_imx258_mono_4k_preview_3a + mot_imx258_mono_4k_video_3a + + + mot_imx258_mono_hfr_60 + mot_imx258_mono_hfr_60 + mot_imx258_mono_hfr_60 + mot_imx258_mono_cpp_hfr_60 + mot_imx258_mono_hfr_60_3a + mot_imx258_mono_hfr_60_3a + + + mot_imx258_mono_hfr_120 + mot_imx258_mono_hfr_120 + mot_imx258_mono_hfr_120 + mot_imx258_mono_cpp_hfr_120 + mot_imx258_mono_hfr_120_3a + mot_imx258_mono_hfr_120_3a + + + diff --git a/configs/camera/mot_s5k2l7_chromatix.xml b/configs/camera/mot_s5k3l8_bear_chromatix.xml similarity index 57% rename from configs/camera/mot_s5k2l7_chromatix.xml rename to configs/camera/mot_s5k3l8_bear_chromatix.xml index ca653f2..6bd065a 100644 --- a/configs/camera/mot_s5k2l7_chromatix.xml +++ b/configs/camera/mot_s5k3l8_bear_chromatix.xml @@ -79,56 +79,57 @@ special_mode_mask values: - mot_s5k2l7_common - mot_s5k2l7_postproc + mot_s5k3l8_bear_common + mot_s5k3l8_bear_postproc - - mot_s5k2l7_video_4k - mot_s5k2l7_cpp_video_4k - mot_s5k2l7_4k_video_3a - - - mot_s5k2l7_ihdr_video - mot_s5k2l7_ihdr_video_3a - - - mot_s5k2l7_ihdr_video_4k - mot_s5k2l7_4k_ihdr_video_3a + + mot_s5k3l8_bear_cpp_snapshot_custom - mot_s5k2l7_snapshot - mot_s5k2l7_snapshot - mot_s5k2l7_default_video - mot_s5k2l7_cpp_preview - mot_s5k2l7_cpp_snapshot - mot_s5k2l7_cpp_video - mot_s5k2l7_cpp_liveshot - mot_s5k2l7_fullsize_preview_3a - mot_s5k2l7_fullsize_video_3a + mot_s5k3l8_bear_snapshot + mot_s5k3l8_bear_snapshot + mot_s5k3l8_bear_snapshot + mot_s5k3l8_bear_cpp_preview + mot_s5k3l8_bear_cpp_snapshot + mot_s5k3l8_bear_cpp_video + mot_s5k3l8_bear_cpp_liveshot + mot_s5k3l8_bear_zsl_preview_3a + mot_s5k3l8_bear_zsl_video_3a - mot_s5k2l7_hfr_60 - mot_s5k2l7_hfr_60 - mot_s5k2l7_hfr_60 - mot_s5k2l7_cpp_hfr_60 - mot_s5k2l7_cpp_hfr_60 - mot_s5k2l7_cpp_hfr_60 - mot_s5k2l7_cpp_hfr_60 - mot_s5k2l7_hfr_60_3a - mot_s5k2l7_hfr_60_3a + mot_s5k3l8_bear_preview + mot_s5k3l8_bear_preview + mot_s5k3l8_bear_preview + mot_s5k3l8_bear_cpp_preview + mot_s5k3l8_bear_cpp_snapshot + mot_s5k3l8_bear_cpp_video + mot_s5k3l8_bear_cpp_liveshot + mot_s5k3l8_bear_default_preview_3a + mot_s5k3l8_bear_default_video_3a - mot_s5k2l7_hfr_120 - mot_s5k2l7_hfr_120 - mot_s5k2l7_hfr_120 - mot_s5k2l7_cpp_hfr_120 - mot_s5k2l7_cpp_hfr_120 - mot_s5k2l7_cpp_hfr_120 - mot_s5k2l7_cpp_hfr_120 - mot_s5k2l7_hfr_120_3a - mot_s5k2l7_hfr_120_3a + mot_s5k3l8_bear_hfr_60 + mot_s5k3l8_bear_hfr_60 + mot_s5k3l8_bear_hfr_60 + mot_s5k3l8_bear_cpp_hfr_60 + mot_s5k3l8_bear_cpp_hfr_60 + mot_s5k3l8_bear_cpp_hfr_60 + mot_s5k3l8_bear_cpp_hfr_60 + mot_s5k3l8_bear_hfr_60_3a + mot_s5k3l8_bear_hfr_60_3a + + + mot_s5k3l8_bear_hfr_120 + mot_s5k3l8_bear_hfr_120 + mot_s5k3l8_bear_hfr_120 + mot_s5k3l8_bear_cpp_hfr_120 + mot_s5k3l8_bear_cpp_hfr_120 + mot_s5k3l8_bear_cpp_hfr_120 + mot_s5k3l8_bear_cpp_hfr_120 + mot_s5k3l8_bear_hfr_120_3a + mot_s5k3l8_bear_hfr_120_3a diff --git a/configs/camera/mot_imx362_chromatix.xml b/configs/camera/mot_s5k3l8_mono_chromatix.xml similarity index 60% rename from configs/camera/mot_imx362_chromatix.xml rename to configs/camera/mot_s5k3l8_mono_chromatix.xml index 5553b60..63818cd 100644 --- a/configs/camera/mot_imx362_chromatix.xml +++ b/configs/camera/mot_s5k3l8_mono_chromatix.xml @@ -79,56 +79,46 @@ special_mode_mask values: - mot_imx362_common - mot_imx362_postproc - - - mot_imx362_video_4k - mot_imx362_cpp_video_4k - mot_imx362_4k_video_3a - - - mot_imx362_ihdr_video - mot_imx362_ihdr_video_3a - - - mot_imx362_ihdr_video_4k - mot_imx362_4k_ihdr_video_3a + mot_s5k3l8_mono_common + mot_s5k3l8_mono_postproc + + mot_s5k3l8_mono_cpp_snapshot_custom + - mot_imx362_snapshot - mot_imx362_snapshot - mot_imx362_default_video - mot_imx362_cpp_preview - mot_imx362_cpp_snapshot - mot_imx362_cpp_video - mot_imx362_cpp_liveshot - mot_imx362_fullsize_preview_3a - mot_imx362_fullsize_video_3a + mot_s5k3l8_mono_snapshot + mot_s5k3l8_mono_snapshot + mot_s5k3l8_mono_snapshot + mot_s5k3l8_mono_cpp_preview + mot_s5k3l8_mono_cpp_snapshot + mot_s5k3l8_mono_cpp_video + mot_s5k3l8_mono_cpp_liveshot + mot_s5k3l8_mono_zsl_preview_3a + mot_s5k3l8_mono_zsl_video_3a - mot_imx362_hfr_60 - mot_imx362_hfr_60 - mot_imx362_hfr_60 - mot_imx362_cpp_hfr_60 - mot_imx362_cpp_hfr_60 - mot_imx362_cpp_hfr_60 - mot_imx362_cpp_hfr_60 - mot_imx362_hfr_60_3a - mot_imx362_hfr_60_3a + mot_s5k3l8_mono_preview + mot_s5k3l8_mono_preview + mot_s5k3l8_mono_preview + mot_s5k3l8_mono_cpp_preview + mot_s5k3l8_mono_cpp_snapshot + mot_s5k3l8_mono_cpp_video + mot_s5k3l8_mono_cpp_liveshot + mot_s5k3l8_mono_default_preview_3a + mot_s5k3l8_mono_default_video_3a - mot_imx362_hfr_120 - mot_imx362_hfr_120 - mot_imx362_hfr_120 - mot_imx362_cpp_hfr_120 - mot_imx362_cpp_hfr_120 - mot_imx362_cpp_hfr_120 - mot_imx362_cpp_hfr_120 - mot_imx362_hfr_120_3a - mot_imx362_hfr_120_3a + mot_s5k3l8_mono_hfr_120 + mot_s5k3l8_mono_hfr_120 + mot_s5k3l8_mono_hfr_120 + mot_s5k3l8_mono_cpp_hfr_120 + mot_s5k3l8_mono_cpp_hfr_120 + mot_s5k3l8_mono_cpp_hfr_120 + mot_s5k3l8_mono_cpp_hfr_120 + mot_s5k3l8_mono_hfr_120_3a + mot_s5k3l8_mono_hfr_120_3a diff --git a/configs/camera/msm8953_mot_potter_camera.xml b/configs/camera/msm8953_mot_sanders_camera.xml similarity index 62% rename from configs/camera/msm8953_mot_potter_camera.xml rename to configs/camera/msm8953_mot_sanders_camera.xml index 99efd22..8274c75 100644 --- a/configs/camera/msm8953_mot_potter_camera.xml +++ b/configs/camera/msm8953_mot_sanders_camera.xml @@ -1,5 +1,5 @@ @@ -9,6 +9,7 @@ CameraModuleConfig : 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 : @@ -34,10 +35,8 @@ ChromatixName : Tuning file contains the list of chromatix library names. If there is no tuning xml file remove the node. Position : - Position of the sensor module. Valid values are 0, 1 and 2. - For CAMERA_POSITION_BACK use 0. - For CAMERA_POSITION_FRONT use 1. - For CAMERA_POSITON_BACK_AUX use 2. + 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. @@ -56,18 +55,19 @@ CsiInfo : This node contains information about the receiver configuration. 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 a PHY on the MSM side - LaneAssign[4:7] is sensor lane number connected to data lane 2 of a PHY on the MSM side - LaneAssign[8:11] is sensor lane number connected to data lane 3 of a PHY on the MSM side - LaneAssign[12:15] is sensor lane number connected to data lane 4 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 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. + 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. @@ -86,11 +86,11 @@ LensInfo : Information of the lens present in the module. 0 - mot_imx362 - imx362 - mot_ak7371 + mot_s5k3l8_bear + gt24c64_bear + mot_ak7371_bear pmic - mot_imx362_chromatix + mot_s5k3l8_bear_chromatix 1 BACK 90 @@ -101,84 +101,59 @@ LensInfo : Information of the lens present in the module. 0 - 4.28 - 1.7 - 0.187 - 65.0 - 51.0 + 3.59 + 2.0 + 1.9 + 65.90 + 51.50 0.1 1 - mot_s5k2l7 - s5k2l7 - mot_ak7371 - pmic - mot_s5k2l7_chromatix + mot_s5k3l8_mono + gt24c64_mono + mot_ak7371_mono + mot_s5k3l8_mono_chromatix 1 - BACK + BACK_AUX 90 - 0 + 1 0x1F 0x4320 0 - 4.28 - 1.7 - 0.187 - 65.0 - 51.0 + 3.59 + 2.0 + 1.9 + 65.90 + 51.50 0.1 2 - mot_s5k2l7sa - s5k2l7 - mot_ak7371 - pmic - mot_s5k2l7sa_chromatix - 1 - BACK - 90 - - 0 - 0x1F - 0x4320 - 0 - - - 4.28 - 1.7 - 0.187 - 65.0 - 51.0 - 0.1 - - - - 3 - mot_ov5695 - ov5695 - mot_ov5695_chromatix + s5k4h8 + l4h8f20 + aw3641 + s5k4h8_chromatix 1 FRONT 270 2 - 0x07 + 0x1F 0x4320 0 - 2.44 - 2.2 - 1.26 - 72.95 - 57.60 + 2.51 + 2.0 + 1.2 + 71.69 + 56.62 0.1 diff --git a/configs/camera/s5k4h8_chromatix.xml b/configs/camera/s5k4h8_chromatix.xml new file mode 100644 index 0000000..016744b --- /dev/null +++ b/configs/camera/s5k4h8_chromatix.xml @@ -0,0 +1,110 @@ + + + + + + + + s5k4h8_common + s5k4h8_postproc + s5k4h8_cpp_preview + s5k4h8_cpp_snapshot + s5k4h8_cpp_liveshot + + + s5k4h8_cpp_snapshot_custom + + + + + s5k4h8_snapshot + s5k4h8_snapshot + s5k4h8_video_full + s5k4h8_cpp_video_full + s5k4h8_zsl_preview_3a + s5k4h8_zsl_video_3a + + + s5k4h8_hfr_120 + s5k4h8_hfr_120 + s5k4h8_hfr_120 + s5k4h8_cpp_hfr_120 + s5k4h8_hfr_120_3a + s5k4h8_hfr_120_3a + + + diff --git a/device.mk b/device.mk index f56a99e..2fc6de7 100644 --- a/device.mk +++ b/device.mk @@ -107,11 +107,13 @@ PRODUCT_PACKAGES += \ libshims_camera PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/camera/msm8953_mot_potter_camera.xml:system/etc/camera/msm8953_mot_potter_camera.xml \ - $(LOCAL_PATH)/configs/camera/mot_ov5695_chromatix.xml:system/etc/camera/mot_ov5695_chromatix.xml \ - $(LOCAL_PATH)/configs/camera/mot_imx362_chromatix.xml:system/etc/camera/mot_imx362_chromatix.xml \ - $(LOCAL_PATH)/configs/camera/mot_s5k2l7_chromatix.xml:system/etc/camera/mot_s5k2l7_chromatix.xml \ - $(LOCAL_PATH)/configs/camera/mot_s5k2l7sa_chromatix.xml:system/etc/camera/mot_s5k2l7sa_chromatix.xml \ + $(LOCAL_PATH)/configs/camera/imx219_chromatix.xml:system/etc/camera/imx219_chromatix.xml \ + $(LOCAL_PATH)/configs/camera/mot_imx258_bear_chromatix.xml:system/etc/camera/mot_imx258_bear_chromatix.xml \ + $(LOCAL_PATH)/configs/camera/mot_imx258_mono_chromatix.xml:system/etc/camera/mot_imx258_mono_chromatix.xml \ + $(LOCAL_PATH)/configs/camera/mot_s5k3l8_bear_chromatix.xml:system/etc/camera/mot_s5k3l8_bear_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 PRODUCT_COPY_FILES += \