react-native-audio-api 0.5.7 → 0.6.0-rc.1

package/android/src/oldarch/NativeAudioManagerModuleSpec.java

@@ -0,0 +1,99 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.swmansion.audioapi;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeAudioManagerModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
+  public static final String NAME = "AudioManagerModule";
+
+  public NativeAudioManagerModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  protected final void emitOnRemotePlay() {
+    mEventEmitterCallback.invoke("onRemotePlay");
+  }
+
+  protected final void emitOnRemotePause() {
+    mEventEmitterCallback.invoke("onRemotePause");
+  }
+
+  protected final void emitOnStop() {
+    mEventEmitterCallback.invoke("onStop");
+  }
+
+  protected final void emitOnTogglePlayPause() {
+    mEventEmitterCallback.invoke("onTogglePlayPause");
+  }
+
+  protected final void emitOnChangePlaybackRate(double value) {
+    mEventEmitterCallback.invoke("onChangePlaybackRate", value);
+  }
+
+  protected final void emitOnNextTrack() {
+    mEventEmitterCallback.invoke("onNextTrack");
+  }
+
+  protected final void emitOnPreviousTrack() {
+    mEventEmitterCallback.invoke("onPreviousTrack");
+  }
+
+  protected final void emitOnSkipForward(double value) {
+    mEventEmitterCallback.invoke("onSkipForward", value);
+  }
+
+  protected final void emitOnSkipBackward(double value) {
+    mEventEmitterCallback.invoke("onSkipBackward", value);
+  }
+
+  protected final void emitOnSeekForward() {
+    mEventEmitterCallback.invoke("onSeekForward");
+  }
+
+  protected final void emitOnSeekBackward() {
+    mEventEmitterCallback.invoke("onSeekBackward");
+  }
+
+  protected final void emitOnChangePlaybackPosition(double value) {
+    mEventEmitterCallback.invoke("onChangePlaybackPosition", value);
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setLockScreenInfo(ReadableMap info);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void resetLockScreenInfo();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setSessionOptions(String category, String mode, ReadableArray options);
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
+  public abstract double getDevicePreferredSampleRate();
+}

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require('./lib/commonjs/plugin/withAudioAPI');

package/common/cpp/audioapi/AudioAPIModuleInstaller.h

@@ -35,12 +35,8 @@ class AudioAPIModuleInstaller {
             const jsi::Value *args,
             size_t count) -> jsi::Value {
           std::shared_ptr<AudioContext> audioContext;
-          if (args[0].isUndefined()) {
-            audioContext = std::make_shared<AudioContext>();
-          } else {
-            auto sampleRate = static_cast<float>(args[0].getNumber());
-            audioContext = std::make_shared<AudioContext>(sampleRate);
-          }
+          auto sampleRate = static_cast<float>(args[0].getNumber());
+          audioContext = std::make_shared<AudioContext>(sampleRate);
 
           auto audioContextHostObject = std::make_shared<AudioContextHostObject>(
               audioContext, &runtime, jsCallInvoker);

package/common/cpp/audioapi/core/AudioContext.cpp

@@ -10,18 +10,6 @@
 #include <audioapi/core/utils/AudioNodeManager.h>
 
 namespace audioapi {
-AudioContext::AudioContext() : BaseAudioContext() {
-#ifdef ANDROID
-  audioPlayer_ = std::make_shared<AudioPlayer>(this->renderAudio());
-#else
-  audioPlayer_ = std::make_shared<IOSAudioPlayer>(this->renderAudio());
-#endif
-  sampleRate_ = audioPlayer_->getSampleRate();
-  audioDecoder_ = std::make_shared<AudioDecoder>(sampleRate_);
-
-  audioPlayer_->start();
-}
-
 AudioContext::AudioContext(float sampleRate) : BaseAudioContext() {
 #ifdef ANDROID
   audioPlayer_ = std::make_shared<AudioPlayer>(this->renderAudio(), sampleRate);
@@ -29,6 +17,7 @@ AudioContext::AudioContext(float sampleRate) : BaseAudioContext() {
   audioPlayer_ =
       std::make_shared<IOSAudioPlayer>(this->renderAudio(), sampleRate);
 #endif
+
   sampleRate_ = audioPlayer_->getSampleRate();
   audioDecoder_ = std::make_shared<AudioDecoder>(sampleRate_);
 

package/common/cpp/audioapi/core/AudioContext.h

@@ -14,7 +14,6 @@ class IOSAudioPlayer;
 
 class AudioContext : public BaseAudioContext {
  public:
-  AudioContext();
   explicit AudioContext(float sampleRate);
   ~AudioContext() override;
 

package/common/cpp/audioapi/core/sources/AudioBufferSourceNode.cpp

@@ -128,12 +128,7 @@ void AudioBufferSourceNode::start(double when, double offset, double duration) {
 }
 
 void AudioBufferSourceNode::disable() {
-  AudioNode::disable();
-
-  if (onendedCallback_) {
-    onendedCallback_(getStopTime());
-  }
-
+  AudioScheduledSourceNode::disable();
   alignedBus_.reset();
 }
 

package/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp

@@ -141,12 +141,16 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
   nonSilentFramesToProcess = framesToProcess;
 }
 
+void AudioScheduledSourceNode::disable() {
+  AudioNode::disable();
+
+  if (onendedCallback_) {
+    onendedCallback_(getStopTime());
+  }
+}
+
 void AudioScheduledSourceNode::handleStopScheduled() {
   if (isStopScheduled()) {
-    if (onendedCallback_) {
-      onendedCallback_(getStopTime());
-    }
-
     playbackState_ = PlaybackState::FINISHED;
     disable();
   }

package/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.h

@@ -33,6 +33,7 @@ class AudioScheduledSourceNode : public AudioNode {
   void setOnendedCallback(const std::function<void(double)> &onendedCallback);
 
   virtual double getStopTime() const = 0;
+  void disable() override;
 
  protected:
   PlaybackState playbackState_;

package/common/cpp/audioapi/core/utils/AudioNodeDestructor.cpp

@@ -4,9 +4,9 @@
 
 namespace audioapi {
 
-AudioNodeDestructor::AudioNodeDestructor()
-    : thread_(std::thread(&AudioNodeDestructor::process, this)),
-      isExiting_(false) {}
+AudioNodeDestructor::AudioNodeDestructor() : isExiting_(false) {
+  thread_ = std::thread(&AudioNodeDestructor::process, this);
+}
 
 AudioNodeDestructor::~AudioNodeDestructor() {
   isExiting_ = true;

package/ios/audioapi/ios/AudioAPIModule.mm

@@ -4,7 +4,6 @@
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTCallInvoker.h>
-#import <ReactCommon/RCTTurboModule.h>
 #endif // RCT_NEW_ARCH_ENABLED
 
 #include <audioapi/AudioAPIModuleInstaller.h>
@@ -16,9 +15,9 @@ using namespace facebook::react;
 - (void *)runtime;
 @end
 
-#if defined(RCT_NEW_ARCH_ENABLED) && REACT_NATIVE_MINOR_VERSION >= 75
+#if defined(RCT_NEW_ARCH_ENABLED)
 // nothing
-#else // defined(RCT_NEW_ARCH_ENABLED) && REACT_NATIVE_MINOR_VERSION >= 75
+#else // defined(RCT_NEW_ARCH_ENABLED)
 @interface RCTBridge (RCTTurboModule)
 - (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker;
 - (void)_tryAndHandleError:(dispatch_block_t)block;

package/ios/audioapi/ios/AudioManagerModule.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@class AudioEngine;
+@class NotificationManager;
+@class AudioSessionManager;
+@class LockScreenManager;
+
+@interface AudioManagerModule : RCTEventEmitter <RCTBridgeModule>
+
+@property (nonatomic, strong) AudioEngine *audioEngine;
+@property (nonatomic, strong) NotificationManager *notificationManager;
+@property (nonatomic, strong) AudioSessionManager *audioSessionManager;
+@property (nonatomic, strong) LockScreenManager *lockScreenManager;
+
+@end

package/ios/audioapi/ios/AudioManagerModule.mm

@@ -0,0 +1,94 @@
+#import <audioapi/ios/AudioManagerModule.h>
+
+#import <audioapi/ios/system/AudioEngine.h>
+#import <audioapi/ios/system/AudioSessionManager.h>
+#import <audioapi/ios/system/LockScreenManager.h>
+#import <audioapi/ios/system/NotificationManager.h>
+
+@implementation AudioManagerModule
+
+RCT_EXPORT_MODULE(AudioManagerModule);
+
+- (id)init
+{
+  if (self == [super init]) {
+    self.audioEngine = [AudioEngine sharedInstance];
+    self.audioSessionManager = [AudioSessionManager sharedInstance];
+    self.notificationManager = [NotificationManager sharedInstanceWithAudioManagerModule:self];
+    self.lockScreenManager = [LockScreenManager sharedInstanceWithAudioManagerModule:self];
+  }
+
+  return self;
+}
+
+- (void)cleanup
+{
+  [self.audioEngine cleanup];
+  [self.notificationManager cleanup];
+  [self.audioSessionManager cleanup];
+  [self.lockScreenManager cleanup];
+}
+
+- (void)dealloc
+{
+  [self cleanup];
+}
+
+RCT_EXPORT_METHOD(setLockScreenInfo : (NSDictionary *)info)
+{
+  [self.lockScreenManager setLockScreenInfo:info];
+}
+
+RCT_EXPORT_METHOD(resetLockScreenInfo)
+{
+  [self.lockScreenManager resetLockScreenInfo];
+}
+
+RCT_EXPORT_METHOD(enableRemoteCommand : (NSString *)name enabled : (BOOL)enabled)
+{
+  [self.lockScreenManager enableRemoteCommand:name enabled:enabled];
+}
+
+RCT_EXPORT_METHOD(setAudioSessionOptions : (NSString *)category mode : (NSString *)mode options : (NSArray *)
+                      options active : (BOOL)active)
+{
+  NSError *error = nil;
+
+  if (active) {
+    [self.audioSessionManager setAudioSessionOptions:category mode:mode options:options];
+  } else {
+    [self.audioSessionManager setActive:false error:&error];
+  }
+}
+
+RCT_EXPORT_METHOD(observeAudioInterruptions : (BOOL)enabled)
+{
+  [self.notificationManager observeAudioInterruptions:enabled];
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getDevicePreferredSampleRate)
+{
+  return [self.audioSessionManager getDevicePreferredSampleRate];
+}
+
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[
+    @"onRemotePlay",
+    @"onRemotePause",
+    @"onRemoteStop",
+    @"onRemoteTogglePlayPause",
+    @"onRemoteChangePlaybackRate",
+    @"onRemoteNextTrack",
+    @"onRemotePreviousTrack",
+    @"onRemoteSkipForward",
+    @"onRemoteSkipBackward",
+    @"onRemoteSeekForward",
+    @"onRemoteSeekBackward",
+    @"onRemoteChangePlaybackPosition",
+    @"onInterruption",
+    @"onRouteChange"
+  ];
+}
+
+@end

package/ios/audioapi/ios/core/AudioPlayer.h

@@ -7,22 +7,18 @@ typedef void (^RenderAudioBlock)(AudioBufferList *outputBuffer, int numFrames);
 
 @interface AudioPlayer : NSObject
 
-@property (nonatomic, strong) AVAudioEngine *audioEngine;
-@property (nonatomic, weak) AVAudioSession *audioSession;
-@property (nonatomic, weak) NSNotificationCenter *notificationCenter;
 @property (nonatomic, strong) AVAudioFormat *format;
 @property (nonatomic, strong) AVAudioSourceNode *sourceNode;
 @property (nonatomic, copy) RenderAudioBlock renderAudio;
 @property (nonatomic, assign) float sampleRate;
 @property (nonatomic, assign) int channelCount;
 @property (nonatomic, assign) bool isRunning;
+@property (nonatomic, strong) NSString *sourceNodeId;
 @property (nonatomic, strong) AVAudioSourceNodeRenderBlock renderBlock;
 
-- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio channelCount:(int)channelCount;
-
-- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio
-                              sampleRate:(float)sampleRate
-                            channelCount:(int)channelCount;
+- (instancetype)initWithRenderAudio:(RenderAudioBlock)renderAudio
+                         sampleRate:(float)sampleRate
+                       channelCount:(int)channelCount;
 
 - (float)getSampleRate;
 
@@ -36,8 +32,4 @@ typedef void (^RenderAudioBlock)(AudioBufferList *outputBuffer, int numFrames);
 
 - (void)cleanup;
 
-- (void)setupAndInitAudioSession;
-
-- (void)connectAudioEngine;
-
 @end

package/ios/audioapi/ios/core/AudioPlayer.m

@@ -1,52 +1,17 @@
 #import <audioapi/ios/core/AudioPlayer.h>
+#import <audioapi/ios/system/AudioEngine.h>
 
 @implementation AudioPlayer
 
-- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio channelCount:(int)channelCount
+- (instancetype)initWithRenderAudio:(RenderAudioBlock)renderAudio
+                         sampleRate:(float)sampleRate
+                       channelCount:(int)channelCount
 {
   if (self = [super init]) {
-    self.renderAudio = [renderAudio copy];
-    self.audioEngine = [[AVAudioEngine alloc] init];
-    self.audioEngine.mainMixerNode.outputVolume = 1;
-    self.isRunning = true;
-
-    [self setupAndInitAudioSession];
+    self.sampleRate = sampleRate;
 
-    self.sampleRate = [self.audioSession sampleRate];
     self.channelCount = channelCount;
-
-    __weak typeof(self) weakSelf = self;
-    self.renderBlock = ^OSStatus(
-        BOOL *isSilence, const AudioTimeStamp *timestamp, AVAudioFrameCount frameCount, AudioBufferList *outputData) {
-      if (outputData->mNumberBuffers != weakSelf.channelCount) {
-        return kAudioServicesBadPropertySizeError;
-      }
-
-      weakSelf.renderAudio(outputData, frameCount);
-      return kAudioServicesNoError;
-    };
-
-    _format = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:self.sampleRate channels:self.channelCount];
-    _sourceNode = [[AVAudioSourceNode alloc] initWithFormat:self.format renderBlock:self.renderBlock];
-  }
-
-  return self;
-}
-
-- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio
-                              sampleRate:(float)sampleRate
-                            channelCount:(int)channelCount
-{
-  if (self = [super init]) {
     self.renderAudio = [renderAudio copy];
-    self.audioEngine = [[AVAudioEngine alloc] init];
-    self.audioEngine.mainMixerNode.outputVolume = 1;
-    self.isRunning = true;
-
-    [self setupAndInitAudioSession];
-
-    self.sampleRate = sampleRate;
-    self.channelCount = channelCount;
 
     __weak typeof(self) weakSelf = self;
     self.renderBlock = ^OSStatus(
@@ -73,96 +38,49 @@
 
 - (void)start
 {
+  NSLog(@"[AudioPlayer] start");
+  AudioEngine *audioEngine = [AudioEngine sharedInstance];
   self.isRunning = true;
-  [self connectAudioEngine];
+  self.sourceNodeId = [audioEngine attachSourceNode:self.sourceNode format:self.format];
 }
 
 - (void)stop
 {
-  self.isRunning = false;
-  [self.audioEngine detachNode:self.sourceNode];
-
-  if (self.audioEngine.isRunning) {
-    [self.audioEngine stop];
+  NSLog(@"[AudioPlayer] stop");
+  if (!self.isRunning) {
+    return;
   }
 
-  NSError *error = nil;
-  [self.audioSession setActive:false error:&error];
-
-  if (error != nil) {
-    NSLog(@"Error while deactivating audio session: %@", [error debugDescription]);
-  }
+  AudioEngine *audioEngine = [AudioEngine sharedInstance];
+  self.isRunning = false;
+  [audioEngine detachSourceNodeWithId:self.sourceNodeId];
+  self.sourceNodeId = nil;
 }
 
 - (void)suspend
 {
-  [self.audioEngine pause];
+  NSLog(@"[AudioPlayer] suspend");
+  if (!self.isRunning) {
+    return;
+  }
+
+  AudioEngine *audioEngine = [AudioEngine sharedInstance];
   self.isRunning = false;
+  [audioEngine detachSourceNodeWithId:self.sourceNodeId];
+  self.sourceNodeId = nil;
 }
 
 - (void)resume
 {
+  NSLog(@"[AudioPlayer] resume");
+  AudioEngine *audioEngine = [AudioEngine sharedInstance];
   self.isRunning = true;
-  [self setupAndInitAudioSession];
-  [self connectAudioEngine];
+  self.sourceNodeId = [audioEngine attachSourceNode:self.sourceNode format:self.format];
 }
 
 - (void)cleanup
 {
-  self.audioEngine = nil;
-  self.audioSession = nil;
   self.renderAudio = nil;
 }
 
-- (void)setupAndInitAudioSession
-{
-  NSError *error = nil;
-
-  if (!self.audioSession) {
-    self.audioSession = [AVAudioSession sharedInstance];
-  }
-
-  [self.audioSession setCategory:AVAudioSessionCategoryPlayback
-                            mode:AVAudioSessionModeDefault
-                         options:AVAudioSessionCategoryOptionDuckOthers | AVAudioSessionCategoryOptionAllowAirPlay
-                           error:&error];
-
-  if (error != nil) {
-    NSLog(@"Error while configuring audio session: %@", [error debugDescription]);
-    return;
-  }
-
-  [self.audioSession setPreferredIOBufferDuration:0.022 error:&error];
-
-  if (error != nil) {
-    NSLog(@"Error while setting buffer size in audio session: %@", [error debugDescription]);
-    return;
-  }
-
-  [self.audioSession setActive:true error:&error];
-
-  if (error != nil) {
-    NSLog(@"Error while activating audio session: %@", [error debugDescription]);
-    return;
-  }
-}
-
-- (void)connectAudioEngine
-{
-  if ([self.audioEngine isRunning]) {
-    return;
-  }
-
-  [self.audioEngine attachNode:self.sourceNode];
-  [self.audioEngine connect:self.sourceNode to:self.audioEngine.mainMixerNode format:self.format];
-
-  if (![self.audioEngine isRunning]) {
-    NSError *error = nil;
-
-    if (![self.audioEngine startAndReturnError:&error]) {
-      NSLog(@"Error starting audio engine: %@", [error debugDescription]);
-    }
-  }
-}
-
 @end

package/ios/audioapi/ios/core/IOSAudioPlayer.h

@@ -10,8 +10,8 @@ typedef struct objc_object AudioPlayer;
 
 namespace audioapi {
 
-class AudioContext;
 class AudioBus;
+class AudioContext;
 
 class IOSAudioPlayer {
  protected:
@@ -21,8 +21,6 @@ class IOSAudioPlayer {
   int channelCount_;
 
  public:
-  explicit IOSAudioPlayer(
-      const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio);
   IOSAudioPlayer(
       const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
       float sampleRate);

package/ios/audioapi/ios/core/IOSAudioPlayer.mm

@@ -8,31 +8,6 @@
 
 namespace audioapi {
 
-IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio)
-    : channelCount_(2), renderAudio_(renderAudio), audioBus_(0)
-{
-  RenderAudioBlock renderAudioBlock = ^(AudioBufferList *outputData, int numFrames) {
-    int processedFrames = 0;
-
-    while (processedFrames < numFrames) {
-      int framesToProcess = std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);
-      renderAudio_(audioBus_, framesToProcess);
-
-      for (int channel = 0; channel < channelCount_; channel += 1) {
-        float *outputChannel = (float *)outputData->mBuffers[channel].mData;
-        auto *inputChannel = audioBus_->getChannel(channel)->getData();
-
-        memcpy(outputChannel + processedFrames, inputChannel, framesToProcess * sizeof(float));
-      }
-
-      processedFrames += framesToProcess;
-    }
-  };
-
-  audioPlayer_ = [[AudioPlayer alloc] initWithRenderAudioBlock:renderAudioBlock channelCount:channelCount_];
-  audioBus_ = std::make_shared<AudioBus>(RENDER_QUANTUM_SIZE, channelCount_, getSampleRate());
-}
-
 IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio, float sampleRate)
     : channelCount_(2), renderAudio_(renderAudio), audioBus_(0)
 {
@@ -54,9 +29,10 @@ IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus
     }
   };
 
-  audioPlayer_ = [[AudioPlayer alloc] initWithRenderAudioBlock:renderAudioBlock
-                                                    sampleRate:sampleRate
-                                                  channelCount:channelCount_];
+  audioPlayer_ = [[AudioPlayer alloc] initWithRenderAudio:renderAudioBlock
+                                               sampleRate:sampleRate
+                                             channelCount:channelCount_];
+
   audioBus_ = std::make_shared<AudioBus>(RENDER_QUANTUM_SIZE, channelCount_, getSampleRate());
 }
 

package/ios/audioapi/ios/system/AudioEngine.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#import <AVFoundation/AVFoundation.h>
+#import <Foundation/Foundation.h>
+
+@interface AudioEngine : NSObject
+
+@property (nonatomic, strong) AVAudioEngine *audioEngine;
+@property (nonatomic, strong) NSMutableDictionary *sourceNodes;
+@property (nonatomic, strong) NSMutableDictionary *sourceFormats;
+
++ (instancetype)sharedInstance;
+- (void)cleanup;
+
+- (bool)rebuildAudioEngine;
+- (void)startEngine;
+- (void)stopEngine;
+- (bool)isRunning;
+
+- (NSString *)attachSourceNode:(AVAudioSourceNode *)sourceNode format:(AVAudioFormat *)format;
+- (void)detachSourceNodeWithId:(NSString *)sourceNodeId;
+
+@end