Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-26 01:55:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: ipu3: Remove usage of IPU3CameraData from ImgUDevice

Browse source 
The IPU3CameraData argument to allocateBuffers() and freeBuffers() is no
longer used and can be removed.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2020-06-27 00:12:15 +02:00
parent 72e36e8d8d
commit 942f6c5ceb
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -34,8 +34,6 @@ namespace libcamera {
LOG_DEFINE_CATEGORY(IPU3) LOG_DEFINE_CATEGORY(IPU3)
class IPU3CameraData;
class ImgUDevice class ImgUDevice
{ {
public: public:
@ -75,8 +73,8 @@ public:
const StreamConfiguration &cfg, const StreamConfiguration &cfg,
V4L2DeviceFormat *outputFormat); V4L2DeviceFormat *outputFormat);
int allocateBuffers(IPU3CameraData *data, unsigned int bufferCount); int allocateBuffers(unsigned int bufferCount);
void freeBuffers(IPU3CameraData *data); void freeBuffers();
int start(); int start();
int stop(); int stop();
@ -665,7 +663,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)
data->rawStream_.configuration().bufferCount, data->rawStream_.configuration().bufferCount,
}); });
ret = imgu->allocateBuffers(data, bufferCount); ret = imgu->allocateBuffers(bufferCount);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -676,7 +674,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)
{ {
IPU3CameraData *data = cameraData(camera); IPU3CameraData *data = cameraData(camera);
data->imgu_->freeBuffers(data); data->imgu_->freeBuffers();
return 0; return 0;
} }
@ -1121,7 +1119,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,
/** /**
* \brief Allocate buffers for all the ImgU video devices * \brief Allocate buffers for all the ImgU video devices
*/ */
int ImgUDevice::allocateBuffers(IPU3CameraData *data, unsigned int bufferCount) int ImgUDevice::allocateBuffers(unsigned int bufferCount)
{ {
/* Share buffers between CIO2 output and ImgU input. */ /* Share buffers between CIO2 output and ImgU input. */
int ret = input_->importBuffers(bufferCount); int ret = input_->importBuffers(bufferCount);
@ -1163,7 +1161,7 @@ int ImgUDevice::allocateBuffers(IPU3CameraData *data, unsigned int bufferCount)
return 0; return 0;
error: error:
freeBuffers(data); freeBuffers();
return ret; return ret;
} }
@ -1171,7 +1169,7 @@ error:
/** /**
* \brief Release buffers for all the ImgU video devices * \brief Release buffers for all the ImgU video devices
*/ */
void ImgUDevice::freeBuffers(IPU3CameraData *data) void ImgUDevice::freeBuffers()
{ {
int ret; int ret;