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

cam: kms_sink: Use the first suitable pipeline found

Browse source 
When searching for a suitable pipeline, we mistakenly only break from
the inner loop. This results in the last suitable output being selected.
Pick the first one instead.

Fixes: 1de0f90dd4 ("cam: kms_sink: Print display pipelineconfiguration")
Signed-off-by: Eric Curtin <ecurtin@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Eric Curtin 2022-02-07 15:01:36 +00:00 • committed by Laurent Pinchart
parent 7653021549
commit ca20503f62
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cam/kms_sink.cpp
View file

@ -136,7 +136,7 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config)
return 0; return 0;
} }
int KMSSink::configurePipeline(const libcamera::PixelFormat &format) int KMSSink::selectPipeline(const libcamera::PixelFormat &format)
{ {
/* /*
* If the requested format has an alpha channel, also consider the X * If the requested format has an alpha channel, also consider the X
@ -174,25 +174,31 @@ int KMSSink::configurePipeline(const libcamera::PixelFormat &format)
crtc_ = crtc; crtc_ = crtc;
plane_ = plane; plane_ = plane;
format_ = format; format_ = format;
break; return 0;
} }
if (plane->supportsFormat(xFormat)) { if (plane->supportsFormat(xFormat)) {
crtc_ = crtc; crtc_ = crtc;
plane_ = plane; plane_ = plane;
format_ = xFormat; format_ = xFormat;
break; return 0;
} }
} }
} }
} }
if (!crtc_) { return -EPIPE;
}
int KMSSink::configurePipeline(const libcamera::PixelFormat &format)
{
const int ret = selectPipeline(format);
if (ret) {
std::cerr std::cerr
<< "Unable to find display pipeline for format " << "Unable to find display pipeline for format "
<< format.toString() << std::endl; << format.toString() << std::endl;
return -EPIPE; return ret;
} }
std::cout std::cout

1
src/cam/kms_sink.h
View file

@ -47,6 +47,7 @@ private:
libcamera::Request *camRequest_; libcamera::Request *camRequest_;
}; };
int selectPipeline(const libcamera::PixelFormat &format);
int configurePipeline(const libcamera::PixelFormat &format); int configurePipeline(const libcamera::PixelFormat &format);
void requestComplete(DRM::AtomicRequest *request); void requestComplete(DRM::AtomicRequest *request);