Skip to content

Preview stabilisation fix #463

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
davidjiagoogle wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Preview stabilisation fix #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea5b8c9
Update CameraSession.kt
davidjiagoogle Jan 20, 2026
24f1c8c
spotless
davidjiagoogle Jan 20, 2026
80f3fef
add tests
davidjiagoogle Jan 21, 2026
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
56 changes: 56 additions & 0 deletions ...mera/src/androidTest/java/com/google/jetpackcamera/core/camera/CameraXCameraSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ import com.google.jetpackcamera.model.FlashMode
import com.google.jetpackcamera.model.Illuminant
import com.google.jetpackcamera.model.LensFacing
import com.google.jetpackcamera.model.SaveLocation
import com.google.jetpackcamera.model.StabilizationMode
import com.google.jetpackcamera.settings.ConstraintsRepository
import com.google.jetpackcamera.settings.SettableConstraintsRepository
import com.google.jetpackcamera.settings.SettableConstraintsRepositoryImpl
import com.google.jetpackcamera.settings.model.CameraAppSettings
import com.google.jetpackcamera.settings.model.DEFAULT_CAMERA_APP_SETTINGS
import com.google.jetpackcamera.settings.model.forCurrentLens
import java.io.File
import java.util.AbstractMap
import javax.inject.Provider
Expand Down Expand Up @@ -225,6 +227,60 @@ class CameraXCameraSystemTest {
recordingComplete.await()
}

@Test
fun setStabilizationMode_on_updatesCameraState(): Unit = runBlocking {
runSetStabilizationModeTest(StabilizationMode.ON)
}

@Test
fun setStabilizationMode_optical_updatesCameraState(): Unit = runBlocking {
runSetStabilizationModeTest(StabilizationMode.OPTICAL)
}

@Test
fun setStabilizationMode_highQuality_updatesCameraState(): Unit = runBlocking {
runSetStabilizationModeTest(StabilizationMode.HIGH_QUALITY)
}

private suspend fun CoroutineScope.runSetStabilizationModeTest(
stabilizationMode: StabilizationMode
) {
// Arrange.
val constraintsRepository = SettableConstraintsRepositoryImpl()
val appSettings = DEFAULT_CAMERA_APP_SETTINGS
val cameraConstraints =
constraintsRepository.systemConstraints.value?.forCurrentLens(appSettings)
assume().withMessage("Stabilisation $stabilizationMode not supported, skip the test.")
.that(
cameraConstraints != null && cameraConstraints.supportedStabilizationModes.contains(
stabilizationMode
)
).isTrue()
val cameraSystem = createAndInitCameraXCameraSystem(
appSettings = appSettings,
constraintsRepository = constraintsRepository
)
cameraSystem.startCameraAndWaitUntilRunning()

val stabilizationCheck: ReceiveChannel<Boolean> = cameraSystem.getCurrentCameraState()
.map { it.stabilizationMode == stabilizationMode }
.produceIn(this)
stabilizationCheck.awaitValue(false)

// Act.
cameraSystem.setStabilizationMode(stabilizationMode)
val result = cameraSystem.takePicture(context.contentResolver, SaveLocation.Default) {}

// Assert.
stabilizationCheck.awaitValue(true)

// Clean-up.
if (result.savedUri != null) {
filesToDelete.add(result.savedUri!!)
}
stabilizationCheck.cancel()
}

@Test
fun recordVideoWithFlashModeOn_shouldEnableTorch(): Unit = runBlocking {
// Arrange.
Expand Down
21 changes: 17 additions & 4 deletions core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,10 +751,23 @@ private fun createPreviewUseCase(

// set preview stabilization
when (stabilizationMode) {
StabilizationMode.ON -> setPreviewStabilizationEnabled(true)
StabilizationMode.OPTICAL -> setOpticalStabilizationModeEnabled(true)
StabilizationMode.OFF -> setOpticalStabilizationModeEnabled(false)
StabilizationMode.HIGH_QUALITY -> {} // No-op. Handled by VideoCapture use case.
StabilizationMode.ON -> {
setPreviewStabilizationEnabled(true)
setOpticalStabilizationModeEnabled(false)
}

StabilizationMode.OPTICAL -> {
setPreviewStabilizationEnabled(false)
setOpticalStabilizationModeEnabled(true)
}
StabilizationMode.OFF -> {
setPreviewStabilizationEnabled(false)
setOpticalStabilizationModeEnabled(false)
}
StabilizationMode.HIGH_QUALITY -> {
setPreviewStabilizationEnabled(false)
setOpticalStabilizationModeEnabled(false)
} // Handled by VideoCapture use case.
else -> throw UnsupportedOperationException(
"Unexpected stabilization mode: $stabilizationMode. Stabilization mode should always " +
"an explicit mode, such as ON, OPTICAL, OFF or HIGH_QUALITY"
Expand Down
Loading