io.appium.settings: recording: clamp frame rate also to make recording more solid

Signed-off-by: sirmordred <[email protected]>

Author: sirmordred

app/src/main/java/io/appium/settings/recorder/RecorderConstant.java

@@ -49,7 +49,7 @@ public class RecorderConstant {
     public static final int AUDIO_CODEC_REPEAT_PREV_FRAME_AFTER_MS = 1000000;
     public static final int AUDIO_CODEC_I_FRAME_INTERVAL_MS = 5;
     public static final int AUDIO_CODEC_DEFAULT_BITRATE = 64000;
-    public static final int VIDEO_CODEC_FRAME_RATE = 30;
+    public static final int VIDEO_CODEC_DEFAULT_FRAME_RATE = 30;
     public static final long MEDIA_QUEUE_BUFFERING_DEFAULT_TIMEOUT_MS = 10000;
     public static final long NANOSECONDS_IN_MICROSECOND = 1000;
     public static final String NO_PATH_SET = "";

app/src/main/java/io/appium/settings/recorder/RecorderThread.java

@@ -43,6 +43,7 @@
 import static io.appium.settings.recorder.RecorderConstant.NO_TIMESTAMP_SET;
 import static io.appium.settings.recorder.RecorderConstant.NO_TRACK_INDEX_SET;
 import static io.appium.settings.recorder.RecorderConstant.RECORDING_DEFAULT_VIDEO_MIME_TYPE;
+import static io.appium.settings.recorder.RecorderConstant.VIDEO_CODEC_DEFAULT_FRAME_RATE;
 
 public class RecorderThread implements Runnable {
 
@@ -115,14 +116,14 @@ public boolean isRecordingRunning() {
 
     @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     private MediaFormat initVideoEncoderFormat(String videoMime, int videoWidth,
-                                                int videoHeight, int videoBitrate) {
+                                               int videoHeight, int videoBitrate,
+                                               int videoFrameRate) {
         MediaFormat encoderFormat = MediaFormat.createVideoFormat(videoMime, videoWidth,
                 videoHeight);
         encoderFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT,
                 MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
         encoderFormat.setInteger(MediaFormat.KEY_BIT_RATE, videoBitrate);
-        encoderFormat.setInteger(MediaFormat.KEY_FRAME_RATE,
-                RecorderConstant.VIDEO_CODEC_FRAME_RATE);
+        encoderFormat.setInteger(MediaFormat.KEY_FRAME_RATE, videoFrameRate);
         encoderFormat.setInteger(MediaFormat.KEY_REPEAT_PREVIOUS_FRAME_AFTER,
                 RecorderConstant.AUDIO_CODEC_REPEAT_PREV_FRAME_AFTER_MS);
         encoderFormat.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL,
@@ -240,9 +241,9 @@ private long getPresentationTimeUs() {
                         - startTimestampUs);
     }
 
-    private int calculateBitRate(int width, int height) {
+    private int calculateBitRate(int width, int height, int frameRate) {
         final int bitrate = (int) (RecorderConstant.BITRATE_MULTIPLIER *
-                RecorderConstant.VIDEO_CODEC_FRAME_RATE * width * height);
+                frameRate * width * height);
         Log.i(TAG, String.format("Recording starting with bitrate=%5.2f[Mbps]",
                 bitrate / 1024f / 1024f));
         return bitrate;
@@ -354,12 +355,15 @@ public void run() {
                     .getCodecInfo().getCapabilitiesForType(RECORDING_DEFAULT_VIDEO_MIME_TYPE)
                     .getVideoCapabilities();
 
+            int videoFrameRate = Math.min(VIDEO_CODEC_DEFAULT_FRAME_RATE,
+                    videoEncoderCapabilities.getSupportedFrameRates().getUpper());
+
             int videoBitrate = videoEncoderCapabilities.getBitrateRange()
-                    .clamp(calculateBitRate(this.videoWidth, this.videoHeight));
+                    .clamp(calculateBitRate(this.videoWidth, this.videoHeight, videoFrameRate));
 
             MediaFormat videoEncoderFormat =
                     initVideoEncoderFormat(RECORDING_DEFAULT_VIDEO_MIME_TYPE,
-                            this.videoWidth, this.videoHeight, videoBitrate);
+                            this.videoWidth, this.videoHeight, videoBitrate, videoFrameRate);
 
             videoEncoder.configure(videoEncoderFormat, null, null,
                     MediaCodec.CONFIGURE_FLAG_ENCODE);