bitRate 的数据类型采用 long

media/src/main/java/cn/reghao/jutil/media/FFmpegWrapper.java

@@ -36,11 +36,11 @@ public class FFmpegWrapper {
                     String codecTagString = jsonObject1.get("codec_tag_string").getAsString();
 
                     JsonElement bitRateElement = jsonObject1.get("bit_rate");
-                    double bitRate;
+                    long bitRate;
                     if (bitRateElement == null) {
-                        bitRate = 0.0;
+                        bitRate = 0L;
                     } else {
-                        bitRate = bitRateElement.getAsDouble();
+                        bitRate = bitRateElement.getAsLong();
                     }
 
                     JsonElement durationElement = jsonObject1.get("duration");
@@ -55,12 +55,12 @@ public class FFmpegWrapper {
                     String codecName = jsonObject1.get("codec_name").getAsString();
                     String codecTagString = jsonObject1.get("codec_tag_string").getAsString();
 
-                    double bitRate;
+                    long bitRate;
                     JsonElement biteRateElement = jsonObject1.get("bit_rate");
                     if (biteRateElement == null) {
                         bitRate = 0;
                     } else {
-                        bitRate = biteRateElement.getAsDouble();
+                        bitRate = biteRateElement.getAsLong();
                     }
 
                     double duration;
@@ -86,8 +86,10 @@ public class FFmpegWrapper {
 
                 Long size = format.get("size").getAsLong();
                 if (format.get("bit_rate") != null) {
-                    Double bitRate = format.get("bit_rate").getAsDouble();
-                    videoProps.setBitRate(bitRate);
+                    long bitRate = format.get("bit_rate").getAsLong();
+                    if (videoProps.getBitRate() == 0) {
+                        videoProps.setBitRate(bitRate);
+                    }
                 }
             }
 

media/src/main/java/cn/reghao/jutil/media/model/AudioProps.java

@@ -7,10 +7,10 @@ package cn.reghao.jutil.media.model;
 public class AudioProps {
     private String codecName;
     private String codecTagString;
-    private double bitRate;
+    private long bitRate;
     private double duration;
 
-    public AudioProps(String codecName, String codecTagString, double bitRate, double duration) {
+    public AudioProps(String codecName, String codecTagString, long bitRate, double duration) {
         this.codecName = codecName;
         this.codecTagString = codecTagString;
         this.bitRate = bitRate;
@@ -33,11 +33,11 @@ public class AudioProps {
         return codecTagString;
     }
 
-    public void setBitRate(double bitRate) {
+    public void setBitRate(long bitRate) {
         this.bitRate = bitRate;
     }
 
-    public double getBitRate() {
+    public long getBitRate() {
         return bitRate;
     }
 

media/src/main/java/cn/reghao/jutil/media/model/VideoProps.java

@@ -7,12 +7,12 @@ package cn.reghao.jutil.media.model;
 public class VideoProps {
     private String codecName;
     private String codecTagString;
-    private Double bitRate;
-    private Double duration;
-    private Double codedWidth;
-    private Double codedHeight;
+    private long bitRate;
+    private double duration;
+    private double codedWidth;
+    private double codedHeight;
 
-    public VideoProps(String codecName, String codecTagString, double bitRate, double duration, double codedWidth, double codedHeight) {
+    public VideoProps(String codecName, String codecTagString, long bitRate, double duration, double codedWidth, double codedHeight) {
         this.codecName = codecName;
         this.codecTagString = codecTagString;
         this.bitRate = bitRate;
@@ -29,11 +29,11 @@ public class VideoProps {
         return codecTagString;
     }
 
-    public void setBitRate(Double bitRate) {
+    public void setBitRate(long bitRate) {
         this.bitRate = bitRate;
     }
 
-    public Double getBitRate() {
+    public long getBitRate() {
         return bitRate;
     }