From 01d5238738887b1739cede0c6b589b8c4e34031d Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期二, 27 一月 2026 13:06:05 +0800
Subject: [PATCH] 1.usb可以录像，颜色不对
---
app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java
index d136622..9c1e67c 100644
--- a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java
+++ b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java
@@ -366,6 +366,20 @@
Timber.d("闊抽褰曞埗宸插惎鍔�");
}
+ // 涓诲姩妫�鏌ラ煶棰戠紪鐮佸櫒杈撳嚭鏍煎紡锛堝彲鑳藉湪澶勭悊鏁版嵁鍓嶅氨鏈夋牸寮忥級
+ try {
+ MediaFormat audioFormat = audioEncoder.getOutputFormat();
+ if (audioFormat != null) {
+ synchronized (UsbCameraRecordManager.this) {
+ audioTrackIndex = mediaMuxer.addTrack(audioFormat);
+ Timber.d("闊抽杞ㄩ亾宸叉坊鍔狅紙涓诲姩妫�鏌ワ級: %d", audioTrackIndex);
+ checkAndStartMuxer();
+ }
+ }
+ } catch (Exception e) {
+ Timber.d("闊抽缂栫爜鍣ㄨ緭鍑烘牸寮忓皻鏈噯澶囧ソ锛屽皢鍦ㄥ鐞嗘暟鎹椂娣诲姞");
+ }
+
// 鍚姩闊抽缂栫爜绾跨▼
audioThread = new AudioThread();
audioThread.start();
@@ -374,6 +388,8 @@
long frameCount = 0;
long lastFileChangeTime = System.currentTimeMillis();
+ long audioTrackWaitStartTime = System.currentTimeMillis();
+ final long AUDIO_TRACK_TIMEOUT_MS = 3000; // 3绉掕秴鏃�
// 寰幆澶勭悊鎽勫儚澶存暟鎹�
while (isRunning && cameraExists) {
@@ -432,6 +448,27 @@
if (videoEncoder != null && mediaMuxer != null) {
encodeFrame(buffer, frameCount, width, height);
frameCount++;
+
+ // 濡傛灉闊抽杞ㄩ亾瓒呮椂鏈噯澶囧ソ锛屽皾璇曚粎鐢ㄨ棰戣建閬撳惎鍔�
+ if (!muxerStarted && videoTrackIndex >= 0 && audioTrackIndex < 0) {
+ // 閲嶇敤寰幆涓凡瀹氫箟鐨� currentTime 鍙橀噺
+ if (currentTime - audioTrackWaitStartTime > AUDIO_TRACK_TIMEOUT_MS) {
+ Timber.w("闊抽杞ㄩ亾瓒呮椂鏈噯澶囧ソ锛屼粎浣跨敤瑙嗛杞ㄩ亾鍚姩Muxer");
+ synchronized (UsbCameraRecordManager.this) {
+ // 鍒涘缓涓�涓亣鐨勯煶棰戣建閬撶储寮曪紝鎴栬�呯洿鎺ュ惎鍔紙浣哅ediaMuxer瑕佹眰鑷冲皯涓�涓建閬擄級
+ // 瀹為檯涓奙ediaMuxer闇�瑕佽嚦灏戜竴涓建閬擄紝鎵�浠ュ鏋滆棰戣建閬撳噯澶囧ソ浜嗗氨鍙互鍚姩
+ if (videoTrackIndex >= 0) {
+ try {
+ mediaMuxer.start();
+ muxerStarted = true;
+ Timber.d("Muxer started with video track only: %d", videoTrackIndex);
+ } catch (Exception e) {
+ Timber.e(e, "Failed to start muxer with video only");
+ }
+ }
+ }
+ }
+ }
}
// 鎺у埗甯х巼锛岀害20fps
@@ -482,12 +519,17 @@
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
int outputBufferIndex = videoEncoder.dequeueOutputBuffer(bufferInfo, 0);
- while (outputBufferIndex >= 0) {
+ while (outputBufferIndex != MediaCodec.INFO_TRY_AGAIN_LATER) {
if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
// 杈撳嚭鏍煎紡鏀瑰彉锛屾坊鍔犺棰戣建閬�
MediaFormat newFormat = videoEncoder.getOutputFormat();
- videoTrackIndex = mediaMuxer.addTrack(newFormat);
- checkAndStartMuxer();
+ synchronized (UsbCameraRecordManager.this) {
+ videoTrackIndex = mediaMuxer.addTrack(newFormat);
+ Timber.d("瑙嗛杞ㄩ亾宸叉坊鍔�: %d", videoTrackIndex);
+ checkAndStartMuxer();
+ }
+ outputBufferIndex = videoEncoder.dequeueOutputBuffer(bufferInfo, 0);
+ continue;
} else if (outputBufferIndex >= 0) {
ByteBuffer outputBuffer = videoEncoder.getOutputBuffer(outputBufferIndex);
if (outputBuffer != null && muxerStarted && videoTrackIndex >= 0) {
@@ -512,9 +554,15 @@
*/
private synchronized void checkAndStartMuxer() {
if (!muxerStarted && videoTrackIndex >= 0 && audioTrackIndex >= 0) {
- mediaMuxer.start();
- muxerStarted = true;
+ try {
+ mediaMuxer.start();
+ muxerStarted = true;
Timber.d("Muxer started, video track: %d, audio track: %d", videoTrackIndex, audioTrackIndex);
+ } catch (Exception e) {
+ Timber.e(e, "Failed to start muxer");
+ }
+ } else {
+ Timber.d("Muxer not started yet, video track: %d, audio track: %d", videoTrackIndex, audioTrackIndex);
}
}
@@ -580,12 +628,17 @@
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
int outputBufferIndex = audioEncoder.dequeueOutputBuffer(bufferInfo, 0);
- while (outputBufferIndex >= 0) {
+ while (outputBufferIndex != MediaCodec.INFO_TRY_AGAIN_LATER) {
if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
// 杈撳嚭鏍煎紡鏀瑰彉锛屾坊鍔犻煶棰戣建閬�
MediaFormat newFormat = audioEncoder.getOutputFormat();
- audioTrackIndex = mediaMuxer.addTrack(newFormat);
- checkAndStartMuxer();
+ synchronized (UsbCameraRecordManager.this) {
+ audioTrackIndex = mediaMuxer.addTrack(newFormat);
+ Timber.d("闊抽杞ㄩ亾宸叉坊鍔�: %d", audioTrackIndex);
+ checkAndStartMuxer();
+ }
+ outputBufferIndex = audioEncoder.dequeueOutputBuffer(bufferInfo, 0);
+ continue;
} else if (outputBufferIndex >= 0) {
ByteBuffer outputBuffer = audioEncoder.getOutputBuffer(outputBufferIndex);
if (outputBuffer != null && muxerStarted && audioTrackIndex >= 0) {
--
Gitblit v1.8.0