| Message ID | 20251023144841.403689-23-stefan.klug@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Quoting Stefan Klug (2025-10-23 23:48:23) > To be able to access the dw100 specific functions and as there is no > known other dewarper in combination with the rkisp1, use the dw100 s/known other/other known/ (I think it's because "no other" is a group and "known" modifies "dewarper") > specific converter directly. > > Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> Otherwise looks good to me. Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> > --- > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > index 77442b25b809..e22f05408931 100644 > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > @@ -36,7 +36,7 @@ > #include "libcamera/internal/camera.h" > #include "libcamera/internal/camera_sensor.h" > #include "libcamera/internal/camera_sensor_properties.h" > -#include "libcamera/internal/converter/converter_v4l2_m2m.h" > +#include "libcamera/internal/converter/converter_dw100.h" > #include "libcamera/internal/delayed_controls.h" > #include "libcamera/internal/device_enumerator.h" > #include "libcamera/internal/framebuffer.h" > @@ -234,7 +234,7 @@ private: > RkISP1MainPath mainPath_; > RkISP1SelfPath selfPath_; > > - std::unique_ptr<V4L2M2MConverter> dewarper_; > + std::unique_ptr<ConverterDW100> dewarper_; > Rectangle scalerMaxCrop_; > > std::optional<Rectangle> activeCrop_; > @@ -1500,7 +1500,7 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator) > > std::shared_ptr<MediaDevice> dwpMediaDevice = enumerator->search(dwp); > if (dwpMediaDevice) { > - dewarper_ = std::make_unique<V4L2M2MConverter>(dwpMediaDevice); > + dewarper_ = std::make_unique<ConverterDW100>(dwpMediaDevice); > if (dewarper_->isValid()) { > dewarper_->outputBufferReady.connect( > this, &PipelineHandlerRkISP1::dewarpBufferReady); > -- > 2.48.1 >
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 77442b25b809..e22f05408931 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -36,7 +36,7 @@ #include "libcamera/internal/camera.h" #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/camera_sensor_properties.h" -#include "libcamera/internal/converter/converter_v4l2_m2m.h" +#include "libcamera/internal/converter/converter_dw100.h" #include "libcamera/internal/delayed_controls.h" #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/framebuffer.h" @@ -234,7 +234,7 @@ private: RkISP1MainPath mainPath_; RkISP1SelfPath selfPath_; - std::unique_ptr<V4L2M2MConverter> dewarper_; + std::unique_ptr<ConverterDW100> dewarper_; Rectangle scalerMaxCrop_; std::optional<Rectangle> activeCrop_; @@ -1500,7 +1500,7 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator) std::shared_ptr<MediaDevice> dwpMediaDevice = enumerator->search(dwp); if (dwpMediaDevice) { - dewarper_ = std::make_unique<V4L2M2MConverter>(dwpMediaDevice); + dewarper_ = std::make_unique<ConverterDW100>(dwpMediaDevice); if (dewarper_->isValid()) { dewarper_->outputBufferReady.connect( this, &PipelineHandlerRkISP1::dewarpBufferReady);
To be able to access the dw100 specific functions and as there is no known other dewarper in combination with the rkisp1, use the dw100 specific converter directly. Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)