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

cam: kms_sink: Remove limitation that camera and display must match

Browse source 
There is a limitation that requires input and output to be pixel
for pixel identical in terms of height and width. Remove this
limitation to enable more hardware that doesn't match. Just start
drawing from top left 0, 0 corner.

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Eric Curtin <ecurtin@redhat.com>
This commit is contained in:
Eric Curtin 2022-06-17 10:41:27 +01:00 • committed by Laurent Pinchart
parent c7d260c03a
commit 7cd8b54fd7
1 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/cam/kms_sink.cpp
View file

@ -11,6 +11,7 @@
#include <algorithm> #include <algorithm>
#include <assert.h> #include <assert.h>
#include <iostream> #include <iostream>
#include <limits.h>
#include <memory> #include <memory>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -112,14 +113,32 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config)
const libcamera::StreamConfiguration &cfg = config.at(0); const libcamera::StreamConfiguration &cfg = config.at(0);
/* Find the best mode for the stream size. */
const std::vector<DRM::Mode> &modes = connector_->modes(); const std::vector<DRM::Mode> &modes = connector_->modes();
const auto iter = std::find_if(modes.begin(), modes.end(),
[&](const DRM::Mode &mode) { unsigned int cfgArea = cfg.size.width * cfg.size.height;
return mode.hdisplay == cfg.size.width && unsigned int bestDistance = UINT_MAX;
mode.vdisplay == cfg.size.height;
}); for (const DRM::Mode &mode : modes) {
if (iter == modes.end()) { unsigned int modeArea = mode.hdisplay * mode.vdisplay;
std::cerr << "No mode matching " << cfg.size << std::endl; unsigned int distance = modeArea > cfgArea ? modeArea - cfgArea
: cfgArea - modeArea;
if (distance < bestDistance) {
mode_ = &mode;
bestDistance = distance;
/*
* If the sizes match exactly, there will be no better
* match.
*/
if (distance == 0)
break;
}
}
if (!mode_) {
std::cerr << "No modes\n";
return -EINVAL; return -EINVAL;
} }
@ -127,7 +146,6 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config)
if (ret < 0) if (ret < 0)
return ret; return ret;
mode_ = &*iter;
size_ = cfg.size; size_ = cfg.size;
stride_ = cfg.stride; stride_ = cfg.stride;
@ -202,7 +220,8 @@ int KMSSink::configurePipeline(const libcamera::PixelFormat &format)
std::cout std::cout
<< "Using KMS plane " << plane_->id() << ", CRTC " << crtc_->id() << "Using KMS plane " << plane_->id() << ", CRTC " << crtc_->id()
<< ", connector " << connector_->name() << ", connector " << connector_->name()
<< " (" << connector_->id() << ")" << std::endl; << " (" << connector_->id() << "), mode " << mode_->hdisplay
<< "x" << mode_->vdisplay << "@" << mode_->vrefresh << std::endl;
return 0; return 0;
} }
@ -295,12 +314,12 @@ bool KMSSink::processRequest(libcamera::Request *camRequest)
drmRequest->addProperty(plane_, "CRTC_ID", crtc_->id()); drmRequest->addProperty(plane_, "CRTC_ID", crtc_->id());
drmRequest->addProperty(plane_, "SRC_X", 0 << 16); drmRequest->addProperty(plane_, "SRC_X", 0 << 16);
drmRequest->addProperty(plane_, "SRC_Y", 0 << 16); drmRequest->addProperty(plane_, "SRC_Y", 0 << 16);
drmRequest->addProperty(plane_, "SRC_W", mode_->hdisplay << 16); drmRequest->addProperty(plane_, "SRC_W", size_.width << 16);
drmRequest->addProperty(plane_, "SRC_H", mode_->vdisplay << 16); drmRequest->addProperty(plane_, "SRC_H", size_.height << 16);
drmRequest->addProperty(plane_, "CRTC_X", 0); drmRequest->addProperty(plane_, "CRTC_X", 0);
drmRequest->addProperty(plane_, "CRTC_Y", 0); drmRequest->addProperty(plane_, "CRTC_Y", 0);
drmRequest->addProperty(plane_, "CRTC_W", mode_->hdisplay); drmRequest->addProperty(plane_, "CRTC_W", size_.width);
drmRequest->addProperty(plane_, "CRTC_H", mode_->vdisplay); drmRequest->addProperty(plane_, "CRTC_H", size_.height);
flags |= DRM::AtomicRequest::FlagAllowModeset; flags |= DRM::AtomicRequest::FlagAllowModeset;
} }