[libcamera-devel,v2,16/17] Revert "android: capabilities: Cap frame rate to 30 FPS"
diff mbox series

Message ID 20210907194107.803730-17-jacopo@jmondi.org
State Superseded
Headers show
Series
  • IPU3 control info update and HAL frame durations
Related show

Commit Message

Jacopo Mondi Sept. 7, 2021, 7:41 p.m. UTC
This reverts commit 257df463ad0e0862c211b03742140a99dd8cc0ef.
---
 src/android/camera_capabilities.cpp | 23 -----------------------
 1 file changed, 23 deletions(-)

Comments

Jean-Michel Hautbois Sept. 8, 2021, 9:27 a.m. UTC | #1
Hi Jacopo,

On 07/09/2021 21:41, Jacopo Mondi wrote:
> This reverts commit 257df463ad0e0862c211b03742140a99dd8cc0ef.

Is it intended ? Looks like you missed a squash ?

> ---
>  src/android/camera_capabilities.cpp | 23 -----------------------
>  1 file changed, 23 deletions(-)
> 
> diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
> index cff1e30a9567..deaec3282fd7 100644
> --- a/src/android/camera_capabilities.cpp
> +++ b/src/android/camera_capabilities.cpp
> @@ -632,29 +632,6 @@ int CameraCapabilities::initializeStreamConfigurations()
>  
>  			int64_t minFrameDuration = frameDurations->second.min().get<int64_t>() * 1000;
>  			int64_t maxFrameDuration = frameDurations->second.max().get<int64_t>() * 1000;
> -
> -			/*
> -			 * Cap min frame duration to 30 FPS.
> -			 *
> -			 * 30 frames per second has been validated as the most
> -			 * opportune frame rate for quality tuning, and power
> -			 * vs performances budget on Intel IPU3.
> -			 *
> -			 * \todo This is a platform-specific decision that needs
> -			 * to be abstracted and delegated to the configuration
> -			 * file.
> -			 *
> -			 * \todo libcamera only allows to control frame duration
> -			 * through the per-request controls::FrameDuration
> -			 * control. If we cap the durations here, we should be
> -			 * capable of configuring the camera to operate at such
> -			 * duration without requiring to have the FrameDuration
> -			 * control to be specified for each Request. Defer this
> -			 * to the in-development configuration API rework.
> -			 */
> -			if (minFrameDuration < 1e9 / 30.0)
> -				minFrameDuration = 1e9 / 30.0;
> -
>  			streamConfigurations_.push_back({
>  				res, androidFormat, minFrameDuration, maxFrameDuration,
>  			});
>
Jacopo Mondi Sept. 8, 2021, 10:05 a.m. UTC | #2
Hi Jean-Michel

On Wed, Sep 08, 2021 at 11:27:38AM +0200, Jean-Michel Hautbois wrote:
> Hi Jacopo,
>
> On 07/09/2021 21:41, Jacopo Mondi wrote:
> > This reverts commit 257df463ad0e0862c211b03742140a99dd8cc0ef.
>
> Is it intended ? Looks like you missed a squash ?

Yes :) it's intended, see the cover letter!
>
> > ---
> >  src/android/camera_capabilities.cpp | 23 -----------------------
> >  1 file changed, 23 deletions(-)
> >
> > diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
> > index cff1e30a9567..deaec3282fd7 100644
> > --- a/src/android/camera_capabilities.cpp
> > +++ b/src/android/camera_capabilities.cpp
> > @@ -632,29 +632,6 @@ int CameraCapabilities::initializeStreamConfigurations()
> >
> >  			int64_t minFrameDuration = frameDurations->second.min().get<int64_t>() * 1000;
> >  			int64_t maxFrameDuration = frameDurations->second.max().get<int64_t>() * 1000;
> > -
> > -			/*
> > -			 * Cap min frame duration to 30 FPS.
> > -			 *
> > -			 * 30 frames per second has been validated as the most
> > -			 * opportune frame rate for quality tuning, and power
> > -			 * vs performances budget on Intel IPU3.
> > -			 *
> > -			 * \todo This is a platform-specific decision that needs
> > -			 * to be abstracted and delegated to the configuration
> > -			 * file.
> > -			 *
> > -			 * \todo libcamera only allows to control frame duration
> > -			 * through the per-request controls::FrameDuration
> > -			 * control. If we cap the durations here, we should be
> > -			 * capable of configuring the camera to operate at such
> > -			 * duration without requiring to have the FrameDuration
> > -			 * control to be specified for each Request. Defer this
> > -			 * to the in-development configuration API rework.
> > -			 */
> > -			if (minFrameDuration < 1e9 / 30.0)
> > -				minFrameDuration = 1e9 / 30.0;
> > -
> >  			streamConfigurations_.push_back({
> >  				res, androidFormat, minFrameDuration, maxFrameDuration,
> >  			});
> >

Patch
diff mbox series

diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index cff1e30a9567..deaec3282fd7 100644
--- a/src/android/camera_capabilities.cpp
+++ b/src/android/camera_capabilities.cpp
@@ -632,29 +632,6 @@  int CameraCapabilities::initializeStreamConfigurations()
 
 			int64_t minFrameDuration = frameDurations->second.min().get<int64_t>() * 1000;
 			int64_t maxFrameDuration = frameDurations->second.max().get<int64_t>() * 1000;
-
-			/*
-			 * Cap min frame duration to 30 FPS.
-			 *
-			 * 30 frames per second has been validated as the most
-			 * opportune frame rate for quality tuning, and power
-			 * vs performances budget on Intel IPU3.
-			 *
-			 * \todo This is a platform-specific decision that needs
-			 * to be abstracted and delegated to the configuration
-			 * file.
-			 *
-			 * \todo libcamera only allows to control frame duration
-			 * through the per-request controls::FrameDuration
-			 * control. If we cap the durations here, we should be
-			 * capable of configuring the camera to operate at such
-			 * duration without requiring to have the FrameDuration
-			 * control to be specified for each Request. Defer this
-			 * to the in-development configuration API rework.
-			 */
-			if (minFrameDuration < 1e9 / 30.0)
-				minFrameDuration = 1e9 / 30.0;
-
 			streamConfigurations_.push_back({
 				res, androidFormat, minFrameDuration, maxFrameDuration,
 			});