Merge pull request #242 from GetStream/patches/125.3

Fix for m125.3

Author: skydoves

stream-webrtc-android/api/stream-webrtc-android.api

@@ -2199,6 +2199,7 @@ public class org/webrtc/audio/JavaAudioDeviceModule$Builder {
 	public fun createAudioDeviceModule ()Lorg/webrtc/audio/JavaAudioDeviceModule;
 	public fun setAudioAttributes (Landroid/media/AudioAttributes;)Lorg/webrtc/audio/JavaAudioDeviceModule$Builder;
 	public fun setAudioFormat (I)Lorg/webrtc/audio/JavaAudioDeviceModule$Builder;
+	public fun setAudioRecordDataCallback (Lorg/webrtc/audio/AudioRecordDataCallback;)Lorg/webrtc/audio/JavaAudioDeviceModule$Builder;
 	public fun setAudioRecordErrorCallback (Lorg/webrtc/audio/JavaAudioDeviceModule$AudioRecordErrorCallback;)Lorg/webrtc/audio/JavaAudioDeviceModule$Builder;
 	public fun setAudioRecordStateCallback (Lorg/webrtc/audio/JavaAudioDeviceModule$AudioRecordStateCallback;)Lorg/webrtc/audio/JavaAudioDeviceModule$Builder;
 	public fun setAudioSource (I)Lorg/webrtc/audio/JavaAudioDeviceModule$Builder;

stream-webrtc-android/src/main/java/org/webrtc/SoftwareVideoDecoderFactory.java

@@ -50,4 +50,4 @@ public VideoCodecInfo[] getSupportedCodecs() {
   private static native long nativeCreateDecoder(long factory, VideoCodecInfo videoCodecInfo);
 
   private static native List<VideoCodecInfo> nativeGetSupportedCodecs(long factory);
-}
+}

stream-webrtc-android/src/main/java/org/webrtc/voiceengine/WebRtcAudioRecord.java

@@ -170,7 +170,7 @@ public void run() {
             // at index 0.
             byte[] data = Arrays.copyOf(byteBuffer.array(), byteBuffer.capacity());
             audioSamplesReadyCallback.onWebRtcAudioRecordSamplesReady(
-                new AudioSamples(audioRecord, data));
+              new AudioSamples(audioRecord, data));
           }
         } else {
           String errorMessage = "AudioRecord.read failed: " + bytesRead;
@@ -253,7 +253,7 @@ private int initRecording(int sampleRate, int channels) {
     // Note that this size doesn't guarantee a smooth recording under load.
     final int channelConfig = channelCountToConfiguration(channels);
     int minBufferSize =
-        AudioRecord.getMinBufferSize(sampleRate, channelConfig, AudioFormat.ENCODING_PCM_16BIT);
+      AudioRecord.getMinBufferSize(sampleRate, channelConfig, AudioFormat.ENCODING_PCM_16BIT);
     if (minBufferSize == AudioRecord.ERROR || minBufferSize == AudioRecord.ERROR_BAD_VALUE) {
       reportWebRtcAudioRecordInitError("AudioRecord.getMinBufferSize failed: " + minBufferSize);
       return -1;
@@ -267,7 +267,7 @@ private int initRecording(int sampleRate, int channels) {
     Logging.d(TAG, "bufferSizeInBytes: " + bufferSizeInBytes);
     try {
       audioRecord = new AudioRecord(audioSource, sampleRate, channelConfig,
-          AudioFormat.ENCODING_PCM_16BIT, bufferSizeInBytes);
+        AudioFormat.ENCODING_PCM_16BIT, bufferSizeInBytes);
     } catch (IllegalArgumentException e) {
       reportWebRtcAudioRecordInitError("AudioRecord ctor error: " + e.getMessage());
       releaseAudioResources();
@@ -294,13 +294,13 @@ private boolean startRecording() {
       audioRecord.startRecording();
     } catch (IllegalStateException e) {
       reportWebRtcAudioRecordStartError(AudioRecordStartErrorCode.AUDIO_RECORD_START_EXCEPTION,
-          "AudioRecord.startRecording failed: " + e.getMessage());
+        "AudioRecord.startRecording failed: " + e.getMessage());
       return false;
     }
     if (audioRecord.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING) {
       reportWebRtcAudioRecordStartError(
-          AudioRecordStartErrorCode.AUDIO_RECORD_START_STATE_MISMATCH,
-          "AudioRecord.startRecording failed - incorrect state :"
+        AudioRecordStartErrorCode.AUDIO_RECORD_START_STATE_MISMATCH,
+        "AudioRecord.startRecording failed - incorrect state :"
           + audioRecord.getRecordingState());
       return false;
     }
@@ -327,16 +327,16 @@ private boolean stopRecording() {
 
   private void logMainParameters() {
     Logging.d(TAG, "AudioRecord: "
-            + "session ID: " + audioRecord.getAudioSessionId() + ", "
-            + "channels: " + audioRecord.getChannelCount() + ", "
-            + "sample rate: " + audioRecord.getSampleRate());
+      + "session ID: " + audioRecord.getAudioSessionId() + ", "
+      + "channels: " + audioRecord.getChannelCount() + ", "
+      + "sample rate: " + audioRecord.getSampleRate());
   }
 
   private void logMainParametersExtended() {
     if (Build.VERSION.SDK_INT >= 23) {
       Logging.d(TAG, "AudioRecord: "
-              // The frame count of the native AudioRecord buffer.
-              + "buffer size in frames: " + audioRecord.getBufferSizeInFrames());
+        // The frame count of the native AudioRecord buffer.
+        + "buffer size in frames: " + audioRecord.getBufferSizeInFrames());
     }
   }
 
@@ -358,7 +358,7 @@ private int channelCountToConfiguration(int channels) {
   @SuppressWarnings("NoSynchronizedMethodCheck")
   public static synchronized void setAudioSource(int source) {
     Logging.w(TAG, "Audio source is changed from: " + audioSource
-            + " to " + source);
+      + " to " + source);
     audioSource = source;
   }
 
@@ -391,7 +391,7 @@ private void reportWebRtcAudioRecordInitError(String errorMessage) {
   }
 
   private void reportWebRtcAudioRecordStartError(
-      AudioRecordStartErrorCode errorCode, String errorMessage) {
+    AudioRecordStartErrorCode errorCode, String errorMessage) {
     Logging.e(TAG, "Start recording error: " + errorCode + ". " + errorMessage);
     WebRtcAudioUtils.logAudioState(TAG);
     if (errorCallback != null) {
@@ -406,4 +406,4 @@ private void reportWebRtcAudioRecordError(String errorMessage) {
       errorCallback.onWebRtcAudioRecordError(errorMessage);
     }
   }
-}
+}