Skip to content

Commit

Permalink
Merge pull request #142 from zouxiaoh/iotg_ipu6
Browse files Browse the repository at this point in the history 
RPL-P MR4 & RPL-PS MR2 release
  • Loading branch information
@zouxiaoh
zouxiaoh authored Dec 24, 2024
2 parents 3f0b661 + 6ff1735 commit f0b9033
Show file tree
Hide file tree
Showing 9 changed files with 361 additions and 145 deletions.
2 changes: 1 addition & 1 deletion config/linux/ipu6ep/libcamhal_profile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<availableSensors value="ov13b10-wf-2,ov13b10-uf-1,ov8856-wf-2,ov8856-uf-1,ov01a10-uf-1,ov01a10-uf-2,ov02c10-uf-1,ov02c10-uf-2,
ov2740-uf-1,hm2170-uf-1,hm2170-uf-2,hi556-uf-1,ov01a1s-uf-1,ov08a10-uf-1,
isx031,imx390,ar0234-1-1,ar0234-2-2,external_source,ar0234_usb,
lt6911uxc-1-1,lt6911uxc-2-2,lt6911uxe-1-1.lt6911uxe-2-2"/>
lt6911uxc-1-1,lt6911uxc-2-2,lt6911uxc-pdata1-1,lt6911uxc-pdata2-2,lt6911uxe-1-1,lt6911uxe-2-2"/>
</Common>
</CameraSettings>
41 changes: 9 additions & 32 deletions config/linux/ipu6ep/sensors/lt6911uxc-1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,6 @@
<videonode name="lt6911uxc b" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="2">
<!-- FE capture -->
<format name="lt6911uxc b" pad="0" width="2048" height="1080" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 1" pad="0" width="2048" height="1080" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 BE SOC 0" pad="0" width="2048" height="1080" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<link srcName="lt6911uxc b" srcPad="0" sinkName="Intel IPU6 CSI-2 1" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 1" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC 0" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 BE SOC 0" srcPad="1" sinkName="Intel IPU6 BE SOC capture 0" sinkPad="0" enable="true"/>
<videonode name="Intel IPU6 BE SOC capture 0" videoNodeType="VIDEO_GENERIC"/>
<videonode name="Intel IPU6 CSI-2 1" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc b" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="3">
<!-- FE capture -->
<format name="lt6911uxc b" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 1" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -63,7 +51,7 @@
<videonode name="Intel IPU6 CSI-2 1" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc b" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="4">
<MediaCtlConfig id="3">
<!-- FE capture -->
<format name="lt6911uxc b" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 1" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -75,7 +63,7 @@
<videonode name="Intel IPU6 CSI-2 1" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc b" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="5">
<MediaCtlConfig id="4">
<!-- FE capture -->
<format name="lt6911uxc b" pad="0" width="3840" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 1" pad="0" width="3840" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand Down Expand Up @@ -107,17 +95,7 @@
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="2" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="2048" height="1080" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="2048" height="1080" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<link srcName="lt6911uxc $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI2 $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 ISYS Capture $CAPTURE_ID" sinkPad="0" enable="true"/>
<videonode name="Intel IPU6 ISYS Capture $CAPTURE_ID" videoNodeType="VIDEO_GENERIC"/>
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="3" mediaCfg="1">
<MediaCtlConfig id="2" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -127,7 +105,7 @@
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="4" mediaCfg="1">
<MediaCtlConfig id="3" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -137,7 +115,7 @@
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="5" mediaCfg="1">
<MediaCtlConfig id="4" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="3840" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="3840" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -152,13 +130,12 @@
<!-- list of stream config info. Meanings of each part is "format,widthxheight,field(0 is none, 7 is alternate),mcId" -->
<supportedStreamConfig value="V4L2_PIX_FMT_UYVY,1280x720,0,0,
V4L2_PIX_FMT_UYVY,1920x1080,0,1,
V4L2_PIX_FMT_UYVY,2048x1080,0,2,
V4L2_PIX_FMT_UYVY,2560x1440,0,3,
V4L2_PIX_FMT_UYVY,1920x2160,0,4,
V4L2_PIX_FMT_UYVY,3840x2160,0,5"/>
V4L2_PIX_FMT_UYVY,2560x1440,0,2,
V4L2_PIX_FMT_UYVY,1920x2160,0,3,
V4L2_PIX_FMT_UYVY,3840x2160,0,4"/>
<fpsRange value="10,30,10,60"/>
</StaticMetadata>
<supportedISysSizes value="1280x720,1920x1080,2048x1080,2560x1440,1920x2160,3840x2160"/>
<supportedISysSizes value="1280x720,1920x1080,2560x1440,1920x2160,3840x2160"/>
<!-- ascending order request-->
<supportedISysFormat value="V4L2_PIX_FMT_UYVY"/>
<enableAIQ value="false"/>
Expand Down
35 changes: 13 additions & 22 deletions config/linux/ipu6ep/sensors/lt6911uxc-2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
</MediaCtlConfig>
<MediaCtlConfig id="2">
<!-- FE capture -->
<format name="lt6911uxc c" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 2" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 BE SOC 1" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="lt6911uxc c" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 2" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 BE SOC 1" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<link srcName="lt6911uxc c" srcPad="0" sinkName="Intel IPU6 CSI-2 2" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 2" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC 1" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 BE SOC 1" srcPad="1" sinkName="Intel IPU6 BE SOC 1 capture 0" sinkPad="0" enable="true"/>
Expand All @@ -53,9 +53,9 @@
</MediaCtlConfig>
<MediaCtlConfig id="3">
<!-- FE capture -->
<format name="lt6911uxc c" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 2" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 BE SOC 1" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="lt6911uxc c" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI-2 2" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 BE SOC 1" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<link srcName="lt6911uxc c" srcPad="0" sinkName="Intel IPU6 CSI-2 2" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 2" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC 1" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 BE SOC 1" srcPad="1" sinkName="Intel IPU6 BE SOC 1 capture 0" sinkPad="0" enable="true"/>
Expand Down Expand Up @@ -95,17 +95,7 @@
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="2" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="2048" height="1080" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="2048" height="1080" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<link srcName="lt6911uxc $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI2 $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 ISYS Capture $CAPTURE_ID" sinkPad="0" enable="true"/>
<videonode name="Intel IPU6 ISYS Capture $CAPTURE_ID" videoNodeType="VIDEO_GENERIC"/>
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="3" mediaCfg="1">
<MediaCtlConfig id="2" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="2560" height="1440" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -115,7 +105,7 @@
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="4" mediaCfg="1">
<MediaCtlConfig id="3" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="1920" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -125,7 +115,7 @@
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>
<MediaCtlConfig id="5" mediaCfg="1">
<MediaCtlConfig id="4" mediaCfg="1">
<!-- FE capture -->
<format name="lt6911uxc $I2CBUS" pad="0" width="3840" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="3840" height="2160" format="V4L2_MBUS_FMT_UYVY8_1X16"/>
Expand All @@ -135,16 +125,17 @@
<videonode name="Intel IPU6 CSI2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="lt6911uxc $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
</MediaCtlConfig>

<StaticMetadata>
<!-- list of stream config info. Meanings of each part is "format,widthxheight,field(0 is none, 7 is alternate),mcId" -->
<supportedStreamConfig value="V4L2_PIX_FMT_UYVY,1280x720,0,0,
V4L2_PIX_FMT_UYVY,1920x1080,0,1,
V4L2_PIX_FMT_UYVY,1920x2160,0,2,
V4L2_PIX_FMT_UYVY,2560x1440,0,3,
V4L2_PIX_FMT_UYVY,2560x1440,0,2,
V4L2_PIX_FMT_UYVY,1920x2160,0,3,
V4L2_PIX_FMT_UYVY,3840x2160,0,4"/>
<fpsRange value="10,30,10,60"/>
</StaticMetadata>
<supportedISysSizes value="1280x720,1920x1080,1920x2160,2560x1440,3840x2160"/>
<supportedISysSizes value="1280x720,1920x1080,2560x1440,1920x2160,3840x2160"/>
<!-- ascending order request-->
<supportedISysFormat value="V4L2_PIX_FMT_UYVY"/>
<enableAIQ value="false"/>
Expand Down
Loading

0 comments on commit f0b9033

Please sign in to comment.