NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: mali-c55: Enable links between resizer and video node

Browse source 
The mali-c55 driver now expects links to video devices to be enabled
in order for those devices to be streamed from / to. Enable the media
link between the resizers and their associated video device to fulfil
the requirement.

Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
This commit is contained in:
Daniel Scally 2024-11-15 10:13:32 +00:00
parent 6925d043f8
commit 0ce849ab38
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libcamera/pipeline/mali-c55/mali-c55.cpp
View file

@ -509,6 +509,7 @@ private:
struct MaliC55Pipe { struct MaliC55Pipe {
std::unique_ptr<V4L2Subdevice> resizer; std::unique_ptr<V4L2Subdevice> resizer;
std::unique_ptr<V4L2VideoDevice> cap; std::unique_ptr<V4L2VideoDevice> cap;
MediaLink *link;
Stream *stream; Stream *stream;
}; };
@ -835,6 +836,17 @@ int PipelineHandlerMaliC55::configure(Camera *camera,
Stream *stream = streamConfig.stream(); Stream *stream = streamConfig.stream();
MaliC55Pipe *pipe = pipeFromStream(data, stream); MaliC55Pipe *pipe = pipeFromStream(data, stream);
/*
* Enable the media link between the pipe's resizer and the
* capture video device
*/
ret = pipe->link->setEnabled(true);
if (ret) {
LOG(MaliC55, Error) << "Couldn't enable resizer's link";
return ret;
}
if (isFormatRaw(streamConfig.pixelFormat)) if (isFormatRaw(streamConfig.pixelFormat))
ret = configureRawStream(data, streamConfig, subdevFormat); ret = configureRawStream(data, streamConfig, subdevFormat);
else else
@ -1028,6 +1040,12 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)
if (frPipe->cap->open() < 0) if (frPipe->cap->open() < 0)
return false; return false;
frPipe->link = media_->link("mali-c55 resizer fr", 1, "mali-c55 fr", 0);
if (!frPipe->link) {
LOG(MaliC55, Error) << "No link between fr resizer and video node";
return false;
}
frPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::imageBufferReady); frPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::imageBufferReady);
dsFitted_ = !!media_->getEntityByName("mali-c55 ds"); dsFitted_ = !!media_->getEntityByName("mali-c55 ds");
@ -1044,6 +1062,13 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)
if (dsPipe->cap->open() < 0) if (dsPipe->cap->open() < 0)
return false; return false;
dsPipe->link = media_->link("mali-c55 resizer ds", 1,
"mali-c55 ds", 0);
if (!dsPipe->link) {
LOG(MaliC55, Error) << "No link between ds resizer and video node";
return false;
}
dsPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::imageBufferReady); dsPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::imageBufferReady);
} }