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

pipeline: raspberrypi: Drop unused code

Browse source 
Commit 1a614866a2 ("libcamera: camera_sensor: Validate Transform") has
removed usage of the RPiCameraData::supportsFlips_ but hasn't removed
the field itself, nor its initialization. Drop those as they're unused.

Fixes: 1a614866a2 ("libcamera: camera_sensor: Validate Transform")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2023-02-05 14:49:17 +02:00
parent 9cc5cbadc2
commit 3aa42f36c0
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View file

@ -187,8 +187,8 @@ class RPiCameraData : public Camera::Private
public: public:
RPiCameraData(PipelineHandler *pipe) RPiCameraData(PipelineHandler *pipe)
: Camera::Private(pipe), state_(State::Stopped), : Camera::Private(pipe), state_(State::Stopped),
supportsFlips_(false), flipsAlterBayerOrder_(false), flipsAlterBayerOrder_(false), dropFrameCount_(0),
dropFrameCount_(0), buffersAllocated_(false), ispOutputCount_(0) buffersAllocated_(false), ispOutputCount_(0)
{ {
} }
@ -275,11 +275,9 @@ public:
std::deque<Request *> requestQueue_; std::deque<Request *> requestQueue_;
/* /*
* Manage horizontal and vertical flips supported (or not) by the * Store the "native" Bayer order (that is, with no transforms
* sensor. Also store the "native" Bayer order (that is, with no * applied).
* transforms applied).
*/ */
bool supportsFlips_;
bool flipsAlterBayerOrder_; bool flipsAlterBayerOrder_;
BayerFormat::Order nativeBayerOrder_; BayerFormat::Order nativeBayerOrder_;
@ -1424,12 +1422,10 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me
data->properties_.set(properties::ScalerCropMaximum, Rectangle{}); data->properties_.set(properties::ScalerCropMaximum, Rectangle{});
/* /*
* We cache three things about the sensor in relation to transforms * We cache two things about the sensor in relation to transforms
* (meaning horizontal and vertical flips). * (meaning horizontal and vertical flips): if they affect the Bayer
* * ordering, and what the "native" Bayer order is, when no transforms
* If flips are supported verify if they affect the Bayer ordering * are applied.
* and what the "native" Bayer order is, when no transforms are
* applied.
* *
* We note that the sensor's cached list of supported formats is * We note that the sensor's cached list of supported formats is
* already in the "native" order, with any flips having been undone. * already in the "native" order, with any flips having been undone.
@ -1438,7 +1434,6 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me
const struct v4l2_query_ext_ctrl *hflipCtrl = sensor->controlInfo(V4L2_CID_HFLIP); const struct v4l2_query_ext_ctrl *hflipCtrl = sensor->controlInfo(V4L2_CID_HFLIP);
if (hflipCtrl) { if (hflipCtrl) {
/* We assume it will support vflips too... */ /* We assume it will support vflips too... */
data->supportsFlips_ = true;
data->flipsAlterBayerOrder_ = hflipCtrl->flags & V4L2_CTRL_FLAG_MODIFY_LAYOUT; data->flipsAlterBayerOrder_ = hflipCtrl->flags & V4L2_CTRL_FLAG_MODIFY_LAYOUT;
} }