Skip to content

Various performance improvements #2046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mike-the-one wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Various performance improvements #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
753 changes: 508 additions & 245 deletions encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AndroidViewFilterRender.java
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 31 additions & 3 deletions encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,34 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {

@Throws(IllegalStateException::class, Exception::class)
private fun drawSurface(cameraDevice: CameraDevice, surfaces: List<Surface>): CaptureRequest {
val builderInputSurface = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW)
val builderInputSurface = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_RECORD)
for (surface in surfaces) builderInputSurface.addTarget(surface)
builderInputSurface.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO)
val validFps = min(60, fps)
builderInputSurface.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, Range(validFps, validFps))
// Find best FPS range instead of forcing strict [30, 30] which causes HAL duplication stutter
var bestRange = Range(validFps, validFps)
try {
val facing = if (cameraId == "1") Facing.FRONT else Facing.BACK
val supportedRanges = getSupportedFps(null, facing)

// Look for a range that maxes out at our target FPS, but allows dipping to save light (e.g. [24, 30] or [15, 30])
for (range in supportedRanges) {
if (range.upper == validFps && range.lower < validFps) {
// Try to avoid dropping too low (e.g. [15, 30] can be too choppy, prefer [24, 30])
if (range.lower >= 24) {
bestRange = range
break
} else if (bestRange.lower == validFps || range.lower > bestRange.lower) {
bestRange = range
}
}
}
Log.i(TAG, "Selected dynamic FPS range: $bestRange for target $validFps")
} catch (e: Exception) {
Log.e(TAG, "Error finding dynamic FPS range", e)
}

builderInputSurface.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, bestRange)
this.builderInputSurface = builderInputSurface
return builderInputSurface.build()
}
Expand Down Expand Up @@ -605,7 +628,12 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
builderInputSurface.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_CANCEL)
builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF)
applyRequest(builderInputSurface)
if (supportedFocusModes.contains(CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)) {
// Prefer CONTINUOUS_VIDEO: same smooth AF as CONTINUOUS_PICTURE but defers
// fine adjustments to not interrupt frame delivery (no dropped frames on focus hunt).
if (supportedFocusModes.contains(CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_VIDEO)) {
builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_VIDEO)
isAutoFocusEnabled = true
} else if (supportedFocusModes.contains(CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)) {
builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)
isAutoFocusEnabled = true
} else if (supportedFocusModes.contains(CaptureRequest.CONTROL_AF_MODE_AUTO)) {
Expand Down
Loading
Loading