[pull] androidx-main from androidx:androidx-main

buildSrc-tests/lint-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.2.0-alpha03" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.0-alpha03)" variant="all" version="9.2.0-alpha03">
+<issues format="6" by="lint 9.2.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.0-alpha07)" variant="all" version="9.2.0-alpha07">
 
     <issue
         id="EagerGradleConfiguration"
@@ -301,53 +301,53 @@
     <issue
         id="GradleConfigurationCacheBroadInputs"
         message="Use Project.providers.environmentVariable instead of getenv"
-        errorLine1="        if (System.getenv().containsKey(&quot;SSH_CLIENT&quot;) &amp;&amp; !System.getenv().containsKey(&quot;DISPLAY&quot;)) {"
-        errorLine2="                   ~~~~~~">
+        errorLine1="                    !System.getenv().containsKey(&quot;ANDROIDX_PROJECTS&quot;) &amp;&amp;"
+        errorLine2="                            ~~~~~~">
         <location
             file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/studio/StudioTask.kt"/>
     </issue>
 
     <issue
         id="GradleConfigurationCacheBroadInputs"
         message="Use Project.providers.environmentVariable instead of getenv"
-        errorLine1="        if (System.getenv().containsKey(&quot;SSH_CLIENT&quot;) &amp;&amp; !System.getenv().containsKey(&quot;DISPLAY&quot;)) {"
-        errorLine2="                                                                 ~~~~~~">
+        errorLine1="                    !System.getenv().containsKey(&quot;PROJECT_PREFIX&quot;)"
+        errorLine2="                            ~~~~~~">
         <location
             file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/studio/StudioTask.kt"/>
     </issue>
 
     <issue
         id="GradleConfigurationCacheBroadInputs"
         message="Use Project.providers.environmentVariable instead of getenv"
-        errorLine1="        val canonicalSdkPath = File(System.getenv(&quot;HOME&quot;), relativeSdkPath)"
-        errorLine2="                                           ~~~~~~">
+        errorLine1="                System.getenv().containsKey(&quot;SSH_CLIENT&quot;) &amp;&amp; !System.getenv().containsKey(&quot;DISPLAY&quot;)"
+        errorLine2="                       ~~~~~~">
         <location
             file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/studio/StudioTask.kt"/>
     </issue>
 
     <issue
         id="GradleConfigurationCacheBroadInputs"
         message="Use Project.providers.environmentVariable instead of getenv"
-        errorLine1="                    !System.getenv().containsKey(&quot;ANDROIDX_PROJECTS&quot;) &amp;&amp;"
-        errorLine2="                            ~~~~~~">
+        errorLine1="                System.getenv().containsKey(&quot;SSH_CLIENT&quot;) &amp;&amp; !System.getenv().containsKey(&quot;DISPLAY&quot;)"
+        errorLine2="                                                                     ~~~~~~">
         <location
             file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/studio/StudioTask.kt"/>
     </issue>
 
     <issue
         id="GradleConfigurationCacheBroadInputs"
         message="Use Project.providers.environmentVariable instead of getenv"
-        errorLine1="                    !System.getenv().containsKey(&quot;PROJECT_PREFIX&quot;)"
-        errorLine2="                            ~~~~~~">
+        errorLine1="            return if (System.getenv(&quot;QT_QPA_PLATFORM&quot;) == &quot;wayland&quot;) {"
+        errorLine2="                              ~~~~~~">
         <location
             file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/studio/StudioTask.kt"/>
     </issue>
 
     <issue
         id="GradleConfigurationCacheBroadInputs"
         message="Use Project.providers.environmentVariable instead of getenv"
-        errorLine1="        return if (System.getenv(&quot;QT_QPA_PLATFORM&quot;) == &quot;wayland&quot;) {"
-        errorLine2="                          ~~~~~~">
+        errorLine1="            val canonicalSdkPath = File(System.getenv(&quot;HOME&quot;), relativeSdkPath)"
+        errorLine2="                                               ~~~~~~">
         <location
             file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/studio/StudioTask.kt"/>
     </issue>

camera/camera-camera2-pipe/lint-baseline.xml

@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.0.0-alpha08" type="baseline" client="gradle" dependencies="false" name="AGP (9.0.0-alpha08)" variant="all" version="9.0.0-alpha08">
-
-    <issue
-        id="UseSdkSuppress"
-        message="Don&apos;t use @RequiresApi from tests; use @SdkSuppress on `cameraDeviceSetupCompatIsCached` instead"
-        errorLine1="    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/test/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCacheTest.kt"/>
-    </issue>
-
-    <issue
-        id="UseSdkSuppress"
-        message="Don&apos;t use @RequiresApi from tests; use @SdkSuppress on `cameraDeviceSetupWrapperIsCached` instead"
-        errorLine1="    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/test/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCacheTest.kt"/>
-    </issue>
+<issues format="6" by="lint 9.2.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.0-alpha07)" variant="all" version="9.2.0-alpha07">
 
     <issue
         id="ObsoleteSdkInt"

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt

@@ -25,6 +25,7 @@ import androidx.camera.camera2.pipe.CameraController
 import androidx.camera.camera2.pipe.CameraGraph
 import androidx.camera.camera2.pipe.CameraGraphId
 import androidx.camera.camera2.pipe.CameraMetadata
+import androidx.camera.camera2.pipe.CameraPipe
 import androidx.camera.camera2.pipe.CameraSurfaceManager
 import androidx.camera.camera2.pipe.Parameters
 import androidx.camera.camera2.pipe.Request
@@ -46,6 +47,8 @@ import androidx.camera.camera2.pipe.internal.CameraGraphRequestListenersImpl
 import androidx.camera.camera2.pipe.internal.FrameCaptureQueue
 import androidx.camera.camera2.pipe.internal.FrameDistributor
 import androidx.camera.camera2.pipe.internal.GraphSessionLock
+import androidx.camera.camera2.pipe.media.ImageReaderImageSources
+import androidx.camera.camera2.pipe.media.ImageSources
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -202,6 +205,18 @@ internal abstract class SharedCameraGraphModules {
         }
 
         @CameraGraphScope @Provides fun provideSystemClockOffsets() = SystemClockOffsets.estimate()
+
+        @CameraGraphScope
+        @Provides
+        fun configureImageSources(
+            imageReaderImageSources: ImageReaderImageSources,
+            cameraPipeConfig: CameraPipe.Config,
+        ): ImageSources {
+            if (cameraPipeConfig.imageSources != null) {
+                return cameraPipeConfig.imageSources
+            }
+            return imageReaderImageSources
+        }
     }
 }
 

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraPipeComponent.kt

@@ -41,8 +41,6 @@ import androidx.camera.camera2.pipe.core.TimeSource
 import androidx.camera.camera2.pipe.internal.CameraBackendsImpl
 import androidx.camera.camera2.pipe.internal.CameraDevicesImpl
 import androidx.camera.camera2.pipe.internal.CameraPipeLifetime
-import androidx.camera.camera2.pipe.media.ImageReaderImageSources
-import androidx.camera.camera2.pipe.media.ImageSources
 import androidx.camera.featurecombinationquery.CameraDeviceSetupCompatFactory
 import dagger.Binds
 import dagger.Component
@@ -188,17 +186,6 @@ internal abstract class CameraPipeModule {
             )
         }
 
-        @Provides
-        fun configureImageSources(
-            imageReaderImageSources: ImageReaderImageSources,
-            cameraPipeConfig: CameraPipe.Config,
-        ): ImageSources {
-            if (cameraPipeConfig.imageSources != null) {
-                return cameraPipeConfig.imageSources
-            }
-            return imageReaderImageSources
-        }
-
         @Singleton @Provides fun provideCameraSurfaceManager() = CameraSurfaceManager()
 
         @Singleton

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/media/AndroidImageReaders.kt

@@ -106,18 +106,6 @@ private constructor(
     }
 
     public companion object {
-        // See: b/172464059
-        //
-        // The ImageReader has an internal limit of 64 images by design, but depending on the device
-        // specific camera HAL (Which can be different per device) there is an additional number of
-        // images that are reserved by the Camera HAL which reduces this number. If, for example,
-        // the HAL reserves 8 images, you have a maximum of 56 (64 - 8).
-        //
-        // One of the worst cases observed is the HAL reserving 10 images, which gives a maximum
-        // capacity of 54 (64 - 10). For safety and compatibility reasons, set the maximum capacity
-        // to be 54, which leaves headroom for an app configured limit of 50.
-        internal const val IMAGEREADER_MAX_CAPACITY = 54
-
         /**
          * Create and configure a new ImageReader instance as an [ImageReaderWrapper].
          *
@@ -138,11 +126,6 @@ private constructor(
             require(width > 0) { "Width ($width) must be > 0" }
             require(height > 0) { "Height ($height) must be > 0" }
             require(capacity > 0) { "Capacity ($capacity) must be > 0" }
-            require(capacity <= IMAGEREADER_MAX_CAPACITY) {
-                "Capacity for creating new ImageSources is restricted to " +
-                    "$IMAGEREADER_MAX_CAPACITY. Android has undocumented internal limits that " +
-                    "are different depending on which device the ImageReader is created on."
-            }
 
             // Warnings for unsupported features:
             if (usageFlags != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
@@ -337,12 +320,6 @@ public class AndroidMultiResolutionImageReader(
             plaformApiCompat: PlatformApiCompat?,
         ): ImageReaderWrapper {
             require(capacity > 0) { "Capacity ($capacity) must be > 0" }
-            require(capacity <= AndroidImageReader.IMAGEREADER_MAX_CAPACITY) {
-                "Capacity for creating new ImageSources is restricted to " +
-                    "${AndroidImageReader.IMAGEREADER_MAX_CAPACITY}. Android has undocumented " +
-                    "internal limits that are different depending on which device the " +
-                    "MultiResolutionImageReader is created on."
-            }
             if (enableConcurrentOutputs) {
                 require(plaformApiCompat?.isMultiResolutionConcurrentReadersEnabled() == true) {
                     "Concurrent MultiResolutionImageReaders are not supported on this device"

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/media/AndroidImageWriter.kt

@@ -25,7 +25,6 @@ import androidx.camera.camera2.pipe.InputStreamId
 import androidx.camera.camera2.pipe.StreamFormat
 import androidx.camera.camera2.pipe.compat.Api29Compat
 import androidx.camera.camera2.pipe.core.Log
-import androidx.camera.camera2.pipe.media.AndroidImageReader.Companion.IMAGEREADER_MAX_CAPACITY
 import kotlin.reflect.KClass
 import kotlinx.atomicfu.atomic
 
@@ -101,11 +100,6 @@ private constructor(
             handler: Handler,
         ): ImageWriterWrapper {
             require(maxImages > 0) { "Max images ($maxImages) must be > 0" }
-            require(maxImages <= IMAGEREADER_MAX_CAPACITY) {
-                "Max images for ImageWriters is restricted to " +
-                    "$IMAGEREADER_MAX_CAPACITY to prevent overloading downstream " +
-                    "consumer components."
-            }
             // Create and configure a new ImageWriter
             val imageWriter =
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && format != null) {

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/media/ImageReaderImageSource.kt

@@ -16,28 +16,43 @@
 
 package androidx.camera.camera2.pipe.media
 
+import android.hardware.camera2.CameraCharacteristics
 import android.media.ImageReader
 import android.os.Build
 import android.view.Surface
+import androidx.camera.camera2.pipe.CameraMetadata
 import androidx.camera.camera2.pipe.CameraPipe
 import androidx.camera.camera2.pipe.CameraStream
 import androidx.camera.camera2.pipe.ImageSourceConfig
 import androidx.camera.camera2.pipe.OutputId
 import androidx.camera.camera2.pipe.StreamId
 import androidx.camera.camera2.pipe.core.Log
 import androidx.camera.camera2.pipe.core.Threads
-import androidx.camera.camera2.pipe.media.AndroidImageReader.Companion.IMAGEREADER_MAX_CAPACITY
-import androidx.camera.camera2.pipe.media.ImageReaderImageSource.Companion.IMAGE_SOURCE_CAPACITY
 import androidx.camera.camera2.pipe.media.OutputImage.Companion.toLogString
 import javax.inject.Inject
 import kotlin.reflect.KClass
 import kotlinx.atomicfu.atomic
 
 internal class ImageReaderImageSources
 @Inject
-constructor(private val threads: Threads, cameraPipeConfig: CameraPipe.Config) : ImageSources {
+constructor(
+    private val threads: Threads,
+    cameraPipeConfig: CameraPipe.Config,
+    cameraMetadata: CameraMetadata,
+) : ImageSources {
     private val platformApiCompat = cameraPipeConfig.platformApiCompat
 
+    // See: b/172464059
+    //
+    // The ImageReader has an internal limit of 64 images by design, but depending on the device
+    // specific camera HAL (Which can be different per device) there is an additional number of
+    // images that are reserved by the Camera HAL which reduces this number. If, for example,
+    // the HAL reserves 8 images, you have a maximum of 56 (64 - 8).
+    private val maxImageReaderCapacity by lazy {
+        ImageReaderImageSource.BUFFER_QUEUE_MAX_CAPACITY -
+            checkNotNull(cameraMetadata[CameraCharacteristics.REQUEST_PIPELINE_MAX_DEPTH])
+    }
+
     override fun createImageSource(
         cameraStream: CameraStream,
         imageSourceConfig: ImageSourceConfig,
@@ -62,11 +77,6 @@ constructor(private val threads: Threads, cameraPipeConfig: CameraPipe.Config) :
     ): ImageSource {
         require(cameraStream.outputs.isNotEmpty()) { "$cameraStream must have outputs." }
         require(capacity > 0) { "Capacity ($capacity) must be > 0" }
-        require(capacity <= IMAGE_SOURCE_CAPACITY) {
-            "Capacity for creating new ImageReaderImageSources is restricted to " +
-                "$IMAGE_SOURCE_CAPACITY. Android has undocumented internal limits that can vary " +
-                "per device."
-        }
         if (enableConcurrentOutputs) {
             check(cameraStream.outputs.size > 1) {
                 "Cannot enable concurrent outputs for a single output camera stream."
@@ -76,13 +86,7 @@ constructor(private val threads: Threads, cameraPipeConfig: CameraPipe.Config) :
         val handlerProvider = { threads.camera2Handler }
         val executorProvider = { threads.lightweightExecutor }
 
-        // Increase the internal capacity of the ImageReader so that the final capacity of the
-        // ImageSource matches the requested capacity.
-        //
-        // As an example, if the consumer requests "40", the ImageReader will be created with
-        // a capacity of "42", which will allow the consumer to hold exactly 40 images without
-        // stalling the camera pipeline.
-        val imageReaderCapacity = capacity + ImageReaderImageSource.IMAGE_SOURCE_CAPACITY_MARGIN
+        val imageReaderCapacity = clampImageReaderCapacity(capacity, maxImageReaderCapacity)
 
         if (cameraStream.outputs.size == 1) {
             val output = cameraStream.outputs.single()
@@ -146,6 +150,22 @@ constructor(private val threads: Threads, cameraPipeConfig: CameraPipe.Config) :
         // but it was not possible to create it due to the SDK the code is running on.
         throw IllegalStateException("Failed to create an ImageSource for $cameraStream!")
     }
+
+    private fun clampImageReaderCapacity(desired: Int, maxImageReaderCapacity: Int): Int {
+        // Increase the internal capacity of the ImageReader so that the final capacity of the
+        // ImageSource matches the requested capacity.
+        //
+        // As an example, if the consumer requests "40", the ImageReader will be created with
+        // a capacity of "42", which will allow the consumer to hold exactly 40 images without
+        // stalling the camera pipeline.
+        return maxOf(
+            1 + ImageReaderImageSource.IMAGE_SOURCE_CAPACITY_MARGIN,
+            minOf(
+                desired + ImageReaderImageSource.IMAGE_SOURCE_CAPACITY_MARGIN,
+                maxImageReaderCapacity,
+            ),
+        )
+    }
 }
 
 /** An ImageReaderImageSource implements an [ImageSource] using an [ImageReader] */
@@ -154,9 +174,8 @@ public class ImageReaderImageSource(
     private val maxImages: Int,
 ) : ImageSource {
     public companion object {
+        public const val BUFFER_QUEUE_MAX_CAPACITY: Int = 64
         public const val IMAGE_SOURCE_CAPACITY_MARGIN: Int = 2
-        public const val IMAGE_SOURCE_CAPACITY: Int =
-            IMAGEREADER_MAX_CAPACITY - IMAGE_SOURCE_CAPACITY_MARGIN
 
         public fun create(imageReader: ImageReaderWrapper): ImageSource {
             // Reduce the maxImages of the ImageSource relative to the ImageReader to ensure there

camera/camera-testing/lint-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.0.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (9.0.0-beta02)" variant="all" version="9.0.0-beta02">
+<issues format="6" by="lint 9.2.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.0-alpha07)" variant="all" version="9.2.0-alpha07">
 
     <issue
         id="MissingPermission"
@@ -73,15 +73,6 @@
             file="src/main/java/androidx/camera/testing/impl/CoreAppTestUtil.java"/>
     </issue>
 
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; `SDK_INT` is never &lt; 23"
-        errorLine1="        if (Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.M) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/impl/CoreAppTestUtil.java"/>
-    </issue>
-
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 23"