From bfc959385fd59284fca3e417af217d02d80cb845 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期二, 23 十二月 2025 13:26:33 +0800
Subject: [PATCH] 1.h264文件写入tfcard 2.tfcard/h264/20251223/h264_时间戳.h264
---
app/src/main/java/com/anyun/h264/H264EncodeService.java | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/anyun/h264/H264EncodeService.java b/app/src/main/java/com/anyun/h264/H264EncodeService.java
index afa5257..63306ac 100644
--- a/app/src/main/java/com/anyun/h264/H264EncodeService.java
+++ b/app/src/main/java/com/anyun/h264/H264EncodeService.java
@@ -11,6 +11,7 @@
import com.anyun.h264.model.ResourceInfo;
import com.anyun.h264.model.WatermarkInfo;
+import com.anyun.h264.util.FileUtil;
import org.json.JSONException;
import org.json.JSONObject;
@@ -123,6 +124,7 @@
* 缂栫爜閰嶇疆绫�
*/
private static class EncodeConfig {
+ boolean useTFCard=true;//濡傛灉涓簍rue锛屽垯鍦╰fcard 鏍圭洰褰曞缓涓�涓猦264鏂囦欢澶癸紝鍦╤264鐩綍涓嬩互褰撳墠鏃ユ湡涓哄悕瀛楃殑鏂囦欢澶癸紙姣斿20250123锛夛紝鐒跺悗h264鏂囦欢灏卞啓鍏ヤ互褰撳墠鏃ュ墠涓哄悕瀛楃殑鐩綍涓�
boolean enableFileOutput; //鏄惁寮�鍚痟264鏂囦欢鍐欏叆
boolean enableNetworkTransmit; //寮�鍚痟264锛岀綉缁滃疄鏃舵帹娴�
String ip;
@@ -147,6 +149,7 @@
config.port = 0;
config.simPhone = null;
config.cameraId = 1; // 榛樿浣跨敤绗竴涓憚鍍忓ご
+ config.useTFCard = false; // 榛樿涓嶄娇鐢═F鍗�
return config;
}
@@ -159,6 +162,7 @@
config.ip = json.optString("ip", null);
config.port = json.optInt("port", 0);
config.simPhone = json.optString("simPhone", null);
+ config.useTFCard = json.optBoolean("useTFCard", false);
// 瑙ｆ瀽cameraId锛堝鏋滄湭鎸囧畾锛岄粯璁や负1锛�
if (json.has("cameraId")) {
@@ -396,6 +400,57 @@
}
/**
+ * 鑾峰彇杈撳嚭鏂囦欢鐩綍锛堟牴鎹畊seTFCard閰嶇疆锛�
+ * @param useTFCard 鏄惁浣跨敤TF鍗�
+ * @return 杈撳嚭鐩綍璺緞
+ */
+ private String getOutputFileDirectory(boolean useTFCard) {
+ if (useTFCard) {
+ // 浣跨敤TF鍗★細/sdcard/h264/褰撳墠鏃ユ湡/
+ try {
+ String storagePath = FileUtil.getStoragePath(this, true);
+ if (storagePath == null || storagePath.trim().isEmpty()) {
+ Timber.w("TF card storage path not available, fallback to app directory");
+ return outputFileDirectory;
+ }
+
+ File externalStorage = new File(storagePath);
+ if (!externalStorage.exists()) {
+ Timber.w("TF card storage directory does not exist: %s, fallback to app directory", storagePath);
+ return outputFileDirectory;
+ }
+
+ // 鑾峰彇褰撳墠鏃ユ湡锛堟牸寮忥細yyyyMMdd锛屽20250123锛�
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA);
+ String dateDir = dateFormat.format(new Date());
+
+ // 鏋勫缓璺緞锛�/sdcard/h264/20250123/
+ File h264Dir = new File(externalStorage, "h264");
+ File dateDirFile = new File(h264Dir, dateDir);
+
+ // 鍒涘缓鐩綍锛堝鏋滀笉瀛樺湪锛�
+ if (!dateDirFile.exists()) {
+ boolean created = dateDirFile.mkdirs();
+ if (!created && !dateDirFile.exists()) {
+ Timber.e("Failed to create TF card directory: %s, fallback to app directory", dateDirFile.getAbsolutePath());
+ return outputFileDirectory;
+ }
+ }
+
+ String tfCardPath = dateDirFile.getAbsolutePath();
+ Timber.d("Using TF card directory: %s", tfCardPath);
+ return tfCardPath;
+ } catch (Exception e) {
+ Timber.e(e, "Error getting TF card directory, fallback to app directory");
+ return outputFileDirectory;
+ }
+ } else {
+ // 浣跨敤搴旂敤澶栭儴瀛樺偍鐩綍
+ return outputFileDirectory;
+ }
+ }
+
+ /**
* 鍚姩缂栫爜锛堢粺涓�鏂规硶锛屾敮鎸佹枃浠跺啓鍏ュ拰缃戠粶浼犺緭鐨勭粍鍚堬級
* @param config 缂栫爜閰嶇疆
* @return 0-鎴愬姛锛�1-澶辫触
@@ -405,8 +460,8 @@
Timber.e("Encode config cannot be null");
return 1;
}
- Timber.d("Starting encode mode, fileOutput: %b, networkTransmit: %b",
- config.enableFileOutput, config.enableNetworkTransmit);
+ Timber.d("Starting encode mode, fileOutput: %b, networkTransmit: %b, useTFCard: %b",
+ config.enableFileOutput, config.enableNetworkTransmit, config.useTFCard);
// 濡傛灉缂栫爜鍣ㄥ凡缁忓湪杩愯锛屽彧鏇存柊閰嶇疆
if (h264Encoder != null) {
@@ -456,9 +511,12 @@
int framerate = config != null && config.framerate > 0 ? config.framerate : DEFAULT_FRAME_RATE;
h264Encoder.setEncoderParams(width, height, framerate, DEFAULT_BITRATE);
+ // 鑾峰彇杈撳嚭鏂囦欢鐩綍锛堟牴鎹畊seTFCard閰嶇疆锛�
+ String outputDir = getOutputFileDirectory(config.useTFCard);
+
// 璁剧疆杈撳嚭鏂囦欢鐩綍锛圚264Encoder浼氳嚜鍔ㄧ鐞嗘枃浠跺垱寤猴紝姣忓垎閽熶竴涓枃浠讹級
// 浣跨敤涓�涓复鏃舵枃浠跺悕鏉ヨ缃洰褰曪紝H264Encoder浼氬湪鍒濆鍖栨椂鍒涘缓绗竴涓枃浠�
- File tempFile = new File(outputFileDirectory, "temp.h264");
+ File tempFile = new File(outputDir, "temp.h264");
h264Encoder.setOutputFile(tempFile.getAbsolutePath());
h264Encoder.setEnableFileOutput(config.enableFileOutput);
--
Gitblit v1.8.0