summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-06-27 00:12:15 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-06-28 14:25:46 +0200
commit942f6c5ceb352f8c54d4a1a3d15489ce9b8b8484 (patch)
tree67e8180adc35576058d461273bb7a52e5e567d6e
parent72e36e8d8d4bfc14702be1924384f184433b4cf0 (diff)
libcamera: ipu3: Remove usage of IPU3CameraData from ImgUDevice
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>
-rw-r--r--src/libcamera/pipeline/ipu3/ipu3.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index eb3ae387..54b526ce 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -34,8 +34,6 @@ namespace libcamera {
LOG_DEFINE_CATEGORY(IPU3)
-class IPU3CameraData;
-
class ImgUDevice
{
public:
@@ -75,8 +73,8 @@ public:
const StreamConfiguration &cfg,
V4L2DeviceFormat *outputFormat);
- int allocateBuffers(IPU3CameraData *data, unsigned int bufferCount);
- void freeBuffers(IPU3CameraData *data);
+ int allocateBuffers(unsigned int bufferCount);
+ void freeBuffers();
int start();
int stop();
@@ -665,7 +663,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)
data->rawStream_.configuration().bufferCount,
});
- ret = imgu->allocateBuffers(data, bufferCount);
+ ret = imgu->allocateBuffers(bufferCount);
if (ret < 0)
return ret;
@@ -676,7 +674,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)
{
IPU3CameraData *data = cameraData(camera);
- data->imgu_->freeBuffers(data);
+ data->imgu_->freeBuffers();
return 0;
}
@@ -1121,7 +1119,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,
/**
* \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. */
int ret = input_->importBuffers(bufferCount);
@@ -1163,7 +1161,7 @@ int ImgUDevice::allocateBuffers(IPU3CameraData *data, unsigned int bufferCount)
return 0;
error:
- freeBuffers(data);
+ freeBuffers();
return ret;
}
@@ -1171,7 +1169,7 @@ error:
/**
* \brief Release buffers for all the ImgU video devices
*/
-void ImgUDevice::freeBuffers(IPU3CameraData *data)
+void ImgUDevice::freeBuffers()
{
int ret;