Skip to content

fix camera quality to pixel8a #1842

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

Closed
pedroSG94 wants to merge 1 commit into from
Closed

fix camera quality to pixel8a #1842

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
11 changes: 4 additions & 7 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 @@ -82,7 +82,7 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
private var facing = Facing.BACK
private var builderInputSurface: CaptureRequest.Builder? = null
private var fingerSpacing = 0f
private var zoomLevel = 0f
private var zoomLevel = 1f
var isLanternEnabled: Boolean = false
private set
var isVideoStabilizationEnabled: Boolean = false
Expand Down Expand Up @@ -148,20 +148,17 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
val listSurfaces = mutableListOf<Surface>()
listSurfaces.add(surfaceEncoder)
imageReader?.let { listSurfaces.add(it.surface) }
val captureRequest = drawSurface(cameraDevice, listSurfaces)
createCaptureSession(
cameraDevice,
listSurfaces,
onConfigured = {
cameraCaptureSession = it
try {
val captureRequest = drawSurface(cameraDevice, listSurfaces)
it.setRepeatingRequest(
captureRequest,
if (faceDetectionEnabled || frameCapturedCallback != null){
cb
} else{
null
}, cameraHandler
if (faceDetectionEnabled || frameCapturedCallback != null) cb else null,
cameraHandler
)
} catch (e: IllegalStateException) {
reOpenCamera(cameraId)
Expand Down
17 changes: 12 additions & 5 deletions encoder/src/main/java/com/pedro/encoder/input/video/Camera2ResolutionCalculator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,29 @@ import androidx.annotation.RequiresApi
object Camera2ResolutionCalculator {

fun getOptimalResolution(actualResolution: Size, resolutionsSupported: Array<Size>): Size {
val resolutionsSupportedFiltered = resolutionsSupported.filter { isValidResolution(it) }
val resolution = if (actualResolution.width < actualResolution.height) Size(actualResolution.height, actualResolution.width) else actualResolution
return if (resolutionsSupported.find { it == resolution } != null) resolution
return if (resolutionsSupportedFiltered.find { it == resolution } != null) resolution
else {
val actualAspectRatio = resolution.width.toFloat() / resolution.height.toFloat()
val validResolutions = resolutionsSupported.filter { it.width.toFloat() / it.height.toFloat() == actualAspectRatio }
val validResolutions = resolutionsSupportedFiltered.filter { it.width.toFloat() / it.height.toFloat() == actualAspectRatio }
if (validResolutions.isNotEmpty()) {
val resolutions = validResolutions.toMutableList()
resolutions.add(resolution)
val resolutionsSorted = resolutions.sortedByDescending { it.height }
val index = resolutionsSorted.indexOf(resolution)
if (index > 0) {
return resolutionsSorted[index - 1]
} else return resolutionsSorted[index + 1]
return resolutionsSorted[if (index > 0) index - 1 else 0]
} else {
actualResolution
}
}
}

private fun isValidResolution(size: Size): Boolean {
if (Build.MODEL == "Pixel 8a" && Build.MANUFACTURER == "Google") {
//This resolution produce bad quality and should be removed. The closest resolution will be use
if (size.width == 1280 && size.height == 720) return false
}
return true
}
}