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

libcamera: ipu3: Remove the active flag from IPU3Stream

Browse source 
The active_ flag is only used inside one function, remove the global
flag and handle it inside the single function.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Niklas Söderlund 2020-06-27 03:45:40 +02:00
parent 5bbef188f6
commit 1f59558777
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,13 +33,6 @@ LOG_DEFINE_CATEGORY(IPU3)
class IPU3Stream : public Stream class IPU3Stream : public Stream
{ {
public:
IPU3Stream()
: active_(false)
{
}
bool active_;
}; };
class IPU3CameraData : public CameraData class IPU3CameraData : public CameraData
@ -486,8 +479,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
return ret; return ret;
/* Apply the format to the configured streams output devices. */ /* Apply the format to the configured streams output devices. */
outStream->active_ = false; bool outActive = false;
vfStream->active_ = false; bool vfActive = false;
for (unsigned int i = 0; i < config->size(); ++i) { for (unsigned int i = 0; i < config->size(); ++i) {
/* /*
@ -499,7 +492,6 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
IPU3Stream *stream = const_cast<IPU3Stream *>(config->streams()[i]); IPU3Stream *stream = const_cast<IPU3Stream *>(config->streams()[i]);
StreamConfiguration &cfg = (*config)[i]; StreamConfiguration &cfg = (*config)[i];
stream->active_ = true;
cfg.setStream(stream); cfg.setStream(stream);
if (stream == outStream) { if (stream == outStream) {
@ -508,12 +500,14 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
return ret; return ret;
cfg.stride = outputFormat.planes[0].bpl; cfg.stride = outputFormat.planes[0].bpl;
outActive = true;
} else if (stream == vfStream) { } else if (stream == vfStream) {
ret = imgu->configureViewfinder(cfg, &outputFormat); ret = imgu->configureViewfinder(cfg, &outputFormat);
if (ret) if (ret)
return ret; return ret;
cfg.stride = outputFormat.planes[0].bpl; cfg.stride = outputFormat.planes[0].bpl;
vfActive = true;
} else { } else {
/* /*
* The RAW stream is configured as part of the CIO2 and * The RAW stream is configured as part of the CIO2 and
@ -528,13 +522,13 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
* the configuration of the active one for that purpose (there should * the configuration of the active one for that purpose (there should
* be at least one active stream in the configuration request). * be at least one active stream in the configuration request).
*/ */
if (!outStream->active_) { if (!outActive) {
ret = imgu->configureOutput(config->at(0), &outputFormat); ret = imgu->configureOutput(config->at(0), &outputFormat);
if (ret) if (ret)
return ret; return ret;
} }
if (!vfStream->active_) { if (!vfActive) {
ret = imgu->configureViewfinder(config->at(0), &outputFormat); ret = imgu->configureViewfinder(config->at(0), &outputFormat);
if (ret) if (ret)
return ret; return ret;
@ -554,7 +548,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
/* Apply the "pipe_mode" control to the ImgU subdevice. */ /* Apply the "pipe_mode" control to the ImgU subdevice. */
ControlList ctrls(imgu->imgu_->controls()); ControlList ctrls(imgu->imgu_->controls());
ctrls.set(V4L2_CID_IPU3_PIPE_MODE, ctrls.set(V4L2_CID_IPU3_PIPE_MODE,
static_cast<int32_t>(vfStream->active_ ? IPU3PipeModeVideo : static_cast<int32_t>(vfActive ? IPU3PipeModeVideo :
IPU3PipeModeStillCapture)); IPU3PipeModeStillCapture));
ret = imgu->imgu_->setControls(&ctrls); ret = imgu->imgu_->setControls(&ctrls);
if (ret) { if (ret) {