io.appium.settings: recording: Cosmetical naming and log updates

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

Author: sirmordred

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

@@ -72,4 +72,6 @@ public class RecorderConstant {
                     Pair.create(320, 240),
                     Pair.create(176, 144)
                     );
+    // 1048576 Bps == 1 Mbps (1024*1024)
+    public static final float BPS_IN_MBPS = 1048576f;
 }

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

@@ -89,15 +89,15 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
                     (MediaProjectionManager) getSystemService(Context.MEDIA_PROJECTION_SERVICE);
 
             if (mMediaProjectionManager != null) {
-                startScreenRecord(mMediaProjectionManager, intent);
+                startRecord(mMediaProjectionManager, intent);
             } else {
                 Log.e(TAG, "onStartCommand: " +
                         "Unable to retrieve MediaProjectionManager instance");
                 result = START_NOT_STICKY;
             }
         } else if (ACTION_RECORDING_STOP.equals(action)) {
             Log.v(TAG, "onStartCommand: Received recording stop intent, stopping recording");
-            stopScreenRecord();
+            stopRecord();
             result = START_NOT_STICKY;
         } else {
             Log.v(TAG, "onStartCommand: Received unknown recording intent with action: "
@@ -109,10 +109,10 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
     }
 
     /**
-     * start screen recording
+     * start recording
      */
     @RequiresApi(api = Build.VERSION_CODES.Q)
-    private void startScreenRecord(MediaProjectionManager mediaProjectionManager,
+    private void startRecord(MediaProjectionManager mediaProjectionManager,
                                    final Intent intent) {
         if (recorderThread != null) {
             if (recorderThread.isRecordingRunning()) {
@@ -186,9 +186,9 @@ but if phone or tablet is in portrait mode (usually it is),
     }
 
     /**
-     * stop screen recording
+     * stop recording
      */
-    private void stopScreenRecord() {
+    private void stopRecord() {
         if (recorderThread != null) {
             recorderThread.stopRecording();
             recorderThread = null;

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

@@ -39,6 +39,7 @@
 
 import androidx.annotation.RequiresApi;
 
+import static io.appium.settings.recorder.RecorderConstant.BPS_IN_MBPS;
 import static io.appium.settings.recorder.RecorderConstant.NANOSECONDS_IN_MICROSECOND;
 import static io.appium.settings.recorder.RecorderConstant.NO_TIMESTAMP_SET;
 import static io.appium.settings.recorder.RecorderConstant.NO_TRACK_INDEX_SET;
@@ -143,7 +144,7 @@ private VirtualDisplay initVirtualDisplay(MediaProjection mediaProjection,
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private MediaCodec initAudioCodec(int sampleRate) throws IOException {
-        // Encoded video resolution matches virtual display. TODO set channelCount 2 try stereo quality
+        // TODO set channelCount 2 try stereo quality
         MediaFormat encoderFormat = MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC,
                 sampleRate, RecorderConstant.AUDIO_CODEC_CHANNEL_COUNT);
         encoderFormat.setInteger(MediaFormat.KEY_BIT_RATE,
@@ -242,11 +243,8 @@ private long getPresentationTimeUs() {
     }
 
     private int calculateBitRate(int width, int height, int frameRate) {
-        final int bitrate = (int) (RecorderConstant.BITRATE_MULTIPLIER *
+        return (int) (RecorderConstant.BITRATE_MULTIPLIER *
                 frameRate * width * height);
-        Log.i(TAG, String.format("Recording starting with bitrate=%5.2f[Mbps]",
-                bitrate / 1024f / 1024f));
-        return bitrate;
     }
 
     private void startMuxerIfSetUp(MediaMuxer muxer) {
@@ -361,6 +359,10 @@ public void run() {
             int videoBitrate = videoEncoderCapabilities.getBitrateRange()
                     .clamp(calculateBitRate(this.videoWidth, this.videoHeight, videoFrameRate));
 
+            Log.i(TAG, String.format("Recording starting with frame rate = %d FPS " +
+                            "and bitrate = %5.2f Mbps",
+                    videoFrameRate, videoBitrate / BPS_IN_MBPS));
+
             MediaFormat videoEncoderFormat =
                     initVideoEncoderFormat(RECORDING_DEFAULT_VIDEO_MIME_TYPE,
                             this.videoWidth, this.videoHeight, videoBitrate, videoFrameRate);