[libcamera-devel,v4,5/7] libcamera: pipeline: rkisp1: Move start and stop of path to RkISP1Path
diff mbox series

Message ID 20200929014334.49719-6-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • libcamera: pipeline: rkisp1: Create RkISP1Path helper
Related show

Commit Message

Niklas Söderlund Sept. 29, 2020, 1:43 a.m. UTC 
Move the start and stop of a path to RkISP1Path. This allows the
importing of buffers to be moved closer the path start/stop simplifying
the code. Also by adding a simple running tracker the error logic in
PipelineHandlerRkISP1 can be simplified as stop() can always be called.

This also removes all external users of RkISP1Path::video_ so it can be
made private.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
* Changes since v3
- Add missing space in Error message.
---
 src/libcamera/pipeline/rkisp1/rkisp1.cpp      | 53 ++-----------------
 src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 42 ++++++++++++++-
 src/libcamera/pipeline/rkisp1/rkisp1_path.h   |  8 +--
 3 files changed, 50 insertions(+), 53 deletions(-)

Comments

Laurent Pinchart Sept. 29, 2020, 2 a.m. UTC | #1 
Hi Niklas,

Thank you for the patch.

On Tue, Sep 29, 2020 at 03:43:32AM +0200, Niklas Söderlund wrote:
> Move the start and stop of a path to RkISP1Path. This allows the
> importing of buffers to be moved closer the path start/stop simplifying
> the code. Also by adding a simple running tracker the error logic in
> PipelineHandlerRkISP1 can be simplified as stop() can always be called.
> 
> This also removes all external users of RkISP1Path::video_ so it can be
> made private.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> ---
> * Changes since v3
> - Add missing space in Error message.
> ---
>  src/libcamera/pipeline/rkisp1/rkisp1.cpp      | 53 ++-----------------
>  src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 42 ++++++++++++++-
>  src/libcamera/pipeline/rkisp1/rkisp1_path.h   |  8 +--
>  3 files changed, 50 insertions(+), 53 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> index 7823fd91866a473a..2eaf7b491d13397b 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> @@ -765,20 +765,6 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)
>  		data->selfPathStream_.configuration().bufferCount,
>  	});
>  
> -	if (data->mainPathActive_) {
> -		ret = mainPath_.video_->importBuffers(
> -			data->mainPathStream_.configuration().bufferCount);
> -		if (ret < 0)
> -			goto error;
> -	}
> -
> -	if (data->selfPathActive_) {
> -		ret = selfPath_.video_->importBuffers(
> -			data->selfPathStream_.configuration().bufferCount);
> -		if (ret < 0)
> -			goto error;
> -	}
> -
>  	ret = param_->allocateBuffers(maxCount, &paramBuffers_);
>  	if (ret < 0)
>  		goto error;
> @@ -808,8 +794,6 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)
>  error:
>  	paramBuffers_.clear();
>  	statBuffers_.clear();
> -	mainPath_.video_->releaseBuffers();
> -	selfPath_.video_->releaseBuffers();
>  
>  	return ret;
>  }
> @@ -840,12 +824,6 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera)
>  	if (stat_->releaseBuffers())
>  		LOG(RkISP1, Error) << "Failed to release stat buffers";
>  
> -	if (mainPath_.video_->releaseBuffers())
> -		LOG(RkISP1, Error) << "Failed to release main path buffers";
> -
> -	if (selfPath_.video_->releaseBuffers())
> -		LOG(RkISP1, Error) << "Failed to release self path buffers";
> -
>  	return 0;
>  }
>  
> @@ -891,15 +869,12 @@ int PipelineHandlerRkISP1::start(Camera *camera)
>  	std::map<unsigned int, IPAStream> streamConfig;
>  
>  	if (data->mainPathActive_) {
> -		ret = mainPath_.video_->streamOn();
> +		ret = mainPath_.start();
>  		if (ret) {
>  			param_->streamOff();
>  			stat_->streamOff();
>  			data->ipa_->stop();
>  			freeBuffers(camera);
> -
> -			LOG(RkISP1, Error)
> -				<< "Failed to start main path " << camera->id();
>  			return ret;
>  		}
>  
> @@ -910,18 +885,13 @@ int PipelineHandlerRkISP1::start(Camera *camera)
>  	}
>  
>  	if (data->selfPathActive_) {
> -		ret = selfPath_.video_->streamOn();
> +		ret = selfPath_.start();
>  		if (ret) {
> -			if (data->mainPathActive_)
> -				mainPath_.video_->streamOff();
> -
> +			mainPath_.stop();
>  			param_->streamOff();
>  			stat_->streamOff();
>  			data->ipa_->stop();
>  			freeBuffers(camera);
> -
> -			LOG(RkISP1, Error)
> -				<< "Failed to start self path " << camera->id();
>  			return ret;
>  		}
>  
> @@ -958,21 +928,8 @@ void PipelineHandlerRkISP1::stop(Camera *camera)
>  	RkISP1CameraData *data = cameraData(camera);
>  	int ret;
>  
> -	if (data->selfPathActive_) {
> -		ret = selfPath_.video_->streamOff();
> -		if (ret)
> -			LOG(RkISP1, Warning)
> -				<< "Failed to stop self path for "
> -				<< camera->id();
> -	}
> -
> -	if (data->mainPathActive_) {
> -		ret = mainPath_.video_->streamOff();
> -		if (ret)
> -			LOG(RkISP1, Warning)
> -				<< "Failed to stop main path for "
> -				<< camera->id();
> -	}
> +	selfPath_.stop();
> +	mainPath_.stop();
>  
>  	ret = stat_->streamOff();
>  	if (ret)
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
> index 96c18b352472a417..9f1706c78f41465b 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
> @@ -20,9 +20,9 @@ LOG_DECLARE_CATEGORY(RkISP1)
>  
>  RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
>  		       const Size &minResolution, const Size &maxResolution)
> -	: video_(nullptr), name_(name), formats_(formats),
> +	: name_(name), running_(false), formats_(formats),
>  	  minResolution_(minResolution), maxResolution_(maxResolution),
> -	  resizer_(nullptr)
> +	  resizer_(nullptr), video_(nullptr)
>  {
>  }
>  
> @@ -149,6 +149,44 @@ int RkISP1Path::configure(const StreamConfiguration &config,
>  	return 0;
>  }
>  
> +int RkISP1Path::start()
> +{
> +	int ret;
> +
> +	if (running_)
> +		return -EBUSY;
> +
> +	ret = video_->importBuffers(RKISP1_BUFFER_COUNT);

Could you add a todo comment to track making the buffer count
configurable ? With that,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> +	if (ret)
> +		return ret;
> +
> +	ret = video_->streamOn();
> +	if (ret) {
> +		LOG(RkISP1, Error)
> +			<< "Failed to start " << name_ << " path";
> +
> +		video_->releaseBuffers();
> +		return ret;
> +	}
> +
> +	running_ = true;
> +
> +	return 0;
> +}
> +
> +void RkISP1Path::stop()
> +{
> +	if (!running_)
> +		return;
> +
> +	if (video_->streamOff())
> +		LOG(RkISP1, Warning) << "Failed to stop " << name_ << " path";
> +
> +	video_->releaseBuffers();
> +
> +	running_ = false;
> +}
> +
>  namespace {
>  constexpr Size RKISP1_RSZ_MP_SRC_MIN{ 32, 16 };
>  constexpr Size RKISP1_RSZ_MP_SRC_MAX{ 4416, 3312 };
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
> index 377772ca73877702..e2eb1be9a445ba41 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
> @@ -45,22 +45,24 @@ public:
>  		return video_->exportBuffers(bufferCount, buffers);
>  	}
>  
> +	int start();
> +	void stop();
> +
>  	int queueBuffer(FrameBuffer *buffer) { return video_->queueBuffer(buffer); }
>  	Signal<FrameBuffer *> &bufferReady() { return video_->bufferReady; }
>  
> -	/* \todo Make video private. */
> -	V4L2VideoDevice *video_;
> -
>  private:
>  	static constexpr unsigned int RKISP1_BUFFER_COUNT = 4;
>  
>  	const char *name_;
> +	bool running_;
>  
>  	const Span<const PixelFormat> formats_;
>  	const Size minResolution_;
>  	const Size maxResolution_;
>  
>  	V4L2Subdevice *resizer_;
> +	V4L2VideoDevice *video_;
>  };
>  
>  class RkISP1MainPath : public RkISP1Path

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 7823fd91866a473a..2eaf7b491d13397b 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -765,20 +765,6 @@  int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)
 		data->selfPathStream_.configuration().bufferCount,
 	});
 
-	if (data->mainPathActive_) {
-		ret = mainPath_.video_->importBuffers(
-			data->mainPathStream_.configuration().bufferCount);
-		if (ret < 0)
-			goto error;
-	}
-
-	if (data->selfPathActive_) {
-		ret = selfPath_.video_->importBuffers(
-			data->selfPathStream_.configuration().bufferCount);
-		if (ret < 0)
-			goto error;
-	}
-
 	ret = param_->allocateBuffers(maxCount, &paramBuffers_);
 	if (ret < 0)
 		goto error;
@@ -808,8 +794,6 @@  int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)
 error:
 	paramBuffers_.clear();
 	statBuffers_.clear();
-	mainPath_.video_->releaseBuffers();
-	selfPath_.video_->releaseBuffers();
 
 	return ret;
 }
@@ -840,12 +824,6 @@  int PipelineHandlerRkISP1::freeBuffers(Camera *camera)
 	if (stat_->releaseBuffers())
 		LOG(RkISP1, Error) << "Failed to release stat buffers";
 
-	if (mainPath_.video_->releaseBuffers())
-		LOG(RkISP1, Error) << "Failed to release main path buffers";
-
-	if (selfPath_.video_->releaseBuffers())
-		LOG(RkISP1, Error) << "Failed to release self path buffers";
-
 	return 0;
 }
 
@@ -891,15 +869,12 @@  int PipelineHandlerRkISP1::start(Camera *camera)
 	std::map<unsigned int, IPAStream> streamConfig;
 
 	if (data->mainPathActive_) {
-		ret = mainPath_.video_->streamOn();
+		ret = mainPath_.start();
 		if (ret) {
 			param_->streamOff();
 			stat_->streamOff();
 			data->ipa_->stop();
 			freeBuffers(camera);
-
-			LOG(RkISP1, Error)
-				<< "Failed to start main path " << camera->id();
 			return ret;
 		}
 
@@ -910,18 +885,13 @@  int PipelineHandlerRkISP1::start(Camera *camera)
 	}
 
 	if (data->selfPathActive_) {
-		ret = selfPath_.video_->streamOn();
+		ret = selfPath_.start();
 		if (ret) {
-			if (data->mainPathActive_)
-				mainPath_.video_->streamOff();
-
+			mainPath_.stop();
 			param_->streamOff();
 			stat_->streamOff();
 			data->ipa_->stop();
 			freeBuffers(camera);
-
-			LOG(RkISP1, Error)
-				<< "Failed to start self path " << camera->id();
 			return ret;
 		}
 
@@ -958,21 +928,8 @@  void PipelineHandlerRkISP1::stop(Camera *camera)
 	RkISP1CameraData *data = cameraData(camera);
 	int ret;
 
-	if (data->selfPathActive_) {
-		ret = selfPath_.video_->streamOff();
-		if (ret)
-			LOG(RkISP1, Warning)
-				<< "Failed to stop self path for "
-				<< camera->id();
-	}
-
-	if (data->mainPathActive_) {
-		ret = mainPath_.video_->streamOff();
-		if (ret)
-			LOG(RkISP1, Warning)
-				<< "Failed to stop main path for "
-				<< camera->id();
-	}
+	selfPath_.stop();
+	mainPath_.stop();
 
 	ret = stat_->streamOff();
 	if (ret)
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
index 96c18b352472a417..9f1706c78f41465b 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
@@ -20,9 +20,9 @@  LOG_DECLARE_CATEGORY(RkISP1)
 
 RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
 		       const Size &minResolution, const Size &maxResolution)
-	: video_(nullptr), name_(name), formats_(formats),
+	: name_(name), running_(false), formats_(formats),
 	  minResolution_(minResolution), maxResolution_(maxResolution),
-	  resizer_(nullptr)
+	  resizer_(nullptr), video_(nullptr)
 {
 }
 
@@ -149,6 +149,44 @@  int RkISP1Path::configure(const StreamConfiguration &config,
 	return 0;
 }
 
+int RkISP1Path::start()
+{
+	int ret;
+
+	if (running_)
+		return -EBUSY;
+
+	ret = video_->importBuffers(RKISP1_BUFFER_COUNT);
+	if (ret)
+		return ret;
+
+	ret = video_->streamOn();
+	if (ret) {
+		LOG(RkISP1, Error)
+			<< "Failed to start " << name_ << " path";
+
+		video_->releaseBuffers();
+		return ret;
+	}
+
+	running_ = true;
+
+	return 0;
+}
+
+void RkISP1Path::stop()
+{
+	if (!running_)
+		return;
+
+	if (video_->streamOff())
+		LOG(RkISP1, Warning) << "Failed to stop " << name_ << " path";
+
+	video_->releaseBuffers();
+
+	running_ = false;
+}
+
 namespace {
 constexpr Size RKISP1_RSZ_MP_SRC_MIN{ 32, 16 };
 constexpr Size RKISP1_RSZ_MP_SRC_MAX{ 4416, 3312 };
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
index 377772ca73877702..e2eb1be9a445ba41 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h
+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
@@ -45,22 +45,24 @@  public:
 		return video_->exportBuffers(bufferCount, buffers);
 	}
 
+	int start();
+	void stop();
+
 	int queueBuffer(FrameBuffer *buffer) { return video_->queueBuffer(buffer); }
 	Signal<FrameBuffer *> &bufferReady() { return video_->bufferReady; }
 
-	/* \todo Make video private. */
-	V4L2VideoDevice *video_;
-
 private:
 	static constexpr unsigned int RKISP1_BUFFER_COUNT = 4;
 
 	const char *name_;
+	bool running_;
 
 	const Span<const PixelFormat> formats_;
 	const Size minResolution_;
 	const Size maxResolution_;
 
 	V4L2Subdevice *resizer_;
+	V4L2VideoDevice *video_;
 };
 
 class RkISP1MainPath : public RkISP1Path