Skip to content
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

Octo4a 2.1.0 - Camera service refactor #496

Merged
merged 14 commits into from
Jul 14, 2024
Merged

Octo4a 2.1.0 - Camera service refactor #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2b302b6
Refactor the CameraService
cobryan05 Jun 7, 2024
7fbd2d4
Bug Fixes for Camera Service Refactor
cobryan05 Jun 10, 2024
2c015d7
Autofocus fix?
cobryan05 Jun 11, 2024
eb96c61
Preview window bug fixes
cobryan05 Jun 13, 2024
f09d289
Set cameraControl *before* state
cobryan05 Jun 13, 2024
cb58983
I guess super.OnImageCaptureSuccess() *is* needed.
cobryan05 Jun 13, 2024
2b1f8a5
More flash fix attempts...
cobryan05 Jun 14, 2024
c06ec6b
Always call enableTorch() when refcnt+
cobryan05 Jun 14, 2024
cdc86f7
feat: Manual focus slider in PreviewDialog
feelfreelinux Jul 14, 2024
1fe33a9
feat: Do not recreate camera preview on each focus change
feelfreelinux Jul 14, 2024
9f3f350
fix: Properly deinit usecase on preview close
feelfreelinux Jul 14, 2024
5f55b93
fix: bump version in gradle build file
feelfreelinux Jul 14, 2024
ed15936
fix: Get rid of unnecessary disableAF setting
feelfreelinux Jul 14, 2024
87637d4
fix: make focus slider first in the preview dialog, harder to miss
feelfreelinux Jul 14, 2024
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
4 changes: 2 additions & 2 deletions app/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ android {
applicationId = "com.octo4a"
minSdk = 17
targetSdk = 28
versionName = "2.0.0"
versionCode = 2000000
versionName = "2.1.0"
versionCode = 2001000
multiDexEnabled = true

ndk {
Expand Down
11 changes: 7 additions & 4 deletions app/app/src/main/java/com/octo4a/camera/CameraEnumerationRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import com.octo4a.utils.isServiceRunning

data class CameraSize(val width: Int, val height: Int)

data class CameraDescription(val id: String, val megapixels: Int, val lensFacing: Int, val sizes: List<CameraSize>)
data class CameraDescription(val id: String, val megapixels: Int, val lensFacing: Int, val sizes: List<CameraSize>, val frameRates: List<Int>)

fun CameraSize.readableString(): String {
return "${width}x${height}"
Expand Down Expand Up @@ -67,9 +67,11 @@ class CameraEnumerationRepository(val context: Context) {
val configs = characteristics.get(
CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP
)
val fpsRanges = characteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES)
val frameRates = fpsRanges?.map { it.upper }?.distinct()?.sorted() ?: emptyList()
val sizes = configs?.getOutputSizes(ImageFormat.YUV_420_888)
?.map { size -> CameraSize(size.width, size.height) }
CameraDescription(it, megapixels, facing, sizes ?: emptyList())
CameraDescription(it, megapixels, facing, sizes ?: emptyList(), frameRates)
}.toMutableList()
} else {
val needToRestartService = context.isServiceRunning(LegacyCameraService::class.java)
Expand All @@ -84,7 +86,7 @@ class CameraEnumerationRepository(val context: Context) {
Camera.getCameraInfo(i, cameraInfo)

val cam = Camera.open(i)

val supportedFrameRates = cam.parameters.supportedPreviewFrameRates.sorted()
val pictureSize = cam.parameters.pictureSize
val megaPixels = (pictureSize.width * pictureSize.height) / 1000000
cams.add(CameraDescription(
Expand All @@ -93,7 +95,8 @@ class CameraEnumerationRepository(val context: Context) {
cameraInfo.facing,
cam.parameters.supportedPreviewSizes.map {
CameraSize(it.width, it.height)
}
},
supportedFrameRates
))

cam.release()
Expand Down
Loading
Loading