feat: 默认h264

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/CommonArg.java

@@ -25,7 +25,7 @@ public class CommonArg {
 
     public String mp4editCmd = "mp4edit"; // bento4 mp4edit 命令地址
 
-    public boolean enableH265 = true; // 是否开启h265
+    public boolean enableH265 = false; // 是否开启h265
 
     public int fps = 24;
 

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/Main.java

@@ -62,11 +62,11 @@ public class Main {
         commonArg.mp4editCmd = "mp4edit";
 
         /*
-         * 是否开启h265（默认开启）
+         * 是否开启h265
          * 优点：压缩率更高，视频更清晰
          * 缺点：Android 4.x系统 & 极少部分低端机 无法播放265视频
          */
-        commonArg.enableH265 = true;
+        commonArg.enableH265 = false;
         // fps
         commonArg.fps = 24;
         // 素材文件路径
@@ -93,7 +93,7 @@ public class Main {
 
         String path = "/path/to/your/demo";
 
-        commonArg.enableH265 = true;
+        commonArg.enableH265 = false;
         // fps
         commonArg.fps = 24;
         // 素材文件路径

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/ui/ToolUI.java

@@ -45,8 +45,8 @@ public class ToolUI {
 
     private final JFrame frame = new JFrame("VAP tool");
     private final ButtonGroup group = new ButtonGroup();
-    private final JRadioButton btnH265 = new JRadioButton("h265");
     private final JRadioButton btnH264 = new JRadioButton("h264");
+    private final JRadioButton btnH265 = new JRadioButton("h265");
     private final SpinnerModel modelFps = new SpinnerNumberModel(24, 1, 60, 1);
     private final Float[] scaleArray = new Float[]{0.5f, 1f};
     private final JComboBox<Float> boxScale = new JComboBox<>(scaleArray);
@@ -245,11 +245,11 @@ public class ToolUI {
 
         JPanel panelRadio = new JPanel();
         panelRadio.setLayout(new GridLayout(1, 2));
-        panelRadio.add(btnH265);
         panelRadio.add(btnH264);
-        group.add(btnH265);
+        panelRadio.add(btnH265);
         group.add(btnH264);
-        group.setSelected(btnH265.getModel(), true);
+        group.add(btnH265);
+        group.setSelected(btnH264.getModel(), true);
         panel.add(panelRadio);
 
         return panel;
@@ -438,7 +438,7 @@ public class ToolUI {
         CommonArg commonArg = new CommonArg();
         try {
             String version = props.getProperty("version", "0");
-            String enableH265 = props.getProperty("enableH265", Boolean.TRUE.toString());
+            String enableH265 = props.getProperty("enableH265", Boolean.toString(commonArg.enableH265));
             String fps = props.getProperty("fps", String.valueOf(commonArg.fps));
             String inputPath = props.getProperty("inputPath", "");
             String scale = props.getProperty("scale", String.valueOf(scaleArray[0]));

tool/README.md

@@ -37,10 +37,12 @@ chmod +x mac_start.sh
 
 ![](images/vaptool_java_01.png)
 
-* codec: 编码类型(默认h265)
-	* h265: 优点：压缩率更高，画面更清晰；缺点：Android 4.x 版本无法播放，部分低端机器兼容性差
-	* h264: 优点：兼容性好，几乎所有机器都能播放；缺点：压缩率没有h265高
+* codec: 编码类型(默认h264)
+ 	* h264: **优点**：兼容性好，几乎所有机器都能播放；**缺点**：压缩率没有h265高
+	* h265: **优点**：压缩率更高，画面更清晰；**缺点**：Android 4.x 版本无法播放，部分低端机器兼容性差; Web端浏览器可能不支持h265
+
 * fps: 每秒播放多少帧
+* alpha scale: 视频alpha区域是否缩放(默认缩放0.5)，目前可选: 缩放0.5;不缩放1. 缩放视频能最终减小视频分辨率，提高兼容性
 * frames path: 视频帧存放的位置
 	* 视频帧命名方法 **000.png 001.png ... 099.png**。第一帧一定是**000.png**不然无法正常生成，可以参考"simple_demo"
 * audio: 需要集成到视频里的声音文件(目前支持mp3文件)