Merge pull request 'Catch focus timeout and negative value errs' (#21) from loewy/fix-android-focus-timeout-crash into main

Reviewed-on: #21

package/android/src/main/java/com/mrousavy/camera/core/HlsMuxer.kt

@@ -753,17 +753,32 @@ class HlsMuxer(
         dos.writeShort(-1)              // pre-defined
 
         output.write(buildAvcCBox(sps, pps))
+        output.write(buildPaspBox())
 
         return wrapBox("avc1", output.toByteArray())
     }
 
+    /**
+     * Builds pixel aspect ratio box to explicitly declare square pixels (1:1).
+     * This helps players correctly interpret video dimensions without SAR scaling.
+     */
+    private fun buildPaspBox(): ByteArray {
+        val output = ByteArrayOutputStream()
+        val dos = DataOutputStream(output)
+        dos.writeInt(1)  // hSpacing (horizontal)
+        dos.writeInt(1)  // vSpacing (vertical)
+        return wrapBox("pasp", output.toByteArray())
+    }
+
     private fun buildAvcCBox(sps: ByteArray, pps: ByteArray): ByteArray {
         val output = ByteArrayOutputStream()
         val dos = DataOutputStream(output)
 
-        val profileIdc = if (sps.isNotEmpty()) sps[0].toInt() and 0xFF else 0x42
+        // SPS NAL unit format: [NAL header, profile_idc, constraint_flags, level_idc, ...]
-        val profileCompat = if (sps.size > 1) sps[1].toInt() and 0xFF else 0x00
+        // Skip byte 0 (NAL header, typically 0x67) to get the actual profile data
-        val levelIdc = if (sps.size > 2) sps[2].toInt() and 0xFF else 0x1F
+        val profileIdc = if (sps.size > 1) sps[1].toInt() and 0xFF else 0x42
+        val profileCompat = if (sps.size > 2) sps[2].toInt() and 0xFF else 0x00
+        val levelIdc = if (sps.size > 3) sps[3].toInt() and 0xFF else 0x1F
 
         dos.writeByte(1)            // configuration version
         dos.writeByte(profileIdc)   // AVC profile

package/android/src/main/java/com/mrousavy/camera/core/PersistentCameraCaptureSession.kt

@@ -235,10 +235,15 @@ class PersistentCameraCaptureSession(private val cameraManager: CameraManager, p
 
       // 1. Run a precapture sequence for AF, AE and AWB.
       focusJob = coroutineScope.launch {
-        val request = repeatingRequest.createCaptureRequest(device, deviceDetails, outputs)
+        try {
-        val options =
+          val request = repeatingRequest.createCaptureRequest(device, deviceDetails, outputs)
-          PrecaptureOptions(listOf(PrecaptureTrigger.AF, PrecaptureTrigger.AE), Flash.OFF, listOf(point), false, FOCUS_RESET_TIMEOUT)
+          val options =
-        session.precapture(request, deviceDetails, options)
+            PrecaptureOptions(listOf(PrecaptureTrigger.AF, PrecaptureTrigger.AE), Flash.OFF, listOf(point), false, FOCUS_RESET_TIMEOUT)
+          session.precapture(request, deviceDetails, options)
+        } catch (e: CaptureTimedOutError) {
+          // Focus timed out - this is non-fatal, just log and continue
+          Log.w(TAG, "Focus timed out at point $point, continuing without focus lock")
+        }
       }
       focusJob?.join()
 

package/android/src/main/java/com/mrousavy/camera/core/PreviewView.kt

@@ -198,8 +198,10 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
     val viewOrientation = Orientation.PORTRAIT
 
     val rotated = point.rotatedBy(viewSize, cameraSize, viewOrientation, sensorOrientation)
-    Log.i(TAG, "Converted layer point $point to camera point $rotated! ($sensorOrientation, $cameraSize -> $viewSize)")
+    // Clamp to valid camera coordinates (must be non-negative for MeteringRectangle)
-    return rotated
+    val clamped = Point(maxOf(0, rotated.x), maxOf(0, rotated.y))
+    Log.i(TAG, "Converted layer point $point to camera point $clamped! ($sensorOrientation, $cameraSize -> $viewSize)")
+    return clamped
   }
 
   private fun updateLayout() {