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

Use CameraX's selected camera over explicit selection #456

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Use CameraX's selected camera over explicit selection #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24d545e
Avoid hardcoding the info of the camera to be selected
MHShetty Jul 30, 2024
e71118a
Dynamically show/hide eis settings based on current config
MHShetty Jul 30, 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
41 changes: 15 additions & 26 deletions app/src/main/java/app/grapheneos/camera/CamConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,6 @@ class CamConfig(private val mActivity: MainActivity) {

var lastCapturedItem: CapturedItem? = null

private var frontCameraInfo : CameraInfo? = null

private var rearCameraInfo : CameraInfo? = null

init {
if (mActivity !is SecureActivity) {
CapturedItems.init(mActivity, this)
Expand Down Expand Up @@ -306,7 +302,9 @@ class CamConfig(private val mActivity: MainActivity) {

var lensFacing = DEFAULT_LENS_FACING

private lateinit var cameraSelector: CameraSelector
private var cameraSelector: CameraSelector = CameraSelector.Builder()
.requireLensFacing(DEFAULT_LENS_FACING)
.build()

var gridType: GridType = SettingValues.Default.GRID_TYPE
set(value) {
Expand Down Expand Up @@ -917,9 +915,9 @@ class CamConfig(private val mActivity: MainActivity) {
startCamera(true)
}

@SuppressLint("RestrictedApi")
private fun getCurrentCameraInfo() : CameraInfo {
return if (lensFacing == CameraSelector.LENS_FACING_BACK) rearCameraInfo!!
else frontCameraInfo!!
return cameraProvider!!.getCameraInfo(cameraSelector)
}

fun toggleCameraSelector() {
Expand Down Expand Up @@ -965,12 +963,6 @@ class CamConfig(private val mActivity: MainActivity) {
return
}

// Select a single camera for front/rear facing
for (cameraInfo in cameraProvider!!.availableCameraInfos) {
if (cameraInfo.lensFacing == CameraSelector.LENS_FACING_FRONT) frontCameraInfo = cameraInfo
else if (cameraInfo.lensFacing == CameraSelector.LENS_FACING_BACK) rearCameraInfo = cameraInfo
}

// Manually switch to the other lens facing (if the default lens facing isn't
// supported for the current device)
if (!isLensFacingSupported(lensFacing)) {
Expand All @@ -997,11 +989,17 @@ class CamConfig(private val mActivity: MainActivity) {
}

private fun isLensFacingSupported(lensFacing : Int) : Boolean {
return when(lensFacing) {
CameraSelector.LENS_FACING_FRONT -> frontCameraInfo != null
CameraSelector.LENS_FACING_BACK -> rearCameraInfo != null
else -> false
var tCameraSelector = CameraSelector.Builder()
.requireLensFacing(lensFacing)
.build()

if (currentMode.extensionMode != ExtensionMode.NONE) {
extensionsManager?.let { em ->
tCameraSelector = em.getExtensionEnabledCameraSelector(tCameraSelector, currentMode.extensionMode)
}
}

return cameraProvider?.hasCamera(tCameraSelector) ?: false
}

// Start the camera with latest hard configuration
Expand All @@ -1027,15 +1025,6 @@ class CamConfig(private val mActivity: MainActivity) {

cameraSelector = CameraSelector.Builder()
.requireLensFacing(lensFacing)
.addCameraFilter {
return@addCameraFilter listOf(
if (lensFacing == CameraSelector.LENS_FACING_BACK) {
rearCameraInfo
} else {
frontCameraInfo
}
)
}
.build()

val builder = ImageCapture.Builder()
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,11 @@ class SettingsDialog(val mActivity: MainActivity) :
includeAudioSetting.visibility = View.VISIBLE
enableEISSetting.visibility = View.GONE
videoQualitySetting.visibility = View.VISIBLE
if (camConfig.isStabilizationSupported()) enableEISSetting.visibility = View.VISIBLE
enableEISSetting.visibility = if (camConfig.isStabilizationSupported()) {
View.VISIBLE
} else {
View.GONE
}
} else {
includeAudioSetting.visibility = View.GONE
enableEISSetting.visibility = View.GONE
Expand Down