diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/5M_imx335.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/5M_imx335.ini index 65c66af92..43b71ba62 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/5M_imx335.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/5M_imx335.ini @@ -1,37 +1,13 @@ [sensor] -Sensor_type =stSnsImx335Obj ;sensor name -Mode = WDR_MODE_NONE ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_imx335.so ;sensor lib path - +Sensor_type=stSnsImx335Obj +Mode=WDR_MODE_NONE +DllFile=libsns_imx335.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc -raw_bitness = 12 +input_mode=INPUT_MODE_MIPI +raw_bitness=12 [mipi] -;----------only for mipi_dev--------- -data_type = 2 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -39,7 +15,7 @@ Isp_FrameRate=20 Isp_Bayer=BAYER_RGGB [vi_dev] -Input_mod = VI_MODE_MIPI +Input_mod=VI_MODE_MIPI Work_mod = VI_WORK_MODE_1Multiplex Mask_num = 2 Mask_0 = 0xFFF00000 @@ -74,10 +50,10 @@ Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, inval Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_w=2592 ; -DevRect_h=1944 ; -DevRect_x=200 ; -DevRect_y=20 ; +DevRect_w=2592 +DevRect_h=1944 +DevRect_x=200 +DevRect_y=20 Combine_mode =0 ;Y/C composite or separation mode ;VI_COMBINE_COMPOSITE = 0 /*Composite mode */ @@ -88,9 +64,4 @@ Comp_mode =0 ;Component mode (single-component or dual-component) Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge) ;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */ ;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */ - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ FullLinesStd=4500 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/5M_imx335.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/5M_imx335.ini index 1c0a2e9c2..b8a177546 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/5M_imx335.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/5M_imx335.ini @@ -1,26 +1,13 @@ [sensor] -Sensor_type =stSnsImx335Obj ;sensor name -Mode = WDR_MODE_2To1_LINE -DllFile = /usr/lib/sensors/libsns_imx335.so ;sensor lib path - +Sensor_type=stSnsImx335Obj +Mode=WDR_MODE_2To1_LINE +DllFile=libsns_imx335.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 2 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -28,7 +15,7 @@ Isp_FrameRate=20 Isp_Bayer=BAYER_RGGB [vi_dev] -Input_mod = VI_MODE_MIPI +Input_mod=VI_MODE_MIPI Work_mod = VI_WORK_MODE_1Multiplex Mask_num = 2 Mask_0 = 0xFFC00000 @@ -63,10 +50,10 @@ Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, inval Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_w=2592 ; -DevRect_h=1944 ; -DevRect_x=200 ; -DevRect_y=20 ; +DevRect_w=2592 +DevRect_h=1944 +DevRect_x=200 +DevRect_y=20 Combine_mode =0 ;Y/C composite or separation mode ;VI_COMBINE_COMPOSITE = 0 /*Composite mode */ @@ -77,9 +64,4 @@ Comp_mode =0 ;Component mode (single-component or dual-component) Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge) ;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */ ;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */ - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ FullLinesStd=4500 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/imx335_i2c_4M.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/imx335_i2c_4M.ini index e436a4e91..0216d8740 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/imx335_i2c_4M.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/imx335_i2c_4M.ini @@ -1,26 +1,13 @@ [sensor] -Sensor_type =stSnsImx335Obj ;sensor name -Mode = WDR_MODE_2To1_LINE -DllFile = /usr/lib/sensors/libsns_imx335.so ;sensor lib path - +Sensor_type=stSnsImx335Obj +Mode=WDR_MODE_2To1_LINE +DllFile=libsns_imx335.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 2 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -28,7 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_RGGB [vi_dev] -Input_mod = VI_MODE_MIPI +Input_mod=VI_MODE_MIPI Work_mod = VI_WORK_MODE_1Multiplex Mask_num = 2 Mask_0 = 0xFFC00000 @@ -63,10 +50,10 @@ Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, inval Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_w=2592 ; -DevRect_h=1520 ; -DevRect_x=200 ; -DevRect_y=400 ; +DevRect_w=2592 +DevRect_h=1520 +DevRect_x=200 +DevRect_y=400 Combine_mode =0 ;Y/C composite or separation mode ;VI_COMBINE_COMPOSITE = 0 /*Composite mode */ @@ -77,12 +64,7 @@ Comp_mode =0 ;Component mode (single-component or dual-component) Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge) ;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */ ;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */ - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ FullLinesStd=4500 [vi_chn] -CapRect_Y =120 +CapRect_Y=120 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/gc2053_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/gc2053_i2c_1080p.ini index 838e565b9..5988c757b 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/gc2053_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/gc2053_i2c_1080p.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsGc2053Obj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_gc2053.so ;sensor lib path - +Sensor_type=stSnsGc2053Obj +Mode=WDR_MODE_NONE +DllFile=libsns_gc2053.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 1 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_RGGB [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,15 +70,10 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 FullLinesStd=1108 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx307_i2c_2l_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx307_i2c_2l_1080p.ini index 4376da52d..1c66656cc 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx307_i2c_2l_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx307_i2c_2l_1080p.ini @@ -5,19 +5,9 @@ DllFile=libsns_imx307_2l.so [mode] input_mode=INPUT_MODE_MIPI -raw_bitness = 12 +raw_bitness=12 [mipi] -;----------only for mipi_dev--------- -data_type = 2 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -25,20 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_RGGB [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -93,15 +70,10 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 FullLinesStd=1125 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx335_i2c_4M.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx335_i2c_4M.ini index 807dd5fc1..11df3926c 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx335_i2c_4M.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx335_i2c_4M.ini @@ -1,27 +1,13 @@ [sensor] -Sensor_type =stSnsImx335Obj ;sensor name -Mode = WDR_MODE_NONE -DllFile = /usr/lib/sensors/libsns_imx335.so ;sensor lib path - +Sensor_type=stSnsImx335Obj +Mode=WDR_MODE_NONE +DllFile=libsns_imx335.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 2 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -29,7 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_RGGB [vi_dev] -Input_mod = VI_MODE_MIPI +Input_mod=VI_MODE_MIPI Work_mod = VI_WORK_MODE_1Multiplex Mask_num = 2 Mask_0 = 0xFFF00000 @@ -64,10 +50,10 @@ Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, inval Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_w=2592 ; -DevRect_h=1520 ; -DevRect_x=200 ; -DevRect_y=20 ; +DevRect_w=2592 +DevRect_h=1520 +DevRect_x=200 +DevRect_y=20 Combine_mode =0 ;Y/C composite or separation mode ;VI_COMBINE_COMPOSITE = 0 /*Composite mode */ @@ -78,9 +64,4 @@ Comp_mode =0 ;Component mode (single-component or dual-component) Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge) ;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */ ;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */ - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ FullLinesStd=3300 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf23_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf23_i2c_1080p.ini index 124f27b7a..029c5f1d7 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf23_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf23_i2c_1080p.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsSoiSensorObj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_f23.so ;sensor lib path - +Sensor_type=stSnsSoiSensorObj +Mode=WDR_MODE_NONE +DllFile=libsns_f23.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 1 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,14 +70,9 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf37_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf37_i2c_1080p.ini index 2c3be3d87..4154c6800 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf37_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/jxf37_i2c_1080p.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsSoiF37Obj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_f37.so ;sensor lib path - +Sensor_type=stSnsSoiF37Obj +Mode=WDR_MODE_NONE +DllFile=libsns_f37.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 12 +input_mode=INPUT_MODE_MIPI +raw_bitness=12 [mipi] -;----------only for mipi_dev--------- -data_type = 2 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_RGGB [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,14 +70,9 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2231_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2231_i2c_1080p.ini index 44815d12a..247566669 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2231_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2231_i2c_1080p.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsSc2231Obj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_sc2231.so ;sensor lib path - +Sensor_type=stSnsSc2231Obj +Mode=WDR_MODE_NONE +DllFile=libsns_sc2231.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 1 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,15 +70,10 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 FullLinesStd=1125 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2232h_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2232h_i2c_1080p.ini index 0b493d47d..58728088a 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2232h_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2232h_i2c_1080p.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsSc2232hObj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_sc2232h.so ;sensor lib path - +Sensor_type=stSnsSc2232hObj +Mode=WDR_MODE_NONE +DllFile=libsns_sc2232h.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 12 +input_mode=INPUT_MODE_MIPI +raw_bitness=12 [mipi] -;----------only for mipi_dev--------- -data_type = 2 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,14 +70,9 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2239_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2239_i2c_1080p.ini index 8602b48d9..5fc0f1ff2 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2239_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2239_i2c_1080p.ini @@ -1,37 +1,12 @@ [sensor] -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_sc2239.so - +Mode=WDR_MODE_NONE +DllFile=libsns_sc2239.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 1 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|-1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -39,20 +14,7 @@ Isp_FrameRate=20 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -107,14 +69,9 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2315e_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2315e_i2c_1080p.ini index 24fe5fdef..18e7e0902 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2315e_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc2315e_i2c_1080p.ini @@ -7,7 +7,6 @@ input_mode=INPUT_MODE_MIPI raw_bitness=10 [mipi] -data_type=DATA_TYPE_RAW_10BIT lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -15,20 +14,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -83,14 +69,9 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc3235_i2c_3M.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc3235_i2c_3M.ini index aa440d264..0a05d66f0 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc3235_i2c_3M.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc3235_i2c_3M.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsSc3235Obj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_sc3235.so ;sensor lib path - +Sensor_type=stSnsSc3235Obj +Mode=WDR_MODE_NONE +DllFile=libsns_sc3235.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 1 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=20 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,15 +70,10 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=2304 ; -DevRect_h=1296 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=2304 +DevRect_h=1296 FullLinesStd=1350 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc4236_i2c_3M.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc4236_i2c_3M.ini index 5202000cc..114b7be6f 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc4236_i2c_3M.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sc4236_i2c_3M.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsSc4236Obj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_sc4236.so ;sensor lib path - +Sensor_type=stSnsSc4236Obj +Mode=WDR_MODE_NONE +DllFile=libsns_sc4236.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 1 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=20 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,16 +70,11 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=2304 ; -DevRect_h=1296 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=2304 +DevRect_h=1296 FullLinesStd=1600 ExpandWrapBufLine=1 diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sp2305_i2c_1080p.ini b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sp2305_i2c_1080p.ini index b2ca72d29..c339e515c 100644 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sp2305_i2c_1080p.ini +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/sp2305_i2c_1080p.ini @@ -1,38 +1,13 @@ [sensor] -Sensor_type =stSnsSp2305Obj ;sensor name -Mode =0 ;WDR_MODE_NONE = 0 - ;WDR_MODE_BUILT_IN = 1 - ;WDR_MODE_QUDRA = 2 - ;WDR_MODE_2To1_LINE = 3 - ;WDR_MODE_2To1_FRAME = 4 - ;WDR_MODE_2To1_FRAME_FULL_RATE = 5 - ;WDR_MODE_3To1_LINE = 6 - ;WDR_MODE_3To1_FRAME = 7 - ;WDR_MODE_3To1_FRAME_FULL_RATE = 8 - ;WDR_MODE_4To1_LINE = 9 - ;WDR_MODE_4To1_FRAME = 10 - ;WDR_MODE_4To1_FRAME_FULL_RATE = 11 -DllFile = /usr/lib/sensors/libsns_sp2305.so ;sensor lib path - +Sensor_type=stSnsSp2305Obj +Mode=WDR_MODE_NONE +DllFile=libsns_sp2305.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - -raw_bitness = 10 +input_mode=INPUT_MODE_MIPI +raw_bitness=10 [mipi] -;----------only for mipi_dev--------- -data_type = 1 ;raw data type: 8/10/12/14 bit - ;DATA_TYPE_RAW_8BIT = 0, - ;DATA_TYPE_RAW_10BIT, - ;DATA_TYPE_RAW_12BIT, - ;DATA_TYPE_RAW_14BIT, - ;DATA_TYPE_RAW_16BIT, - ;DATA_TYPE_YUV420_8BIT_NORMAL, - ;DATA_TYPE_YUV420_8BIT_LEGACY, - ;DATA_TYPE_YUV422_8BIT, lane_id = 0|1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] @@ -40,20 +15,7 @@ Isp_FrameRate=25 Isp_Bayer=BAYER_BGGR [vi_dev] -Input_mod = 6 - ; VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ - ; VI_MODE_BT656_PACKED_YUV, /* ITU-R BT.656 packed YUV4:2:2 */ - ; VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ - ; VI_MODE_DIGITAL_CAMERA, /* digatal camera mode */ - ; VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ - ; VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ - ; VI_MODE_MIPI, /* MIPI RAW mode */ - ; VI_MODE_MIPI_YUV420_NORMAL, /* MIPI YUV420 normal mode */ - ; VI_MODE_MIPI_YUV420_LEGACY, /* MIPI YUV420 legacy mode */ - ; VI_MODE_MIPI_YUV422, /* MIPI YUV422 mode */ - ; VI_MODE_LVDS, /* LVDS mode */ - ; VI_MODE_HISPI, /* HiSPi mode */ - ; VI_MODE_SLVS, /* SLVS mode */ +Input_mod=VI_MODE_MIPI Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 ;VI_WORK_MODE_2Multiplex, ;VI_WORK_MODE_4Multiplex @@ -108,14 +70,9 @@ Timingblank_VsyncVbb=0 ;Vertical back blanking height Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) - -DataPath =1 ;ISP enable or bypass - ;VI_PATH_BYPASS = 0,/* ISP bypass */ - ;VI_PATH_ISP = 1,/* ISP enable */ - ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 -DevRect_x=200 ; -DevRect_y=20 ; -DevRect_w=1920 ; -DevRect_h=1080 ; +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080