Added dynamic passing of AudioEncoding, OutputFormat and AudioEncodingBitRate (jsierles#86)

* Added Android support. Missing progress tracking.

* Re-indent and added skipToSeconds and setCurrentTime

* Reset state after playback is finished

* Updated README.md, added android support

* Updated instructions for Android

* added shared index for example.

* Renamed playFromPath to play for consistency with iOS API

* Reflected AudioPlayerManager method name change in AudioRecorderManager

* Added ReadableMap options argument to preparePlaybackPath

* Returned result of all methods in AudioPlayer [js] for promise support.

* Removed unused imports from AudioPlayerManager

* Better error when path is not specified

* Added support for dynamically passing OutputFormat, AudioEncoding and AudioEncodingBitRate.

* Integrated README changes before merge

* Added getDurationFromPath(path) [Android]

Author: rakannimer

Audio.ios.js

@@ -21,7 +21,7 @@ var AudioPlayer = {
     } else {
       options = {sessionCategory: 'SoloAmbient', numberOfLoops: 0}
     }
-    AudioPlayerManager.play(path, options);
+    return AudioPlayerManager.play(path, options);
   },
   playWithUrl: function(url, options) {
     if (options) {
@@ -32,22 +32,22 @@ var AudioPlayer = {
     } else {
       options = {sessionCategory: 'SoloAmbient', numberOfLoops: 0}
     }
-    AudioPlayerManager.playWithUrl(url, options);
+    return AudioPlayerManager.playWithUrl(url, options);
   },
   pause: function() {
-    AudioPlayerManager.pause();
+    return AudioPlayerManager.pause();
   },
   unpause: function() {
-    AudioPlayerManager.unpause();
+    return AudioPlayerManager.unpause();
   },
   stop: function() {
-    AudioPlayerManager.stop();
+    return AudioPlayerManager.stop();
   },
   setCurrentTime: function(time) {
-    AudioPlayerManager.setCurrentTime(time);
+    return AudioPlayerManager.setCurrentTime(time);
   },
   skipToSeconds: function(position) {
-    AudioPlayerManager.skipToSeconds(position);
+    return AudioPlayerManager.skipToSeconds(position);
   },
   setProgressSubscription: function() {
     if (this.progressSubscription) this.progressSubscription.remove();
@@ -69,6 +69,10 @@ var AudioPlayer = {
       }
     );
   },
+  getDurationFromPath: function(path){
+    return AudioPlayerManager.getDurationFromPath(path);
+  },
+
   getDuration: function(callback) {
     AudioPlayerManager.getDuration((error, duration) => {
       callback(duration);
@@ -88,7 +92,9 @@ var AudioRecorder = {
       Channels: 2,
       AudioQuality: 'High',
       AudioEncoding: 'ima4',
-      MeteringEnabled: false
+      OutputFormat: 'mpeg_4',
+      MeteringEnabled: false,
+      AudioEncodingBitRate: 32000
     };
     var recordingOptions = {...defaultOptions, ...options};
 

AudioExample/index.js

@@ -27,7 +27,8 @@ class AudioExample extends Component {
         SampleRate: 22050,
         Channels: 1,
         AudioQuality: "Low",
-        AudioEncoding: "aac"
+        AudioEncoding: "aac",
+        AudioEncodingBitRate: 32000
       });
     }
 

android/src/main/java/com/rnim/rn/audio/AudioPlayerManager.java

@@ -1,6 +1,5 @@
 package com.rnim.rn.audio;
 
-import android.Manifest;
 import android.content.Context;
 
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -15,13 +14,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.media.MediaRecorder;
 import android.media.MediaPlayer;
 import android.media.AudioManager;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+
 import android.util.Log;
 
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -72,6 +68,20 @@ public Map<String, Object> getConstants() {
   }
 
 
+  @ReactMethod
+  public void getDurationFromPath(String path, Promise promise ) {
+    if (path == null) {
+      Log.e("PATH_NOT_SET", "Please add path");
+      promise.reject("PATH_NOT_SET", "Please add path");
+      return;
+    }
+    boolean mediaPlayerReady = preparePlaybackAtPath("local", path, promise);
+    if (!mediaPlayerReady){
+      return;
+    }
+    promise.resolve(mediaPlayer.getDuration());
+  }
+
   @ReactMethod
   public void getDuration(Promise promise) {
     if (mediaPlayer == null) {
@@ -127,7 +137,7 @@ public void unpause(Promise promise) {
   }
 
   @ReactMethod
-  public void play(String path, final Promise promise) {
+  public void play(String path, ReadableMap playbackSettings, final Promise promise) {
     if (isPlaying) {
       Log.e("INVALID_STATE", "Please wait for previous playback to finish.");
       promise.reject("INVALID_STATE", "Please set valid path");
@@ -138,8 +148,8 @@ public void play(String path, final Promise promise) {
       return;
     }
     if (path == null) {
-      Log.e("INVALID_STATE", "Please set valid path");
-      promise.reject("INVALID_STATE", "Please set valid path");
+      Log.e("INVALID_PATH", "Please set valid path");
+      promise.reject("INVALID_PATH", "Please set valid path");
       return;
     }
 

android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java

@@ -51,7 +51,6 @@ public AudioRecorderManager(ReactApplicationContext reactContext) {
   @Override
   public Map<String, Object> getConstants() {
     Map<String, Object> constants = new HashMap<>();
-
     constants.put(DocumentDirectoryPath, this.getReactApplicationContext().getFilesDir().getAbsolutePath());
     constants.put(PicturesDirectoryPath, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
     constants.put(MainBundlePath, "");
@@ -85,15 +84,17 @@ public void prepareRecordingAtPath(String recordingPath, ReadableMap recordingSe
     recorder = new MediaRecorder();
     try {
       recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
-      recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
-      recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+      int outputFormat = getOutputFormatFromString(recordingSettings.getString("OutputFormat"));
+      recorder.setOutputFormat(outputFormat);
+      int audioEncoder = getAudioEncoderFromString(recordingSettings.getString("AudioEncoding"));
+      recorder.setAudioEncoder(audioEncoder);
       recorder.setAudioSamplingRate(recordingSettings.getInt("SampleRate"));
       recorder.setAudioChannels(recordingSettings.getInt("Channels"));
-      recorder.setAudioEncodingBitRate(32000); //recordingSettings.getInt("EncodingBitRate"));
+      recorder.setAudioEncodingBitRate(recordingSettings.getInt("AudioEncodingBitRate"));
       recorder.setOutputFile(recordingPath);
     }
     catch(final Exception e) {
-      promise.reject("COULDNT_CONFIGURE_AUDIO_SOURCE" , "Make sure you've added RECORD_AUDIO permission to your AndroidManifest.xml file "+e.getMessage());
+      promise.reject("COULDNT_CONFIGURE_MEDIA_RECORDER" , "Make sure you've added RECORD_AUDIO permission to your AndroidManifest.xml file "+e.getMessage());
       return;
     }
 
@@ -107,6 +108,47 @@ public void prepareRecordingAtPath(String recordingPath, ReadableMap recordingSe
 
   }
 
+  private int getAudioEncoderFromString(String audioEncoder) {
+   switch (audioEncoder) {
+     case "aac":
+       return MediaRecorder.AudioEncoder.AAC;
+     case "aac_eld":
+       return MediaRecorder.AudioEncoder.AAC_ELD;
+     case "amr_nb":
+       return MediaRecorder.AudioEncoder.AMR_NB;
+     case "amr_wb":
+       return MediaRecorder.AudioEncoder.AMR_WB;
+     case "he_aac":
+       return MediaRecorder.AudioEncoder.HE_AAC;
+     case "vorbis":
+      return MediaRecorder.AudioEncoder.VORBIS;
+     default:
+       Log.d("INVALID_AUDIO_ENCODER", "USING MediaRecorder.AudioEncoder.DEFAULT instead of "+audioEncoder+": "+MediaRecorder.AudioEncoder.DEFAULT);
+       return MediaRecorder.AudioEncoder.DEFAULT;
+   }
+  }
+
+  private int getOutputFormatFromString(String outputFormat) {
+    switch (outputFormat) {
+      case "mpeg_4":
+        return MediaRecorder.OutputFormat.MPEG_4;
+      case "aac_adts":
+        return MediaRecorder.OutputFormat.AAC_ADTS;
+      case "amr_nb":
+        return MediaRecorder.OutputFormat.AMR_NB;
+      case "amr_wb":
+        return MediaRecorder.OutputFormat.AMR_WB;
+      case "three_gpp":
+        return MediaRecorder.OutputFormat.THREE_GPP;
+      case "webm":
+        return MediaRecorder.OutputFormat.WEBM;
+      default:
+        Log.d("INVALID_OUPUT_FORMAT", "USING MediaRecorder.OutputFormat.DEFAULT : "+MediaRecorder.OutputFormat.DEFAULT);
+        return MediaRecorder.OutputFormat.DEFAULT;
+
+    }
+  }
+
   @ReactMethod
   public void startRecording(Promise promise){
     if (recorder == null){
@@ -161,7 +203,7 @@ public void unpausePlaying(Promise promise){
 
   @ReactMethod
   public void playRecording(final Promise promise) {
-    audioPlayerManager.play(currentOutputFile, promise);
+    audioPlayerManager.play(currentOutputFile, null, promise);
   }