summaryrefslogtreecommitdiff
path: root/src/libcamera/pipeline/rkisp1/rkisp1.cpp
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-08-02 23:57:17 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-08-05 20:07:13 +0200
commit2e7c80a4f9d4f50a82c674863ce159856c748873 (patch)
treeed342559a62d42a4bbdff87be1431f95e23bcf07 /src/libcamera/pipeline/rkisp1/rkisp1.cpp
parent53d38b19ed5b2650ad419db9cd91cf9d3392c877 (diff)
libcamera: camera: Rename name() to id()
Rename Camera::name() to camera::id() to better describe what it represents, a unique and stable ID for the camera. While at it improve the documentation for the camera ID to describe it needs to be stable for a camera between resets of the system. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/libcamera/pipeline/rkisp1/rkisp1.cpp')
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 94561062..b7609cbc 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -798,7 +798,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)
if (ret) {
freeBuffers(camera);
LOG(RkISP1, Error)
- << "Failed to start IPA " << camera->name();
+ << "Failed to start IPA " << camera->id();
return ret;
}
@@ -809,7 +809,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)
data->ipa_->stop();
freeBuffers(camera);
LOG(RkISP1, Error)
- << "Failed to start parameters " << camera->name();
+ << "Failed to start parameters " << camera->id();
return ret;
}
@@ -819,7 +819,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)
data->ipa_->stop();
freeBuffers(camera);
LOG(RkISP1, Error)
- << "Failed to start statistics " << camera->name();
+ << "Failed to start statistics " << camera->id();
return ret;
}
@@ -831,7 +831,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)
freeBuffers(camera);
LOG(RkISP1, Error)
- << "Failed to start camera " << camera->name();
+ << "Failed to start camera " << camera->id();
}
activeCamera_ = camera;
@@ -870,17 +870,17 @@ void PipelineHandlerRkISP1::stop(Camera *camera)
ret = video_->streamOff();
if (ret)
LOG(RkISP1, Warning)
- << "Failed to stop camera " << camera->name();
+ << "Failed to stop camera " << camera->id();
ret = stat_->streamOff();
if (ret)
LOG(RkISP1, Warning)
- << "Failed to stop statistics " << camera->name();
+ << "Failed to stop statistics " << camera->id();
ret = param_->streamOff();
if (ret)
LOG(RkISP1, Warning)
- << "Failed to stop parameters " << camera->name();
+ << "Failed to stop parameters " << camera->id();
data->ipa_->stop();