diff options
| -rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 97bb4f72..ec54291d 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -668,34 +668,31 @@ int PipelineHandlerRkISP1::exportFrameBuffers(Camera *camera, Stream *stream, int PipelineHandlerRkISP1::allocateBuffers(Camera *camera) { RkISP1CameraData *data = cameraData(camera); - unsigned int count = 1; + unsigned int count = data->stream_.configuration().bufferCount; + unsigned int ipaBufferId = 1; int ret; - unsigned int maxBuffers = 0; - for (const Stream *s : camera->streams()) - maxBuffers = std::max(maxBuffers, s->configuration().bufferCount); - ret = video_->importBuffers(count); if (ret < 0) goto error; - ret = param_->allocateBuffers(maxBuffers, ¶mBuffers_); + ret = param_->allocateBuffers(count, ¶mBuffers_); if (ret < 0) goto error; - ret = stat_->allocateBuffers(maxBuffers, &statBuffers_); + ret = stat_->allocateBuffers(count, &statBuffers_); if (ret < 0) goto error; for (std::unique_ptr<FrameBuffer> &buffer : paramBuffers_) { - buffer->setCookie(count++); + buffer->setCookie(ipaBufferId++); data->ipaBuffers_.push_back({ .id = buffer->cookie(), .planes = buffer->planes() }); availableParamBuffers_.push(buffer.get()); } for (std::unique_ptr<FrameBuffer> &buffer : statBuffers_) { - buffer->setCookie(count++); + buffer->setCookie(ipaBufferId++); data->ipaBuffers_.push_back({ .id = buffer->cookie(), .planes = buffer->planes() }); availableStatBuffers_.push(buffer.get()); |