Compare commits
2 Commits
main
...
6d99d1f17f
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d99d1f17f | |||
| 2f7b511ce8 |
@@ -753,32 +753,17 @@ class HlsMuxer(
|
|||||||
dos.writeShort(-1) // pre-defined
|
dos.writeShort(-1) // pre-defined
|
||||||
|
|
||||||
output.write(buildAvcCBox(sps, pps))
|
output.write(buildAvcCBox(sps, pps))
|
||||||
output.write(buildPaspBox())
|
|
||||||
|
|
||||||
return wrapBox("avc1", output.toByteArray())
|
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 {
|
private fun buildAvcCBox(sps: ByteArray, pps: ByteArray): ByteArray {
|
||||||
val output = ByteArrayOutputStream()
|
val output = ByteArrayOutputStream()
|
||||||
val dos = DataOutputStream(output)
|
val dos = DataOutputStream(output)
|
||||||
|
|
||||||
// SPS NAL unit format: [NAL header, profile_idc, constraint_flags, level_idc, ...]
|
val profileIdc = if (sps.isNotEmpty()) sps[0].toInt() and 0xFF else 0x42
|
||||||
// Skip byte 0 (NAL header, typically 0x67) to get the actual profile data
|
val profileCompat = if (sps.size > 1) sps[1].toInt() and 0xFF else 0x00
|
||||||
val profileIdc = if (sps.size > 1) sps[1].toInt() and 0xFF else 0x42
|
val levelIdc = if (sps.size > 2) sps[2].toInt() and 0xFF else 0x1F
|
||||||
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(1) // configuration version
|
||||||
dos.writeByte(profileIdc) // AVC profile
|
dos.writeByte(profileIdc) // AVC profile
|
||||||
|
|||||||
@@ -243,10 +243,6 @@ class PersistentCameraCaptureSession(private val cameraManager: CameraManager, p
|
|||||||
} catch (e: CaptureTimedOutError) {
|
} catch (e: CaptureTimedOutError) {
|
||||||
// Focus timed out - this is non-fatal, just log and continue
|
// Focus timed out - this is non-fatal, just log and continue
|
||||||
Log.w(TAG, "Focus timed out at point $point, continuing without focus lock")
|
Log.w(TAG, "Focus timed out at point $point, continuing without focus lock")
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
Log.w(TAG, "Focus failed, camera device was already closed: ${e.message}")
|
|
||||||
} catch (e: CameraAccessException) {
|
|
||||||
Log.w(TAG, "Focus failed, camera not accessible: ${e.message}")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
focusJob?.join()
|
focusJob?.join()
|
||||||
@@ -263,15 +259,9 @@ class PersistentCameraCaptureSession(private val cameraManager: CameraManager, p
|
|||||||
return@launch
|
return@launch
|
||||||
}
|
}
|
||||||
Log.i(TAG, "Resetting focus to auto-focus...")
|
Log.i(TAG, "Resetting focus to auto-focus...")
|
||||||
try {
|
|
||||||
repeatingRequest.createCaptureRequest(device, deviceDetails, outputs).also { request ->
|
repeatingRequest.createCaptureRequest(device, deviceDetails, outputs).also { request ->
|
||||||
session.setRepeatingRequest(request.build(), null, null)
|
session.setRepeatingRequest(request.build(), null, null)
|
||||||
}
|
}
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
Log.w(TAG, "Failed to reset focus, camera device was already closed: ${e.message}")
|
|
||||||
} catch (e: CameraAccessException) {
|
|
||||||
Log.w(TAG, "Failed to reset focus, camera not accessible: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import android.content.Context
|
|||||||
import android.content.res.Configuration
|
import android.content.res.Configuration
|
||||||
import android.graphics.Point
|
import android.graphics.Point
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.HandlerThread
|
import android.os.Looper
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.util.Size
|
import android.util.Size
|
||||||
import android.view.PixelCopy
|
import android.view.PixelCopy
|
||||||
@@ -25,72 +25,58 @@ import kotlinx.coroutines.Dispatchers
|
|||||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
import kotlinx.coroutines.suspendCancellableCoroutine
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import android.graphics.Bitmap
|
import android.graphics.Bitmap
|
||||||
|
import android.graphics.Matrix
|
||||||
|
|
||||||
|
fun rotateBitmap90CounterClockwise(source: Bitmap): Bitmap {
|
||||||
|
val width = source.width
|
||||||
|
val height = source.height
|
||||||
|
|
||||||
|
// Create a new Bitmap with swapped width and height
|
||||||
|
val rotatedBitmap = Bitmap.createBitmap(height, width, source.config ?: Bitmap.Config.ARGB_8888)
|
||||||
|
|
||||||
|
for (y in 0 until height) {
|
||||||
|
for (x in 0 until width) {
|
||||||
|
// Set the pixel in the new position
|
||||||
|
rotatedBitmap.setPixel(y, width - 1 - x, source.getPixel(x, y))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return rotatedBitmap
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
fun Bitmap.transformBitmap(orientation: Orientation): Bitmap {
|
fun Bitmap.transformBitmap(orientation: Orientation): Bitmap {
|
||||||
return when (orientation) {
|
return when (orientation) {
|
||||||
Orientation.PORTRAIT -> this // No transformation needed
|
Orientation.PORTRAIT -> this // No transformation needed
|
||||||
Orientation.LANDSCAPE_LEFT -> {
|
Orientation.LANDSCAPE_LEFT -> {
|
||||||
val srcWidth = width
|
// Transpose (swap width and height)
|
||||||
val srcHeight = height
|
val transposedBitmap = Bitmap.createBitmap(height, width, config ?: Bitmap.Config.ARGB_8888)
|
||||||
val sourcePixels = IntArray(srcWidth * srcHeight)
|
for (y in 0 until height) {
|
||||||
getPixels(sourcePixels, 0, srcWidth, 0, 0, srcWidth, srcHeight)
|
for (x in 0 until width) {
|
||||||
|
transposedBitmap.setPixel(y, width - 1 - x, getPixel(x, y))
|
||||||
val dstWidth = srcHeight
|
|
||||||
val dstHeight = srcWidth
|
|
||||||
val destinationPixels = IntArray(dstWidth * dstHeight)
|
|
||||||
for (y in 0 until srcHeight) {
|
|
||||||
for (x in 0 until srcWidth) {
|
|
||||||
val dstX = y
|
|
||||||
val dstY = srcWidth - 1 - x
|
|
||||||
destinationPixels[dstY * dstWidth + dstX] = sourcePixels[y * srcWidth + x]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
transposedBitmap
|
||||||
val transformedBitmap = Bitmap.createBitmap(dstWidth, dstHeight, config ?: Bitmap.Config.ARGB_8888)
|
|
||||||
transformedBitmap.setPixels(destinationPixels, 0, dstWidth, 0, 0, dstWidth, dstHeight)
|
|
||||||
transformedBitmap
|
|
||||||
}
|
}
|
||||||
Orientation.PORTRAIT_UPSIDE_DOWN -> {
|
Orientation.PORTRAIT_UPSIDE_DOWN -> {
|
||||||
val srcWidth = width
|
// Invert vertically and horizontally (180-degree rotation)
|
||||||
val srcHeight = height
|
val invertedBitmap = Bitmap.createBitmap(width, height, config ?: Bitmap.Config.ARGB_8888)
|
||||||
val sourcePixels = IntArray(srcWidth * srcHeight)
|
for (y in 0 until height) {
|
||||||
getPixels(sourcePixels, 0, srcWidth, 0, 0, srcWidth, srcHeight)
|
for (x in 0 until width) {
|
||||||
|
invertedBitmap.setPixel(width - 1 - x, height - 1 - y, getPixel(x, y))
|
||||||
val dstWidth = srcWidth
|
|
||||||
val dstHeight = srcHeight
|
|
||||||
val destinationPixels = IntArray(dstWidth * dstHeight)
|
|
||||||
for (y in 0 until srcHeight) {
|
|
||||||
for (x in 0 until srcWidth) {
|
|
||||||
val dstX = srcWidth - 1 - x
|
|
||||||
val dstY = srcHeight - 1 - y
|
|
||||||
destinationPixels[dstY * dstWidth + dstX] = sourcePixels[y * srcWidth + x]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
invertedBitmap
|
||||||
val transformedBitmap = Bitmap.createBitmap(dstWidth, dstHeight, config ?: Bitmap.Config.ARGB_8888)
|
|
||||||
transformedBitmap.setPixels(destinationPixels, 0, dstWidth, 0, 0, dstWidth, dstHeight)
|
|
||||||
transformedBitmap
|
|
||||||
}
|
}
|
||||||
Orientation.LANDSCAPE_RIGHT -> {
|
Orientation.LANDSCAPE_RIGHT -> {
|
||||||
val srcWidth = width
|
// Transpose (swap width and height) and invert vertically
|
||||||
val srcHeight = height
|
val transposedBitmap = Bitmap.createBitmap(height, width, config ?: Bitmap.Config.ARGB_8888)
|
||||||
val sourcePixels = IntArray(srcWidth * srcHeight)
|
for (y in 0 until height) {
|
||||||
getPixels(sourcePixels, 0, srcWidth, 0, 0, srcWidth, srcHeight)
|
for (x in 0 until width) {
|
||||||
|
transposedBitmap.setPixel(height - 1 - y, x, getPixel(x, y))
|
||||||
val dstWidth = srcHeight
|
|
||||||
val dstHeight = srcWidth
|
|
||||||
val destinationPixels = IntArray(dstWidth * dstHeight)
|
|
||||||
for (y in 0 until srcHeight) {
|
|
||||||
for (x in 0 until srcWidth) {
|
|
||||||
val dstX = srcHeight - 1 - y
|
|
||||||
val dstY = x
|
|
||||||
destinationPixels[dstY * dstWidth + dstX] = sourcePixels[y * srcWidth + x]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
transposedBitmap
|
||||||
val transformedBitmap = Bitmap.createBitmap(dstWidth, dstHeight, config ?: Bitmap.Config.ARGB_8888)
|
|
||||||
transformedBitmap.setPixels(destinationPixels, 0, dstWidth, 0, 0, dstWidth, dstHeight)
|
|
||||||
transformedBitmap
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -200,7 +186,7 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
pixelCopyHandler
|
Handler(Looper.getMainLooper())
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -270,10 +256,5 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "PreviewView"
|
private const val TAG = "PreviewView"
|
||||||
private val pixelCopyHandler: Handler by lazy {
|
|
||||||
val handlerThread = HandlerThread("VisionCamera.PixelCopy")
|
|
||||||
handlerThread.start()
|
|
||||||
Handler(handlerThread.looper)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user