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 75e2c908..c651fc4c 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 @@ -35,13 +35,8 @@ data_type = 2 ;raw data type: 8/10/12/14 bit lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =2592 -Isp_H =1944 Isp_FrameRate=20 -Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 - +Isp_Bayer=BAYER_RGGB [vi_dev] Input_mod = VI_MODE_MIPI @@ -94,31 +89,8 @@ 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 */ -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD 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 */ - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=2592 -CapRect_Height=1944 -DestSize_Width=2592 -DestSize_Height=1944 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +FullLinesStd=1875 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 952d6390..225fa805 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 @@ -24,13 +24,8 @@ data_type = 2 ;raw data type: 8/10/12/14 bit lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =2592 -Isp_H =1944 Isp_FrameRate=20 -Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 - +Isp_Bayer=BAYER_RGGB [vi_dev] Input_mod = VI_MODE_MIPI @@ -83,31 +78,8 @@ 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 */ -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD 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 */ - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=2592 -CapRect_Height=1944 -DestSize_Width=2592 -DestSize_Height=1944 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +FullLinesStd=1875 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 fe703fe4..f2edaa70 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 @@ -24,13 +24,8 @@ data_type = 2 ;raw data type: 8/10/12/14 bit lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =2592 -Isp_H =1520 Isp_FrameRate=25 -Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 - +Isp_Bayer=BAYER_RGGB [vi_dev] Input_mod = VI_MODE_MIPI @@ -83,31 +78,11 @@ 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 */ -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD 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=1375 [vi_chn] -CapRect_X =0 CapRect_Y =120 -CapRect_Width=2592 -CapRect_Height=1520 -DestSize_Width=2592 -DestSize_Height=1520 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll 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 f56351ec..838e565b 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 @@ -36,12 +36,8 @@ data_type = 1 ;raw data type: 8/10/12/14 bit lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_RGGB [vi_dev] Input_mod = 6 @@ -113,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +119,4 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +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 431db745..4376da52 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 @@ -1,25 +1,10 @@ [sensor] -Sensor_type =stSnsImx307_2l_Obj ;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_imx307_2l.so ;sensor lib path - +Sensor_type=stSnsImx307_2l_Obj +Mode=WDR_MODE_NONE +DllFile=libsns_imx307_2l.so [mode] -input_mode =0 ;INPUT_MODE_MIPI = 0 - ;INPUT_MODE_SUBLVDS = 1 - ;INPUT_MODE_LVDS = 2 ...etc - +input_mode=INPUT_MODE_MIPI raw_bitness = 12 [mipi] @@ -36,12 +21,8 @@ data_type = 2 ;raw data type: 8/10/12/14 bit lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_RGGB [vi_dev] Input_mod = 6 @@ -113,11 +94,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +104,4 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +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 b2f2f290..0fe4e6a0 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 @@ -25,13 +25,8 @@ data_type = 2 ;raw data type: 8/10/12/14 bit lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =2592 -Isp_H =1520 Isp_FrameRate=25 -Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 - +Isp_Bayer=BAYER_RGGB [vi_dev] Input_mod = VI_MODE_MIPI @@ -84,31 +79,8 @@ 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 */ -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD 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 */ - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=2592 -CapRect_Height=1520 -DestSize_Width=2592 -DestSize_Height=1520 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +FullLinesStd=1375 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 8cb1b732..124f27b7 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 @@ -35,45 +35,9 @@ data_type = 1 ;raw data type: 8/10/12/14 bit ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable -[lvds] -;----------only for lvds_dev--------- -img_size_w = -1 ;oringnal sensor input image size W -img_size_h = -1 ;oringnal sensor input image size H -wdr_mode = -1 ;HI_WDR_MODE_NONE =0 - ;HI_WDR_MODE_2F = 1 - ;HI_WDR_MODE_3F = 2 - ;HI_WDR_MODE_4F =3 -sync_mode = -1 ;LVDS_SYNC_MODE_SOL = 0 - ;LVDS_SYNC_MODE_SAV = 1 -raw_data_type = -1 ;RAW_DATA_8BIT = 0 - ;RAW_DATA_10BIT = 1 - ;RAW_DATA_12BIT = 2 - ;RAW_DATA_14BIT = 3 -data_endian = -1 ;LVDS_ENDIAN_LITTLE = 0 - ;LVDS_ENDIAN_BIG = 1 -sync_code_endian =-1 ;LVDS_ENDIAN_LITTLE = 0 - ;LVDS_ENDIAN_BIG = 1 -lane_id = -1|-1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable -lvds_lane_num = -1 ;LVDS_LANE_NUM -wdr_vc_num = -1 ;WDR_VC_NUM -sync_code_num = -1 ;SYNC_CODE_NUM -sync_code_0 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_1 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_2 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_3 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_4 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_5 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_6 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_7 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| - [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 - +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -145,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -160,22 +119,3 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll 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 8f7d12a1..2c3be3d8 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 @@ -35,45 +35,9 @@ data_type = 2 ;raw data type: 8/10/12/14 bit ;DATA_TYPE_YUV422_8BIT, lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable -[lvds] -;----------only for lvds_dev--------- -img_size_w = -1 ;oringnal sensor input image size W -img_size_h = -1 ;oringnal sensor input image size H -wdr_mode = -1 ;HI_WDR_MODE_NONE =0 - ;HI_WDR_MODE_2F = 1 - ;HI_WDR_MODE_3F = 2 - ;HI_WDR_MODE_4F =3 -sync_mode = -1 ;LVDS_SYNC_MODE_SOL = 0 - ;LVDS_SYNC_MODE_SAV = 1 -raw_data_type = -1 ;RAW_DATA_8BIT = 0 - ;RAW_DATA_10BIT = 1 - ;RAW_DATA_12BIT = 2 - ;RAW_DATA_14BIT = 3 -data_endian = -1 ;LVDS_ENDIAN_LITTLE = 0 - ;LVDS_ENDIAN_BIG = 1 -sync_code_endian =-1 ;LVDS_ENDIAN_LITTLE = 0 - ;LVDS_ENDIAN_BIG = 1 -lane_id = -1|-1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable -lvds_lane_num = -1 ;LVDS_LANE_NUM -wdr_vc_num = -1 ;WDR_VC_NUM -sync_code_num = -1 ;SYNC_CODE_NUM -sync_code_0 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_1 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_2 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_3 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_4 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_5 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_6 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| -sync_code_7 = -1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1|-1| - [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 - +Isp_Bayer=BAYER_RGGB [vi_dev] Input_mod = 6 @@ -145,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -160,22 +119,3 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll 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 2444f582..44815d12 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 @@ -36,12 +36,8 @@ data_type = 1 ;raw data type: 8/10/12/14 bit lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -113,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +119,4 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +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 02a27e51..0b493d47 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 @@ -36,12 +36,8 @@ data_type = 2 ;raw data type: 8/10/12/14 bit lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -113,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +119,3 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll 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 9b7d5b47..8602b48d 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 @@ -35,12 +35,8 @@ data_type = 1 ;raw data type: 8/10/12/14 bit lane_id = 0|-1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=20 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -112,11 +108,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -127,22 +118,3 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll 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 8da8aa59..97acd53d 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 @@ -36,12 +36,8 @@ data_type = 1 ;raw data type: 8/10/12/14 bit lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -113,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +119,3 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll 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 3825de3c..aa440d26 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 @@ -36,12 +36,8 @@ data_type = 1 ;raw data type: 8/10/12/14 bit lane_id = 0|2|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =2304 -Isp_H =1296 Isp_FrameRate=20 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -113,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +119,4 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=2304 ; DevRect_h=1296 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=2304 -CapRect_Height=1296 -DestSize_Width=2304 -DestSize_Height=1296 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +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 d0acadfd..5202000c 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 @@ -36,12 +36,8 @@ data_type = 1 ;raw data type: 8/10/12/14 bit lane_id = 0|1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =2304 -Isp_H =1296 Isp_FrameRate=20 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -113,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +119,5 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=2304 ; DevRect_h=1296 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=2304 -CapRect_Height=1296 -DestSize_Width=2304 -DestSize_Height=1296 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll +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 628f27a9..b2ca72d2 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 @@ -36,12 +36,8 @@ data_type = 1 ;raw data type: 8/10/12/14 bit lane_id = 0|1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable [isp_image] -Isp_x =0 -Isp_y =0 -Isp_W =1920 -Isp_H =1080 Isp_FrameRate=25 -Isp_Bayer =3 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3 +Isp_Bayer=BAYER_BGGR [vi_dev] Input_mod = 6 @@ -113,11 +109,6 @@ Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) -;----- only for bt656 ---------- -FixCode =0 ;BT656_FIXCODE_1 = 0, - ;BT656_FIXCODE_0 -FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0 - ;BT656_FIELD_POLAR_NSTD DataPath =1 ;ISP enable or bypass ;VI_PATH_BYPASS = 0,/* ISP bypass */ ;VI_PATH_ISP = 1,/* ISP enable */ @@ -128,22 +119,3 @@ DevRect_x=200 ; DevRect_y=20 ; DevRect_w=1920 ; DevRect_h=1080 ; - -[vi_chn] -CapRect_X =0 -CapRect_Y =0 -CapRect_Width=1920 -CapRect_Height=1080 -DestSize_Width=1920 -DestSize_Height=1080 -CapSel =2 ;Frame/field select. ONLY used in interlaced mode - ;VI_CAPSEL_TOP = 0, /* top field */ - ;VI_CAPSEL_BOTTOM, /* bottom field */ - ;VI_CAPSEL_BOTH, /* top and bottom field */ - -PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc -CompressMode =0 ;COMPRESS_MODE_NONE = 0 - ;COMPRESS_MODE_SEG =1 ...etc - -SrcFrameRate=-1 ;Source frame rate. -1: not controll -FrameRate =-1 ;Target frame rate. -1: not controll