Browse Source

fix: #178, AnimTool生成视频调用ffmpeg命令指定帧率选项改为 -framerate

akanchi 4 years ago
parent
commit
187b088dd4

+ 4 - 4
Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/AnimTool.java

@@ -320,7 +320,7 @@ public class AnimTool {
         String[] cmd;
         String[] cmd;
         if (commonArg.enableH265) {
         if (commonArg.enableH265) {
             if (commonArg.enableCrf) {
             if (commonArg.enableCrf) {
-                cmd = new String[] {commonArg.ffmpegCmd, "-r", String.valueOf(commonArg.fps),
+                cmd = new String[] {commonArg.ffmpegCmd, "-framerate", String.valueOf(commonArg.fps),
                         "-i", frameImagePath + "%03d.png",
                         "-i", frameImagePath + "%03d.png",
                         "-pix_fmt", "yuv420p",
                         "-pix_fmt", "yuv420p",
                         "-vcodec", "libx265",
                         "-vcodec", "libx265",
@@ -331,7 +331,7 @@ public class AnimTool {
                         "-bufsize", "2000k",
                         "-bufsize", "2000k",
                         "-y", videoPath + TEMP_VIDEO_FILE};
                         "-y", videoPath + TEMP_VIDEO_FILE};
             } else {
             } else {
-                cmd = new String[] {commonArg.ffmpegCmd, "-r", String.valueOf(commonArg.fps),
+                cmd = new String[] {commonArg.ffmpegCmd, "-framerate", String.valueOf(commonArg.fps),
                         "-i", frameImagePath + "%03d.png",
                         "-i", frameImagePath + "%03d.png",
                         "-pix_fmt", "yuv420p",
                         "-pix_fmt", "yuv420p",
                         "-vcodec", "libx265",
                         "-vcodec", "libx265",
@@ -345,7 +345,7 @@ public class AnimTool {
 
 
         } else {
         } else {
             if (commonArg.enableCrf) {
             if (commonArg.enableCrf) {
-                cmd = new String[]{commonArg.ffmpegCmd, "-r", String.valueOf(commonArg.fps),
+                cmd = new String[]{commonArg.ffmpegCmd, "-framerate", String.valueOf(commonArg.fps),
                         "-i", frameImagePath + "%03d.png",
                         "-i", frameImagePath + "%03d.png",
                         "-pix_fmt", "yuv420p",
                         "-pix_fmt", "yuv420p",
                         "-vcodec", "libx264",
                         "-vcodec", "libx264",
@@ -356,7 +356,7 @@ public class AnimTool {
                         "-bufsize", "2000k",
                         "-bufsize", "2000k",
                         "-y", videoPath + TEMP_VIDEO_FILE};
                         "-y", videoPath + TEMP_VIDEO_FILE};
             } else {
             } else {
-                cmd = new String[]{commonArg.ffmpegCmd, "-r", String.valueOf(commonArg.fps),
+                cmd = new String[]{commonArg.ffmpegCmd, "-framerate", String.valueOf(commonArg.fps),
                         "-i", frameImagePath + "%03d.png",
                         "-i", frameImagePath + "%03d.png",
                         "-pix_fmt", "yuv420p",
                         "-pix_fmt", "yuv420p",
                         "-vcodec", "libx264",
                         "-vcodec", "libx264",