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

libcamera: pipeline: raspberrypi: Remove const qualifier from RPiStream

Browse source 
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>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Naushir Patuck 2020-09-18 10:42:26 +01:00 • committed by Niklas Söderlund
parent addd343b96
commit 3e7ee080d6
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View file

@ -149,7 +149,7 @@ public:
void ispOutputDequeue(FrameBuffer *buffer); void ispOutputDequeue(FrameBuffer *buffer);
void clearIncompleteRequests(); void clearIncompleteRequests();
void handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream); void handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);
void handleState(); void handleState();
CameraSensor *sensor_; CameraSensor *sensor_;
@ -1107,12 +1107,12 @@ done:
void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer) void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)
{ {
const RPi::RPiStream *stream = nullptr; RPi::RPiStream *stream = nullptr;
if (state_ == State::Stopped) if (state_ == State::Stopped)
return; return;
for (RPi::RPiStream const &s : unicam_) { for (RPi::RPiStream &s : unicam_) {
if (s.findFrameBuffer(buffer)) { if (s.findFrameBuffer(buffer)) {
stream = &s; stream = &s;
break; break;
@ -1173,12 +1173,12 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer)
void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer) void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)
{ {
const RPi::RPiStream *stream = nullptr; RPi::RPiStream *stream = nullptr;
if (state_ == State::Stopped) if (state_ == State::Stopped)
return; return;
for (RPi::RPiStream const &s : isp_) { for (RPi::RPiStream &s : isp_) {
if (s.findFrameBuffer(buffer)) { if (s.findFrameBuffer(buffer)) {
stream = &s; stream = &s;
break; break;
@ -1259,7 +1259,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 (stream->isExternal()) {
if (!dropFrameCount_) { if (!dropFrameCount_) {