Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion feature/record/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
libs.androidx.activity.compose,
libs.androidx.camera.camera2,
libs.androidx.camera.lifecycle,
libs.androidx.camera.view,
libs.androidx.camera.compose,

libs.compose.keyboard.state,
libs.logger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@ package com.ninecraft.booket.feature.record.ocr.content
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.util.Rational
import android.provider.Settings
import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.camera.compose.CameraXViewfinder
import androidx.camera.core.CameraSelector
import androidx.camera.core.ImageCapture
import androidx.camera.core.ImageCaptureException
import androidx.camera.view.LifecycleCameraController
import androidx.camera.view.PreviewView
import androidx.camera.core.Preview
import androidx.camera.core.SurfaceRequest
import androidx.camera.core.UseCaseGroup
import androidx.camera.core.ViewPort
import androidx.camera.lifecycle.ProcessCameraProvider
import androidx.camera.lifecycle.awaitInstance
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -28,17 +33,20 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.content.ContextCompat
import androidx.core.net.toUri
import androidx.lifecycle.Lifecycle
Expand Down Expand Up @@ -115,17 +123,44 @@ internal fun OcrCameraContent(
}

/**
* Camera Controller
* Camera Setup (ProcessCameraProvider + Preview + ImageCapture)
*/
val cameraController = remember { LifecycleCameraController(context) }

DisposableEffect(isGranted, lifecycleOwner, cameraController) {
if (isGranted) {
cameraController.bindToLifecycle(lifecycleOwner)
var surfaceRequest by remember { mutableStateOf<SurfaceRequest?>(null) }
val preview = remember {
Preview.Builder().build().also {
it.setSurfaceProvider { request ->
surfaceRequest = request
}
}
}
val imageCapture = remember { ImageCapture.Builder().build() }
val density = LocalDensity.current
val screenWidthPx = with(density) { LocalConfiguration.current.screenWidthDp.dp.roundToPx() }
val previewHeightPx = with(density) { 200.dp.roundToPx() }

onDispose {
cameraController.unbind()
LaunchedEffect(isGranted) {
if (!isGranted) return@LaunchedEffect
ProcessCameraProvider.awaitInstance(context).apply {
unbindAll()

// Preview 영역(fillMaxWidth x 200dp) 비율로 ViewPort를 설정하여
// ImageCapture 출력을 해당 영역으로 제한
val viewPort = ViewPort.Builder(
Rational(screenWidthPx, previewHeightPx),
preview.targetRotation,
).build()

val useCaseGroup = UseCaseGroup.Builder()
.setViewPort(viewPort)
.addUseCase(preview)
.addUseCase(imageCapture)
.build()

bindToLifecycle(
lifecycleOwner,
CameraSelector.DEFAULT_BACK_CAMERA,
useCaseGroup,
)
}
}
Comment on lines +141 to 165
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

ProcessCameraProvider unbind 누락으로 인한 리소스 누수 가능성

Composable이 composition을 벗어날 때 카메라 바인딩을 해제하는 cleanup 로직이 없습니다. LaunchedEffect는 key가 변경되거나 composition을 벗어날 때 코루틴을 취소하지만, ProcessCameraProviderunbindAll()은 자동으로 호출되지 않습니다.

🐛 DisposableEffect를 사용한 cleanup 로직 추가 제안
     LaunchedEffect(isGranted) {
         if (!isGranted) return@LaunchedEffect
-        ProcessCameraProvider.awaitInstance(context).apply {
+        val cameraProvider = ProcessCameraProvider.awaitInstance(context)
+        cameraProvider.apply {
             unbindAll()

             // Preview 영역(fillMaxWidth x 200dp) 비율로 ViewPort를 설정하여
             // ImageCapture 출력을 해당 영역으로 제한
             val viewPort = ViewPort.Builder(
                 Rational(screenWidthPx, previewHeightPx),
                 preview.targetRotation,
             ).build()

             val useCaseGroup = UseCaseGroup.Builder()
                 .setViewPort(viewPort)
                 .addUseCase(preview)
                 .addUseCase(imageCapture)
                 .build()

             bindToLifecycle(
                 lifecycleOwner,
                 CameraSelector.DEFAULT_BACK_CAMERA,
                 useCaseGroup,
             )
         }
     }
+
+    DisposableEffect(Unit) {
+        onDispose {
+            // Composable 종료 시 카메라 리소스 해제
+            // ProcessCameraProvider는 singleton이므로 getInstance 사용
+            ProcessCameraProvider.getInstance(context).get().unbindAll()
+        }
+    }
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/content/OcrCameraContent.kt`
around lines 141 - 165, The LaunchedEffect block binds camera use cases via
ProcessCameraProvider.awaitInstance(...) but lacks cleanup, causing potential
resource leaks; replace or augment this with a DisposableEffect that acquires
the ProcessCameraProvider (via ProcessCameraProvider.awaitInstance(context) or
the provider returned inside LaunchedEffect), calls unbindAll() in
DisposableEffect's onDispose, and performs the bindToLifecycle(...) inside
DisposableEffect's effect body (using lifecycleOwner,
CameraSelector.DEFAULT_BACK_CAMERA, viewPort/useCaseGroup, preview, and
imageCapture) so that unbindAll() is always invoked when the composable leaves
composition.


Expand Down Expand Up @@ -203,21 +238,12 @@ internal fun OcrCameraContent(
.height(200.dp)
.align(Alignment.Center),
) {
AndroidView(
modifier = Modifier.fillMaxSize(),
factory = { context ->
PreviewView(context).apply {
layoutParams = LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT,
)
clipToOutline = true
implementationMode = PreviewView.ImplementationMode.COMPATIBLE
scaleType = PreviewView.ScaleType.FILL_CENTER
controller = cameraController
}
},
)
surfaceRequest?.let { request ->
CameraXViewfinder(
surfaceRequest = request,
modifier = Modifier.fillMaxSize(),
)
}
}
CameraFrame(modifier = Modifier.align(Alignment.Center))
}
Expand Down Expand Up @@ -248,7 +274,7 @@ internal fun OcrCameraContent(
val photoFile = File.createTempFile("ocr_", ".jpg", context.cacheDir)
val output = ImageCapture.OutputFileOptions.Builder(photoFile).build()

cameraController.takePicture(
imageCapture.takePicture(
output,
executor,
object : ImageCapture.OnImageSavedCallback {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ androidx-datastore-preferences = { group = "androidx.datastore", name = "datasto
androidx-camera-core = { group = "androidx.camera", name = "camera-core", version.ref = "androidx-camera" }
androidx-camera-camera2 = { group = "androidx.camera", name = "camera-camera2", version.ref = "androidx-camera" }
androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "androidx-camera" }
androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "androidx-camera" }
androidx-camera-compose = { group = "androidx.camera", name = "camera-compose", version.ref = "androidx-camera" }

androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" }
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
Expand Down