diff options
| author | Jacopo Mondi <jacopo@jmondi.org> | 2020-06-29 18:32:22 +0200 |
|---|---|---|
| committer | Jacopo Mondi <jacopo@jmondi.org> | 2020-08-03 11:16:17 +0200 |
| commit | 3424fef3a5500dfb3a0b2815ce9824316636a131 (patch) | |
| tree | 37f7d8615adc96ff5b61afb2a44ee462a0079f7f /src/libcamera/pipeline | |
| parent | 6db776d55a88440383359910a1ec131db65692bb (diff) | |
libcamera: ipu3: Do not overwrite StreamConfiguration
The validate function overwrites the generated StreamConfiguration with
the one reported by the CIO2 unit when inspecting the RAW stream
configuration.
As we prepare to add StreamFormats to the IPU3 StreamConfiguration,
assigning to the CIO2 generated configuration would delete the
StreamFormats.
Fix this by updating relevant fields only in order to keep the
assigned StreamFormats.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera/pipeline')
| -rw-r--r-- | src/libcamera/pipeline/ipu3/ipu3.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index f2d76551..b998c072 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -270,7 +270,9 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate() const Stream *stream = streams_[i]; if (stream == &data_->rawStream_) { - cfg = cio2Configuration_; + cfg.size = cio2Configuration_.size; + cfg.pixelFormat = cio2Configuration_.pixelFormat; + cfg.bufferCount = cio2Configuration_.bufferCount; } else { bool scale = stream == &data_->vfStream_; adjustStream(config_[i], scale); |