libcamera: ipu3: cio2: Do not proxy signal

Do not proxy the signal in the CI2Device when there is no need for it,
remove it.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2020-07-03 00:10:07 +02:00
parent c3648da6e9
commit 73b18967b6
3 changed files with 5 additions and 17 deletions
+1 -13
View File
@@ -15,7 +15,6 @@
#include "libcamera/internal/camera_sensor.h"
#include "libcamera/internal/media_device.h"
#include "libcamera/internal/v4l2_subdevice.h"
#include "libcamera/internal/v4l2_videodevice.h"
namespace libcamera {
@@ -121,13 +120,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)
std::string cio2Name = "ipu3-cio2 " + std::to_string(index);
output_ = V4L2VideoDevice::fromEntityName(media, cio2Name);
ret = output_->open();
if (ret)
return ret;
output_->bufferReady.connect(this, &CIO2Device::cio2BufferReady);
return 0;
return output_->open();
}
/**
@@ -289,9 +282,4 @@ void CIO2Device::freeBuffers()
LOG(IPU3, Error) << "Failed to release CIO2 buffers";
}
void CIO2Device::cio2BufferReady(FrameBuffer *buffer)
{
bufferReady.emit(buffer);
}
} /* namespace libcamera */
+3 -3
View File
@@ -13,15 +13,15 @@
#include <libcamera/signal.h>
#include "libcamera/internal/v4l2_videodevice.h"
namespace libcamera {
class CameraSensor;
class FrameBuffer;
class MediaDevice;
class Request;
class V4L2DeviceFormat;
class V4L2Subdevice;
class V4L2VideoDevice;
struct Size;
struct StreamConfiguration;
@@ -48,7 +48,7 @@ public:
int queueBuffer(Request *request, FrameBuffer *rawBuffer);
void tryReturnBuffer(FrameBuffer *buffer);
Signal<FrameBuffer *> bufferReady;
Signal<FrameBuffer *> &bufferReady() { return output_->bufferReady; }
private:
void freeBuffers();
+1 -1
View File
@@ -805,7 +805,7 @@ int PipelineHandlerIPU3::registerCameras()
* associated ImgU input where they get processed and
* returned through the ImgU main and secondary outputs.
*/
data->cio2_.bufferReady.connect(data.get(),
data->cio2_.bufferReady().connect(data.get(),
&IPU3CameraData::cio2BufferReady);
data->imgu_->input_->bufferReady.connect(&data->cio2_,
&CIO2Device::tryReturnBuffer);