From faf9ab5bc6f172819dd5c0cd6dcc0ebb82391c1e Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期一, 01 十二月 2025 16:39:55 +0800
Subject: [PATCH] 1.push h264 分辨率写死640 480 帧率25

---
 app/src/main/java/com/anyun/h264/H264EncodeService.java   |    6 +-
 app/src/main/java/com/anyun/h264/model/WatermarkInfo.java |  140 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 143 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 9c535de..206c34e 100644
--- a/app/src/main/java/com/anyun/h264/H264EncodeService.java
+++ b/app/src/main/java/com/anyun/h264/H264EncodeService.java
@@ -313,9 +313,9 @@
 
 
             // 璁剧疆缂栫爜鍙傛暟锛堜娇鐢ㄩ厤缃腑鐨勫弬鏁帮級
-            int width = config != null ? config.width : DEFAULT_WIDTH;
-            int height = config != null ? config.height : DEFAULT_HEIGHT;
-            int framerate = config != null ? config.framerate : DEFAULT_FRAME_RATE;
+            int width =  DEFAULT_WIDTH;
+            int height =  DEFAULT_HEIGHT;
+            int framerate = DEFAULT_FRAME_RATE;
             h264Encoder.setEncoderParams(width, height, framerate, DEFAULT_BITRATE);
             
             // 绂佺敤鏂囦欢杈撳嚭
diff --git a/app/src/main/java/com/anyun/h264/model/WatermarkInfo.java b/app/src/main/java/com/anyun/h264/model/WatermarkInfo.java
new file mode 100644
index 0000000..0b7acc6
--- /dev/null
+++ b/app/src/main/java/com/anyun/h264/model/WatermarkInfo.java
@@ -0,0 +1,140 @@
+package com.anyun.h264.model;
+
+/**
+ * 姘村嵃淇℃伅鏁版嵁妯″瀷
+ * 鍖呭惈杞︾墝銆佸鍛樸�佹暀缁冦�佺粡搴︺�佺含搴︺�侀┚鏍°�佽溅閫熺瓑淇℃伅
+ */
+public class WatermarkInfo {
+    /** 杞︾墝鍙� */
+    private String plateNumber;
+    
+    /** 瀛﹀憳濮撳悕 */
+    private String student;
+    
+    /** 鏁欑粌濮撳悕 */
+    private String coach;
+    
+    /** 缁忓害 */
+    private Double longitude;
+    
+    /** 绾害 */
+    private Double latitude;
+    
+    /** 椹炬牎鍚嶇О */
+    private String drivingSchool;
+    
+    /** 杞﹂�燂紙鍗曚綅锛歬m/h锛� */
+    private Double speed;
+
+    public WatermarkInfo() {
+    }
+
+    public String getPlateNumber() {
+        return plateNumber;
+    }
+
+    public void setPlateNumber(String plateNumber) {
+        this.plateNumber = plateNumber;
+    }
+
+    public String getStudent() {
+        return student;
+    }
+
+    public void setStudent(String student) {
+        this.student = student;
+    }
+
+    public String getCoach() {
+        return coach;
+    }
+
+    public void setCoach(String coach) {
+        this.coach = coach;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getDrivingSchool() {
+        return drivingSchool;
+    }
+
+    public void setDrivingSchool(String drivingSchool) {
+        this.drivingSchool = drivingSchool;
+    }
+
+    public Double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    /**
+     * 鏍煎紡鍖栨按鍗颁俊鎭负鏄剧ず鏂囨湰
+     * @return 鏍煎紡鍖栫殑姘村嵃鏂囨湰
+     */
+    public String formatWatermarkText() {
+        StringBuilder sb = new StringBuilder();
+        
+        if (plateNumber != null && !plateNumber.isEmpty()) {
+            sb.append("杞︾墝:").append(plateNumber);
+        }
+        
+        if (student != null && !student.isEmpty()) {
+            if (sb.length() > 0) sb.append(" ");
+            sb.append("瀛﹀憳:").append(student);
+        }
+        
+        if (coach != null && !coach.isEmpty()) {
+            if (sb.length() > 0) sb.append(" ");
+            sb.append("鏁欑粌:").append(coach);
+        }
+        
+        if (longitude != null && latitude != null) {
+            if (sb.length() > 0) sb.append(" ");
+            sb.append("浣嶇疆:").append(String.format("%.6f,%.6f", latitude, longitude));
+        }
+        
+        if (drivingSchool != null && !drivingSchool.isEmpty()) {
+            if (sb.length() > 0) sb.append(" ");
+            sb.append("椹炬牎:").append(drivingSchool);
+        }
+        
+        if (speed != null) {
+            if (sb.length() > 0) sb.append(" ");
+            sb.append("杞﹂��:").append(String.format("%.1f", speed)).append("km/h");
+        }
+        
+        return sb.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "WatermarkInfo{" +
+                "plateNumber='" + plateNumber + '\'' +
+                ", student='" + student + '\'' +
+                ", coach='" + coach + '\'' +
+                ", longitude=" + longitude +
+                ", latitude=" + latitude +
+                ", drivingSchool='" + drivingSchool + '\'' +
+                ", speed=" + speed +
+                '}';
+    }
+}
+

--
Gitblit v1.8.0