| Message ID | 20200713084727.232422-6-naush@raspberrypi.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Naushir, Thanks for your work. On 2020-07-13 09:47:24 +0100, Naushir Patuck wrote: > For the zero-copy RAW capture feature, the RPiStream will have to be > modified. Remove the const qualifier in anticipation of the future > commits for this feature. > > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp > index a613ce65..2f4255a4 100644 > --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp > +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp > @@ -163,7 +163,7 @@ public: > void ispOutputDequeue(FrameBuffer *buffer); > > void clearIncompleteRequests(); > - void handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream); > + void handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream); > void handleState(); > > CameraSensor *sensor_; > @@ -1120,12 +1120,12 @@ done: > > void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer) > { > - const RPi::RPiStream *stream = nullptr; > + RPi::RPiStream *stream = nullptr; > > if (state_ == State::Stopped) > return; > > - for (RPi::RPiStream const &s : unicam_) { > + for (RPi::RPiStream &s : unicam_) { > if (s.findFrameBuffer(buffer)) { > stream = &s; > break; > @@ -1186,12 +1186,12 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer) > > void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer) > { > - const RPi::RPiStream *stream = nullptr; > + RPi::RPiStream *stream = nullptr; > > if (state_ == State::Stopped) > return; > > - for (RPi::RPiStream const &s : isp_) { > + for (RPi::RPiStream &s : isp_) { > if (s.findFrameBuffer(buffer)) { > stream = &s; > break; > @@ -1272,7 +1272,7 @@ void RPiCameraData::clearIncompleteRequests() > } > } > > -void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream) > +void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream) > { > if (stream->isExternal()) { > if (!dropFrameCount_) { > -- > 2.25.1 > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index a613ce65..2f4255a4 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -163,7 +163,7 @@ public: void ispOutputDequeue(FrameBuffer *buffer); void clearIncompleteRequests(); - void handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream); + void handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream); void handleState(); CameraSensor *sensor_; @@ -1120,12 +1120,12 @@ done: void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer) { - const RPi::RPiStream *stream = nullptr; + RPi::RPiStream *stream = nullptr; if (state_ == State::Stopped) return; - for (RPi::RPiStream const &s : unicam_) { + for (RPi::RPiStream &s : unicam_) { if (s.findFrameBuffer(buffer)) { stream = &s; break; @@ -1186,12 +1186,12 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer) void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer) { - const RPi::RPiStream *stream = nullptr; + RPi::RPiStream *stream = nullptr; if (state_ == State::Stopped) return; - for (RPi::RPiStream const &s : isp_) { + for (RPi::RPiStream &s : isp_) { if (s.findFrameBuffer(buffer)) { stream = &s; break; @@ -1272,7 +1272,7 @@ void RPiCameraData::clearIncompleteRequests() } } -void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream) +void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream) { if (stream->isExternal()) { if (!dropFrameCount_) {
For the zero-copy RAW capture feature, the RPiStream will have to be modified. Remove the const qualifier in anticipation of the future commits for this feature. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)