Skip to content

Commit

Permalink
Merge pull request #111 from widgetii/master
Browse files Browse the repository at this point in the history 
Make sensor config concise (iteration #2)
  • Loading branch information
@ZigFisher
ZigFisher authored Dec 15, 2021
2 parents 7022d22 + 26220ef commit 551f019
Show file tree
Hide file tree
Showing 15 changed files with 141 additions and 659 deletions.
49 changes: 10 additions & 39 deletions general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/5M_imx335.ini
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,21 @@
[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]
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
Expand Down Expand Up @@ -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 */
Expand All @@ -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
38 changes: 10 additions & 28 deletions general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/5M_imx335.ini
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,21 @@
[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]
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
Expand Down Expand Up @@ -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 */
Expand All @@ -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
40 changes: 11 additions & 29 deletions general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/WDR/imx335_i2c_4M.ini
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,21 @@
[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]
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
Expand Down Expand Up @@ -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 */
Expand All @@ -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
63 changes: 10 additions & 53 deletions general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/gc2053_i2c_1080p.ini
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,21 @@
[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]
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
Expand Down Expand Up @@ -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
40 changes: 6 additions & 34 deletions general/package/hisilicon-osdrv-hi3516ev300/files/sensor/config/imx307_i2c_2l_1080p.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,17 @@ 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]
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
Expand Down Expand Up @@ -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
Loading

0 comments on commit 551f019

Please sign in to comment.