From aa72a843107efd378fa5598c5967efc0abd9357f Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期三, 03 十二月 2025 17:09:32 +0800
Subject: [PATCH] 1.修改摄像头id
---
app/src/main/java/com/anyun/h264/H264EncodeService.java | 10 ++--------
app/src/main/java/com/anyun/h264/H264Encoder.java | 1 +
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/anyun/h264/H264EncodeService.java b/app/src/main/java/com/anyun/h264/H264EncodeService.java
index bbdb554..27327e0 100644
--- a/app/src/main/java/com/anyun/h264/H264EncodeService.java
+++ b/app/src/main/java/com/anyun/h264/H264EncodeService.java
@@ -407,10 +407,7 @@
// 鍒濆鍖栧苟鍚姩锛堜娇鐢ㄩ厤缃腑鐨勫垎杈ㄧ巼锛�
// 鏍规嵁cameraId閫夋嫨鎽勫儚澶磋寖鍥�
int[] cameraIdRange = DEFAULT_CAMERA_ID_RANGE;
- if (config != null && config.cameraId != null) {
- // 濡傛灉鎸囧畾浜哻ameraId锛屼娇鐢ㄥ搴旂殑鎽勫儚澶�
- cameraIdRange = new int[]{config.cameraId, config.cameraId};
- }
+
int[] resolution = {width, height};
if (h264Encoder.initialize(cameraIdRange, null, resolution, false)) {
// 搴旂敤宸蹭繚瀛樼殑姘村嵃淇℃伅锛堝鏋滄湁锛�
@@ -481,10 +478,7 @@
// 鍒濆鍖栧苟鍚姩锛堜娇鐢ㄩ厤缃腑鐨勫垎杈ㄧ巼锛�
// 鏍规嵁cameraId閫夋嫨鎽勫儚澶磋寖鍥�
int[] cameraIdRange = DEFAULT_CAMERA_ID_RANGE;
- if (config != null && config.cameraId != null) {
- // 濡傛灉鎸囧畾浜哻ameraId锛屼娇鐢ㄥ搴旂殑鎽勫儚澶�
- cameraIdRange = new int[]{config.cameraId, config.cameraId};
- }
+
int[] resolution = {width, height};
if (h264Encoder.initialize(cameraIdRange, null, resolution, false)) {
// 搴旂敤宸蹭繚瀛樼殑姘村嵃淇℃伅锛堝鏋滄湁锛�
diff --git a/app/src/main/java/com/anyun/h264/H264Encoder.java b/app/src/main/java/com/anyun/h264/H264Encoder.java
index 884fe28..7c187ad 100644
--- a/app/src/main/java/com/anyun/h264/H264Encoder.java
+++ b/app/src/main/java/com/anyun/h264/H264Encoder.java
@@ -286,6 +286,7 @@
}
break;
} else {
+ usbCamera.stopCamera();
// 澶辫触锛岃褰曟棩蹇�
Timber.w( "prepareCamera failed on attempt " + (attempt + 1) + ": " + result);
if (attempt < maxRetries - 1) {
--
Gitblit v1.8.0