feat: added support for require based audio source

Author: Maciej Makowski

apps/common-app/src/examples/AudioFile/AudioFile.tsx

@@ -34,12 +34,12 @@ const AudioFile: FC = () => {
     }
 
     setAudioBuffer(
-      audioContextRef.current.decodeAudioDataSource(
-        '/Users/maciejmakowski/projects/react-native-audio-api/apps/common-app/src/examples/AudioFile/runaway_kanye_west.mp3'
-      )
       // audioContextRef.current.decodeAudioDataSource(
-      //   'https://audio-ssl.itunes.apple.com/apple-assets-us-std-000001/AudioPreview18/v4/9c/db/54/9cdb54b3-5c52-3063-b1ad-abe42955edb5/mzaf_520282131402737225.plus.aac.p.m4a'
+      //   '/Users/maciejmakowski/projects/react-native-audio-api/apps/common-app/src/examples/AudioFile/runaway_kanye_west.mp3'
       // )
+      audioContextRef.current.decodeAudioDataSource(
+        'https://audio-ssl.itunes.apple.com/apple-assets-us-std-000001/AudioPreview18/v4/9c/db/54/9cdb54b3-5c52-3063-b1ad-abe42955edb5/mzaf_520282131402737225.plus.aac.p.m4a'
+      )
     );
   };
 

packages/react-native-audio-api/ios/AudioDecoder/AudioDecoder.h

@@ -6,7 +6,6 @@
 @interface AudioDecoder : NSObject
 
 @property (nonatomic, strong) AVAudioPCMBuffer *buffer;
-@property (nonatomic, strong) AVAudioFormat *format;
 @property (nonatomic, assign) int sampleRate;
 
 - (instancetype)initWithSampleRate:(int)sampleRate;

packages/react-native-audio-api/ios/AudioDecoder/AudioDecoder.m

@@ -6,10 +6,6 @@ - (instancetype)initWithSampleRate:(int)sampleRate
 {
   if (self = [super init]) {
     self.sampleRate = sampleRate;
-    self.format = [[AVAudioFormat alloc] initWithCommonFormat:AVAudioPCMFormatFloat32
-                                                   sampleRate:self.sampleRate
-                                                     channels:2
-                                                  interleaved:NO];
   }
   return self;
 }
@@ -20,13 +16,15 @@ - (const AudioBufferList *)decode:(NSString *)pathOrURL
   NSURL *url = [NSURL URLWithString:pathOrURL];
 
   if (url && url.scheme) {
-    return [self decodeWithURL:url];
+    self.buffer = [self decodeWithURL:url];
   } else {
-    return [self decodeWithFilePath:pathOrURL];
+    self.buffer = [self decodeWithFilePath:pathOrURL];
   }
+
+  return self.buffer.audioBufferList;
 }
 
-- (const AudioBufferList *)decodeWithFilePath:(NSString *)path
+- (AVAudioPCMBuffer *)decodeWithFilePath:(NSString *)path
 {
   NSError *error = nil;
   NSURL *fileURL = [NSURL fileURLWithPath:path];
@@ -36,23 +34,28 @@ - (const AudioBufferList *)decodeWithFilePath:(NSString *)path
     NSLog(@"Error occurred while opening the audio file: %@", [error localizedDescription]);
     return nil;
   }
-  self.buffer = [[AVAudioPCMBuffer alloc] initWithPCMFormat:[audioFile processingFormat]
-                                              frameCapacity:[audioFile length]];
+  AVAudioPCMBuffer *buffer = [[AVAudioPCMBuffer alloc] initWithPCMFormat:[audioFile processingFormat]
+                                                           frameCapacity:[audioFile length]];
+
+  AVAudioFormat *format = [[AVAudioFormat alloc] initWithCommonFormat:AVAudioPCMFormatFloat32
+                                                           sampleRate:self.sampleRate
+                                                             channels:buffer.audioBufferList->mNumberBuffers
+                                                          interleaved:NO];
 
-  [audioFile readIntoBuffer:self.buffer error:&error];
+  [audioFile readIntoBuffer:buffer error:&error];
   if (error) {
     NSLog(@"Error occurred while reading the audio file: %@", [error localizedDescription]);
     return nil;
   }
 
   if (self.sampleRate != audioFile.processingFormat.sampleRate) {
-    [self convertFromFormat:self.buffer.format];
+    return [self convertBuffer:buffer ToFormat:format];
   }
 
-  return self.buffer.audioBufferList;
+  return buffer;
 }
 
-- (const AudioBufferList *)decodeWithURL:(NSURL *)url
+- (AVAudioPCMBuffer *)decodeWithURL:(NSURL *)url
 {
   __block NSURL *tempFileURL = nil;
 
@@ -127,20 +130,19 @@ - (void)downloadFileFromURL:(NSURL *)url completion:(void (^)(NSURL *tempFileURL
   [downloadTask resume];
 }
 
-- (void)convertFromFormat:(AVAudioFormat *)format
+- (AVAudioPCMBuffer *)convertBuffer:(AVAudioPCMBuffer *)buffer ToFormat:(AVAudioFormat *)format
 {
   NSError *error = nil;
-  AVAudioConverter *converter = [[AVAudioConverter alloc] initFromFormat:format toFormat:self.format];
+  AVAudioConverter *converter = [[AVAudioConverter alloc] initFromFormat:buffer.format toFormat:format];
   AVAudioPCMBuffer *convertedBuffer =
-      [[AVAudioPCMBuffer alloc] initWithPCMFormat:self.format
-                                    frameCapacity:(AVAudioFrameCount)self.buffer.frameCapacity];
+      [[AVAudioPCMBuffer alloc] initWithPCMFormat:format frameCapacity:(AVAudioFrameCount)buffer.frameCapacity];
 
   AVAudioConverterInputBlock inputBlock =
       ^AVAudioBuffer *(AVAudioPacketCount inNumberOfPackets, AVAudioConverterInputStatus *outStatus)
   {
-    if (self.buffer.frameLength > 0) {
+    if (buffer.frameLength > 0) {
       *outStatus = AVAudioConverterInputStatus_HaveData;
-      return self.buffer;
+      return buffer;
     } else {
       *outStatus = AVAudioConverterInputStatus_NoDataNow;
       return nil;
@@ -151,16 +153,15 @@ - (void)convertFromFormat:(AVAudioFormat *)format
 
   if (error) {
     NSLog(@"Error occurred while converting the audio file: %@", [error localizedDescription]);
-    return;
+    return nil;
   }
 
-  self.buffer = convertedBuffer;
+  return convertedBuffer;
 }
 
 - (void)cleanup
 {
   self.buffer = nil;
-  self.format = nil;
 }
 
 @end

packages/react-native-audio-api/src/core/BaseAudioContext.ts

@@ -1,5 +1,5 @@
 import { IBaseAudioContext } from '../interfaces';
-import { ContextState, PeriodicWaveConstraints } from './types';
+import { ContextState, PeriodicWaveConstraints, AudioSource } from './types';
 import AudioDestinationNode from './AudioDestinationNode';
 import OscillatorNode from './OscillatorNode';
 import GainNode from './GainNode';
@@ -9,6 +9,7 @@ import AudioBufferSourceNode from './AudioBufferSourceNode';
 import AudioBuffer from './AudioBuffer';
 import PeriodicWave from './PeriodicWave';
 import { InvalidAccessError } from '../errors';
+import { resolveAudioSource } from '../utils/resolveAudioSource';
 
 export default class BaseAudioContext {
   readonly destination: AudioDestinationNode;
@@ -95,7 +96,9 @@ export default class BaseAudioContext {
     );
   }
 
-  decodeAudioDataSource(source: string): AudioBuffer {
-    return new AudioBuffer(this.context.decodeAudioDataSource(source));
+  decodeAudioDataSource(source: AudioSource | number): AudioBuffer {
+    return new AudioBuffer(
+      this.context.decodeAudioDataSource(resolveAudioSource(source))
+    );
   }
 }

packages/react-native-audio-api/src/core/types.ts

@@ -28,11 +28,6 @@ export interface PeriodicWaveConstraints {
 /**
  * A type that defines the source of the audio which can be expressed in several forms:
  * 1. A string path, which could be an HTTPS URL or a local file path.
- * 2. An object specifying more detailed information about the source, including URI and HTTP headers.
+ * 2. A string, which is a result of resolving an asset source.
  */
-export type AudioSource =
-  | string
-  | {
-      uri?: string;
-      headers?: Record<string, string>;
-    };
+export type AudioSource = string;

packages/react-native-audio-api/src/utils/resolveAudioSource.ts

@@ -1,14 +1,13 @@
 import { AudioSource } from '../core/types';
+// not sure if it works
+// @ts-ignore
+import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
 
 export function resolveAudioSource(
   source: AudioSource | string | number
 ): AudioSource {
-  if (typeof source === 'string') {
-    return { uri: source };
-  }
   if (typeof source === 'number') {
-    // TODO: Add support for reading from the asset bundle
-    return 'todo';
+    return resolveAssetSource(source);
   }
 
   return source;