Skip to content

ipu6epmtl: route ov08x40 through Intel CVS path #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saragsapre merged 1 commit into from
Aug 19, 2026
Merged

ipu6epmtl: route ov08x40 through Intel CVS path #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions config/linux/ipu6epmtl/sensors/ov08x40-uf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@
<Sensor name="ov08x40-uf" description="ov08x40 as sensor.">
<MediaCtlConfig id="0" ConfigMode="AUTO" outputWidth="3856" outputHeight="2176" format="V4L2_PIX_FMT_SGRBG10"> <!-- RAW10 BE capture -->
<format name="ov08x40 $I2CBUS" pad="0" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel CVS" pad="0" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel CVS" pad="1" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI-2 $CSI_PORT" pad="0" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI2 BE SOC 0" pad="0" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<!--format name="Intel IPU6 CSI2 BE SOC 0" pad="1" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/ -->
<link srcName="ov08x40 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI-2 $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="ov08x40 $I2CBUS" srcPad="0" sinkName="Intel CVS" sinkPad="0" enable="true"/>
<link srcName="Intel CVS" srcPad="1" sinkName="Intel IPU6 CSI-2 $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 $CSI_PORT" 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"/>

Expand All @@ -28,9 +31,12 @@
</MediaCtlConfig>
<MediaCtlConfig id="0" mediaCfg="1" ConfigMode="AUTO" outputWidth="3856" outputHeight="2176" format="V4L2_PIX_FMT_SGRBG10"> <!-- RAW10 BE capture -->
<format name="ov08x40 $I2CBUS" pad="0" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel CVS" pad="0" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel CVS" pad="1" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="3856" height="2176" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>

<link srcName="ov08x40 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI2 $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="ov08x40 $I2CBUS" srcPad="0" sinkName="Intel CVS" sinkPad="0" enable="true"/>
<link srcName="Intel CVS" srcPad="1" 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"/>
Expand Down
23 changes: 16 additions & 7 deletions src/v4l2/MediaControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ struct MediaEntity {
char devname[32];
};

static const string ivscName = "Intel IVSC CSI";
static const string ivscName = "Intel CVS";
Comment thread
arunt1 marked this conversation as resolved.
static const string ivscLegacyName = "Intel IVSC CSI";

MediaControl* MediaControl::sInstance = nullptr;
Mutex MediaControl::sLock;

Expand Down Expand Up @@ -909,18 +911,20 @@ int MediaControl::mediaCtlSetup(int cameraId, MediaCtlConf* mc, int width, int h
}

MediaEntity* ivsc = getEntityByName(ivscName.c_str());
if (!ivsc) ivsc = getEntityByName(ivscLegacyName.c_str());
if (ivsc) {
for (uint32_t i = 0; i < ivsc->numLinks; ++i) {
if (ivsc->links[i].sink->entity == ivsc) {
MediaEntity* sensor = ivsc->links[i].source->entity;
int sensor_entity_id = sensor->info.id;
LOG1("@%s, found %s -> %s", __func__, sensor->info.name, ivscName.c_str());
LOG1("@%s, found %s -> %s", __func__, sensor->info.name, ivsc->info.name);
for (McLink& link : mc->links) {
if (link.srcEntity == sensor_entity_id) {
if (link.srcEntity == sensor_entity_id &&
link.sinkEntity != static_cast<int>(ivsc->info.id)) {
LOG1("@%s, skip %s, link %s -> %s", __func__, link.srcEntityName.c_str(),
ivscName.c_str(), link.sinkEntityName.c_str());
ivsc->info.name, link.sinkEntityName.c_str());
link.srcEntity = ivsc->info.id;
link.srcEntityName = ivscName;
link.srcEntityName = ivsc->info.name;
for (uint32_t j = 0; j < ivsc->info.pads; ++j) {
if (ivsc->pads[j].flags & MEDIA_PAD_FL_SOURCE) {
link.srcPad = j;
Expand Down Expand Up @@ -1008,6 +1012,7 @@ int MediaControl::getLensName(string* lensName) {
int MediaControl::getPrivacyDeviceName(std::string* name) {
CheckAndLogError(!name, UNKNOWN_ERROR, "nullptr input");
MediaEntity* ivsc = getEntityByName(ivscName.c_str());
if (!ivsc) ivsc = getEntityByName(ivscLegacyName.c_str());

if (!ivsc) {
return BAD_VALUE;
Expand Down Expand Up @@ -1093,8 +1098,12 @@ int MediaControl::getI2CBusAddress(const string& sensorEntityName, const string&
for (int i = 0; i < linksCount; i++) {
if (strcmp(links[i].sink->entity->info.name, sinkEntityName.c_str()) == 0) {
entityName = entity.info.name;
if (strcmp(entityName, ivscName.c_str()) == 0) {
return getI2CBusAddress(sensorEntityName, ivscName, i2cBus);
if ((strcmp(entityName, ivscName.c_str()) == 0) ||
(strcmp(entityName, ivscLegacyName.c_str()) == 0)) {
std::string matchedIvscName =
(strcmp(entityName, ivscName.c_str()) == 0) ? ivscName : ivscLegacyName;

return getI2CBusAddress(sensorEntityName, matchedIvscName, i2cBus);
}
break;
}
Expand Down
Loading