Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
xuning
/
livekitAndroidXuningTest
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
davidliu
2022-02-14 23:49:13 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
23bb25680d02c84c2c26d61fe8f4f85f74a4d31a
23bb2568
1 parent
abc5727e
Potential fix for camera1 crash when getting dimensions after capture has started
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
14 行增加
和
2 行删除
livekit-android-sdk/src/main/java/io/livekit/android/room/track/LocalVideoTrack.kt
livekit-android-sdk/src/main/java/org/webrtc/Camera1Helper.kt
livekit-android-sdk/src/main/java/org/webrtc/Camera2Helper.kt
livekit-android-sdk/src/main/java/io/livekit/android/room/track/LocalVideoTrack.kt
查看文件 @
23bb256
...
...
@@ -209,6 +209,8 @@ constructor(
position = enumerator.getCameraPosition(targetDeviceName!!)
)
if (targetVideoCapturer is Camera1Capturer) {
// Cache supported capture formats ahead of time to avoid future camera locks.
Camera1Helper.getSupportedFormats(Camera1Helper.getCameraId(newOptions.deviceId))
return Pair(
Camera1CapturerWithSize(targetVideoCapturer, targetDeviceName),
newOptions
...
...
livekit-android-sdk/src/main/java/org/webrtc/Camera1Helper.kt
查看文件 @
23bb256
...
...
@@ -10,13 +10,16 @@ internal class Camera1Helper {
companion object {
fun getCameraId(deviceName: String?) = Camera1Enumerator.getCameraIndex(deviceName)
fun getSupportedFormats(cameraId: Int): List<CameraEnumerationAndroid.CaptureFormat> =
Camera1Enumerator.getSupportedFormats(cameraId)
fun findClosestCaptureFormat(
cameraId: Int,
width: Int,
height: Int
): Size {
return CameraEnumerationAndroid.getClosestSupportedSize(
Camera1Enumerator.
getSupportedFormats(cameraId)
getSupportedFormats(cameraId)
.map { Size(it.width, it.height) },
width,
height
...
...
livekit-android-sdk/src/main/java/org/webrtc/Camera2Helper.kt
查看文件 @
23bb256
...
...
@@ -11,13 +11,20 @@ import android.hardware.camera2.CameraManager
*/
internal class Camera2Helper {
companion object {
fun getSupportedFormats(
cameraManager: CameraManager,
cameraId: String?,
): List<CameraEnumerationAndroid.CaptureFormat>? =
Camera2Enumerator.getSupportedFormats(cameraManager, cameraId)
fun findClosestCaptureFormat(
cameraManager: CameraManager,
cameraId: String?,
width: Int,
height: Int
): Size {
val sizes =
Camera2Enumerator.
getSupportedFormats(cameraManager, cameraId)
val sizes = getSupportedFormats(cameraManager, cameraId)
?.map { Size(it.width, it.height) }
?: emptyList()
return CameraEnumerationAndroid.getClosestSupportedSize(sizes, width, height)
...
...
请
注册
或
登录
后发表评论