react-native-audio-api 0.11.0-alpha.1 → 0.11.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +13 -11
- package/RNAudioAPI.podspec +25 -18
- package/android/build.gradle +41 -5
- package/android/src/main/cpp/audioapi/CMakeLists.txt +6 -3
- package/android/src/main/cpp/audioapi/android/AudioAPIModule.cpp +10 -16
- package/android/src/main/cpp/audioapi/android/OnLoad.cpp +1 -2
- package/android/src/main/cpp/audioapi/android/core/AndroidAudioRecorder.cpp +219 -84
- package/android/src/main/cpp/audioapi/android/core/AndroidAudioRecorder.h +23 -23
- package/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp +13 -20
- package/android/src/main/cpp/audioapi/android/core/utils/AndroidFileWriterBackend.h +14 -18
- package/android/src/main/cpp/audioapi/android/core/utils/AndroidRecorderCallback.cpp +72 -89
- package/android/src/main/cpp/audioapi/android/core/utils/AndroidRecorderCallback.h +12 -23
- package/android/src/main/cpp/audioapi/android/core/utils/AudioDecoder.cpp +47 -47
- package/android/src/main/cpp/audioapi/android/core/utils/FileOptions.cpp +83 -0
- package/android/src/main/cpp/audioapi/android/core/utils/FileOptions.h +22 -0
- package/android/src/main/cpp/audioapi/android/core/utils/MiniaudioImplementation.cpp +5 -0
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/FFmpegFileWriter.cpp +379 -298
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/FFmpegFileWriter.h +48 -91
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/ptrs.hpp +48 -0
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/utils.cpp +110 -0
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/utils.h +34 -0
- package/android/src/main/cpp/audioapi/android/core/utils/miniaudioBackend/MiniAudioFileWriter.cpp +132 -104
- package/android/src/main/cpp/audioapi/android/core/utils/miniaudioBackend/MiniAudioFileWriter.h +8 -16
- package/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt +28 -1
- package/android/src/main/java/com/swmansion/audioapi/system/LockScreenManager.kt +28 -6
- package/android/src/main/java/com/swmansion/audioapi/system/MediaNotificationManager.kt +11 -0
- package/android/src/main/jniLibs/arm64-v8a/libavcodec.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libavformat.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libavutil.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/libswresample.so +0 -0
- package/android/src/main/jniLibs/armeabi-v7a/libavcodec.so +0 -0
- package/android/src/main/jniLibs/armeabi-v7a/libavformat.so +0 -0
- package/android/src/main/jniLibs/armeabi-v7a/libavutil.so +0 -0
- package/android/src/main/jniLibs/armeabi-v7a/libswresample.so +0 -0
- package/android/src/main/jniLibs/x86/libavcodec.so +0 -0
- package/android/src/main/jniLibs/x86/libavformat.so +0 -0
- package/android/src/main/jniLibs/x86/libavutil.so +0 -0
- package/android/src/main/jniLibs/x86/libswresample.so +0 -0
- package/android/src/main/jniLibs/x86_64/libavcodec.so +0 -0
- package/android/src/main/jniLibs/x86_64/libavformat.so +0 -0
- package/android/src/main/jniLibs/x86_64/libavutil.so +0 -0
- package/android/src/main/jniLibs/x86_64/libswresample.so +0 -0
- package/android/src/oldarch/NativeAudioAPIModuleSpec.java +4 -0
- package/common/cpp/audioapi/AudioAPIModuleInstaller.h +45 -70
- package/common/cpp/audioapi/HostObjects/AudioContextHostObject.cpp +20 -22
- package/common/cpp/audioapi/HostObjects/AudioNodeHostObject.cpp +3 -4
- package/common/cpp/audioapi/HostObjects/AudioParamHostObject.cpp +6 -8
- package/common/cpp/audioapi/HostObjects/AudioParamHostObject.h +2 -2
- package/common/cpp/audioapi/HostObjects/BaseAudioContextHostObject.cpp +102 -63
- package/common/cpp/audioapi/HostObjects/BaseAudioContextHostObject.h +4 -1
- package/common/cpp/audioapi/HostObjects/OfflineAudioContextHostObject.cpp +25 -31
- package/common/cpp/audioapi/HostObjects/OfflineAudioContextHostObject.h +3 -3
- package/common/cpp/audioapi/HostObjects/WorkletNodeHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/WorkletProcessingNodeHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/analysis/AnalyserNodeHostObject.cpp +10 -18
- package/common/cpp/audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h +2 -3
- package/common/cpp/audioapi/HostObjects/effects/BiquadFilterNodeHostObject.cpp +18 -30
- package/common/cpp/audioapi/HostObjects/effects/BiquadFilterNodeHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/effects/ConvolverNodeHostObject.cpp +50 -0
- package/common/cpp/audioapi/HostObjects/effects/ConvolverNodeHostObject.h +20 -0
- package/common/cpp/audioapi/HostObjects/effects/DelayNodeHostObject.cpp +27 -0
- package/common/cpp/audioapi/HostObjects/effects/DelayNodeHostObject.h +21 -0
- package/common/cpp/audioapi/HostObjects/effects/GainNodeHostObject.cpp +2 -2
- package/common/cpp/audioapi/HostObjects/effects/IIRFilterNodeHostObject.cpp +33 -0
- package/common/cpp/audioapi/HostObjects/effects/IIRFilterNodeHostObject.h +20 -0
- package/common/cpp/audioapi/HostObjects/effects/PeriodicWaveHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/effects/StereoPannerNodeHostObject.cpp +2 -2
- package/common/cpp/audioapi/HostObjects/effects/StereoPannerNodeHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/events/AudioEventHandlerRegistryHostObject.cpp +6 -12
- package/common/cpp/audioapi/HostObjects/events/AudioEventHandlerRegistryHostObject.h +7 -7
- package/common/cpp/audioapi/HostObjects/inputs/AudioRecorderHostObject.cpp +98 -50
- package/common/cpp/audioapi/HostObjects/inputs/AudioRecorderHostObject.h +5 -2
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.cpp +27 -22
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.h +12 -10
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferHostObject.cpp +17 -22
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferHostObject.h +5 -7
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.cpp +25 -11
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.h +8 -8
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.cpp +19 -30
- package/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.h +2 -4
- package/common/cpp/audioapi/HostObjects/sources/AudioScheduledSourceNodeHostObject.cpp +7 -11
- package/common/cpp/audioapi/HostObjects/sources/ConstantSourceNodeHostObject.cpp +2 -2
- package/common/cpp/audioapi/HostObjects/sources/ConstantSourceNodeHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/sources/OscillatorNodeHostObject.cpp +6 -8
- package/common/cpp/audioapi/HostObjects/sources/OscillatorNodeHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/sources/RecorderAdapterNodeHostObject.h +4 -5
- package/common/cpp/audioapi/HostObjects/sources/StreamerNodeHostObject.cpp +6 -2
- package/common/cpp/audioapi/HostObjects/sources/StreamerNodeHostObject.h +5 -6
- package/common/cpp/audioapi/HostObjects/sources/WorkletSourceNodeHostObject.h +1 -2
- package/common/cpp/audioapi/HostObjects/utils/AudioDecoderHostObject.cpp +39 -60
- package/common/cpp/audioapi/HostObjects/utils/AudioStretcherHostObject.cpp +15 -30
- package/common/cpp/audioapi/core/AudioContext.cpp +23 -28
- package/common/cpp/audioapi/core/AudioContext.h +6 -3
- package/common/cpp/audioapi/core/AudioNode.cpp +17 -19
- package/common/cpp/audioapi/core/AudioNode.h +19 -8
- package/common/cpp/audioapi/core/AudioParam.cpp +68 -100
- package/common/cpp/audioapi/core/AudioParam.h +20 -12
- package/common/cpp/audioapi/core/BaseAudioContext.cpp +52 -34
- package/common/cpp/audioapi/core/BaseAudioContext.h +26 -14
- package/common/cpp/audioapi/core/OfflineAudioContext.cpp +12 -17
- package/common/cpp/audioapi/core/OfflineAudioContext.h +10 -5
- package/common/cpp/audioapi/core/analysis/AnalyserNode.cpp +13 -21
- package/common/cpp/audioapi/core/analysis/AnalyserNode.h +8 -6
- package/common/cpp/audioapi/core/destinations/AudioDestinationNode.cpp +1 -0
- package/common/cpp/audioapi/core/destinations/AudioDestinationNode.h +5 -3
- package/common/cpp/audioapi/core/effects/BiquadFilterNode.cpp +84 -66
- package/common/cpp/audioapi/core/effects/BiquadFilterNode.h +39 -10
- package/common/cpp/audioapi/core/effects/ConvolverNode.cpp +201 -0
- package/common/cpp/audioapi/core/effects/ConvolverNode.h +64 -0
- package/common/cpp/audioapi/core/effects/DelayNode.cpp +101 -0
- package/common/cpp/audioapi/core/effects/DelayNode.h +39 -0
- package/common/cpp/audioapi/core/effects/GainNode.cpp +1 -0
- package/common/cpp/audioapi/core/effects/GainNode.h +3 -1
- package/common/cpp/audioapi/core/effects/IIRFilterNode.cpp +166 -0
- package/common/cpp/audioapi/core/effects/IIRFilterNode.h +74 -0
- package/common/cpp/audioapi/core/effects/PeriodicWave.cpp +22 -35
- package/common/cpp/audioapi/core/effects/PeriodicWave.h +4 -9
- package/common/cpp/audioapi/core/effects/StereoPannerNode.cpp +4 -5
- package/common/cpp/audioapi/core/effects/StereoPannerNode.h +4 -2
- package/common/cpp/audioapi/core/effects/WorkletNode.cpp +11 -13
- package/common/cpp/audioapi/core/effects/WorkletNode.h +15 -12
- package/common/cpp/audioapi/core/effects/WorkletProcessingNode.cpp +4 -4
- package/common/cpp/audioapi/core/effects/WorkletProcessingNode.h +15 -14
- package/common/cpp/audioapi/core/inputs/AudioRecorder.cpp +58 -36
- package/common/cpp/audioapi/core/inputs/AudioRecorder.h +42 -44
- package/common/cpp/audioapi/core/sources/AudioBuffer.cpp +4 -6
- package/common/cpp/audioapi/core/sources/AudioBuffer.h +4 -7
- package/common/cpp/audioapi/core/sources/AudioBufferBaseSourceNode.cpp +48 -57
- package/common/cpp/audioapi/core/sources/AudioBufferBaseSourceNode.h +37 -34
- package/common/cpp/audioapi/core/sources/AudioBufferQueueSourceNode.cpp +55 -17
- package/common/cpp/audioapi/core/sources/AudioBufferQueueSourceNode.h +35 -28
- package/common/cpp/audioapi/core/sources/AudioBufferSourceNode.cpp +41 -49
- package/common/cpp/audioapi/core/sources/AudioBufferSourceNode.h +8 -6
- package/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp +29 -24
- package/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.h +6 -6
- package/common/cpp/audioapi/core/sources/ConstantSourceNode.cpp +3 -4
- package/common/cpp/audioapi/core/sources/ConstantSourceNode.h +3 -1
- package/common/cpp/audioapi/core/sources/OscillatorNode.cpp +12 -23
- package/common/cpp/audioapi/core/sources/OscillatorNode.h +6 -4
- package/common/cpp/audioapi/core/sources/RecorderAdapterNode.cpp +43 -16
- package/common/cpp/audioapi/core/sources/RecorderAdapterNode.h +22 -17
- package/common/cpp/audioapi/core/sources/StreamerNode.cpp +104 -87
- package/common/cpp/audioapi/core/sources/StreamerNode.h +69 -33
- package/common/cpp/audioapi/core/sources/WorkletSourceNode.cpp +5 -7
- package/common/cpp/audioapi/core/sources/WorkletSourceNode.h +15 -13
- package/common/cpp/audioapi/core/types/AudioFormat.h +1 -11
- package/common/cpp/audioapi/core/utils/AudioDecoder.h +15 -6
- package/common/cpp/audioapi/core/utils/AudioFileWriter.cpp +41 -0
- package/common/cpp/audioapi/core/utils/AudioFileWriter.h +43 -0
- package/common/cpp/audioapi/core/utils/AudioNodeDestructor.cpp +5 -6
- package/common/cpp/audioapi/core/utils/AudioNodeDestructor.h +7 -10
- package/common/cpp/audioapi/core/utils/AudioNodeManager.cpp +17 -19
- package/common/cpp/audioapi/core/utils/AudioNodeManager.h +8 -11
- package/common/cpp/audioapi/core/utils/AudioParamEventQueue.cpp +3 -3
- package/common/cpp/audioapi/core/utils/AudioParamEventQueue.h +5 -5
- package/common/cpp/audioapi/core/utils/AudioRecorderCallback.cpp +101 -0
- package/common/cpp/audioapi/core/utils/AudioRecorderCallback.h +51 -0
- package/common/cpp/audioapi/core/utils/AudioStretcher.cpp +6 -6
- package/common/cpp/audioapi/core/utils/Constants.h +7 -3
- package/common/cpp/audioapi/core/utils/ParamChangeEvent.cpp +1 -0
- package/common/cpp/audioapi/core/utils/ParamChangeEvent.h +9 -9
- package/common/cpp/audioapi/core/utils/worklets/SafeIncludes.h +33 -34
- package/common/cpp/audioapi/core/utils/worklets/WorkletsRunner.cpp +17 -19
- package/common/cpp/audioapi/core/utils/worklets/WorkletsRunner.h +23 -19
- package/common/cpp/audioapi/dsp/AudioUtils.cpp +4 -10
- package/common/cpp/audioapi/dsp/AudioUtils.h +1 -1
- package/common/cpp/audioapi/dsp/Convolver.cpp +201 -0
- package/common/cpp/audioapi/dsp/Convolver.h +47 -0
- package/common/cpp/audioapi/dsp/FFT.cpp +1 -27
- package/common/cpp/audioapi/dsp/FFT.h +19 -3
- package/common/cpp/audioapi/dsp/VectorMath.cpp +24 -58
- package/common/cpp/audioapi/dsp/VectorMath.h +35 -8
- package/common/cpp/audioapi/dsp/Windows.cpp +4 -9
- package/common/cpp/audioapi/dsp/Windows.h +24 -23
- package/common/cpp/audioapi/events/AudioEventHandlerRegistry.cpp +12 -17
- package/common/cpp/audioapi/events/AudioEventHandlerRegistry.h +45 -40
- package/common/cpp/audioapi/events/IAudioEventHandlerRegistry.h +15 -7
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/avcodec.h +4 -4
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/codec.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/codec_desc.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/codec_id.h +3 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/codec_par.h +2 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/defs.h +3 -0
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/packet.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/smpte_436m.h +254 -0
- package/common/cpp/audioapi/external/ffmpeg_include/libavcodec/version.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavformat/avformat.h +6 -6
- package/common/cpp/audioapi/external/ffmpeg_include/libavformat/version.h +2 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavformat/version_major.h +2 -0
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/avassert.h +5 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/avutil.h +2 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/channel_layout.h +2 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/csp.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/dict.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/ffversion.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/film_grain_params.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/frame.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/hdr_dynamic_vivid_metadata.h +3 -3
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/hwcontext.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/hwcontext_opencl.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/hwcontext_qsv.h +0 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/hwcontext_vulkan.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/iamf.h +2 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/lfg.h +2 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/log.h +2 -2
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/mathematics.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/opt.h +4 -4
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/rational.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/rc4.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/refstruct.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/spherical.h +6 -0
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/tdrdi.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/tx.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/version.h +3 -3
- package/common/cpp/audioapi/external/ffmpeg_include/libavutil/video_hint.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libswresample/swresample.h +1 -1
- package/common/cpp/audioapi/external/ffmpeg_include/libswresample/version.h +1 -1
- package/common/cpp/audioapi/external/{libavcodec.xcframework → ffmpeg_ios/libavcodec.xcframework}/ios-arm64/libavcodec.framework/libavcodec +0 -0
- package/common/cpp/audioapi/external/{libavcodec.xcframework → ffmpeg_ios/libavcodec.xcframework}/ios-arm64_x86_64-simulator/libavcodec.framework/libavcodec +0 -0
- package/common/cpp/audioapi/external/{libavformat.xcframework → ffmpeg_ios/libavformat.xcframework}/ios-arm64/libavformat.framework/libavformat +0 -0
- package/common/cpp/audioapi/external/{libavformat.xcframework → ffmpeg_ios/libavformat.xcframework}/ios-arm64_x86_64-simulator/libavformat.framework/libavformat +0 -0
- package/common/cpp/audioapi/external/{libavutil.xcframework → ffmpeg_ios/libavutil.xcframework}/ios-arm64/libavutil.framework/libavutil +0 -0
- package/common/cpp/audioapi/external/{libavutil.xcframework → ffmpeg_ios/libavutil.xcframework}/ios-arm64_x86_64-simulator/libavutil.framework/libavutil +0 -0
- package/common/cpp/audioapi/external/{libswresample.xcframework → ffmpeg_ios/libswresample.xcframework}/ios-arm64/libswresample.framework/libswresample +0 -0
- package/common/cpp/audioapi/external/{libswresample.xcframework → ffmpeg_ios/libswresample.xcframework}/ios-arm64_x86_64-simulator/libswresample.framework/libswresample +0 -0
- package/common/cpp/audioapi/jsi/AudioArrayBuffer.h +4 -5
- package/common/cpp/audioapi/jsi/JsiHostObject.cpp +11 -13
- package/common/cpp/audioapi/jsi/JsiHostObject.h +26 -33
- package/common/cpp/audioapi/jsi/JsiPromise.cpp +34 -67
- package/common/cpp/audioapi/jsi/JsiPromise.h +65 -26
- package/common/cpp/audioapi/jsi/RuntimeLifecycleMonitor.cpp +7 -10
- package/common/cpp/audioapi/jsi/RuntimeLifecycleMonitor.h +1 -3
- package/common/cpp/audioapi/libs/ffmpeg/FFmpegDecoding.cpp +4 -3
- package/common/cpp/audioapi/libs/ffmpeg/relinking.md +24 -0
- package/common/cpp/audioapi/utils/AlignedAllocator.hpp +50 -0
- package/common/cpp/audioapi/utils/AudioArray.cpp +3 -8
- package/common/cpp/audioapi/utils/AudioArray.h +3 -11
- package/common/cpp/audioapi/utils/AudioBus.cpp +79 -149
- package/common/cpp/audioapi/utils/AudioBus.h +17 -14
- package/common/cpp/audioapi/utils/AudioFileProperties.cpp +92 -0
- package/common/cpp/audioapi/utils/AudioFileProperties.h +76 -0
- package/common/cpp/audioapi/utils/CircularAudioArray.cpp +6 -18
- package/common/cpp/audioapi/utils/CircularOverflowableAudioArray.cpp +6 -10
- package/common/cpp/audioapi/utils/CircularOverflowableAudioArray.h +2 -2
- package/common/cpp/audioapi/utils/Result.hpp +286 -0
- package/common/cpp/audioapi/utils/ThreadPool.hpp +59 -1
- package/common/cpp/audioapi/utils/UnitConversion.h +9 -0
- package/common/cpp/test/CMakeLists.txt +20 -14
- package/common/cpp/test/src/AudioParamTest.cpp +4 -3
- package/common/cpp/test/src/AudioScheduledSourceTest.cpp +113 -0
- package/common/cpp/test/src/ConstantSourceTest.cpp +5 -7
- package/common/cpp/test/src/DelayTest.cpp +108 -0
- package/common/cpp/test/src/GainTest.cpp +4 -5
- package/common/cpp/test/src/IIRFilterTest.cpp +153 -0
- package/common/cpp/test/src/MockAudioEventHandlerRegistry.h +19 -11
- package/common/cpp/test/src/OscillatorTest.cpp +2 -1
- package/common/cpp/test/src/StereoPannerTest.cpp +6 -9
- package/common/cpp/test/src/biquad/BiquadFilterChromium.cpp +372 -0
- package/common/cpp/test/src/biquad/BiquadFilterChromium.h +65 -0
- package/common/cpp/test/src/biquad/BiquadFilterTest.cpp +272 -0
- package/common/cpp/test/src/biquad/BiquadFilterTest.h +47 -0
- package/ios/audioapi/ios/AudioAPIModule.h +2 -1
- package/ios/audioapi/ios/AudioAPIModule.mm +44 -20
- package/ios/audioapi/ios/core/IOSAudioPlayer.h +2 -2
- package/ios/audioapi/ios/core/IOSAudioPlayer.mm +7 -6
- package/ios/audioapi/ios/core/IOSAudioRecorder.h +26 -18
- package/ios/audioapi/ios/core/IOSAudioRecorder.mm +193 -53
- package/ios/audioapi/ios/core/NativeAudioPlayer.m +16 -13
- package/ios/audioapi/ios/core/NativeAudioRecorder.h +4 -0
- package/ios/audioapi/ios/core/NativeAudioRecorder.m +42 -7
- package/ios/audioapi/ios/core/utils/AudioDecoder.mm +21 -4
- package/ios/audioapi/ios/core/utils/FileOptions.h +31 -0
- package/ios/audioapi/ios/core/utils/FileOptions.mm +177 -0
- package/ios/audioapi/ios/core/{IOSAudioFileWriter.h → utils/IOSFileWriter.h} +16 -14
- package/ios/audioapi/ios/core/utils/IOSFileWriter.mm +224 -0
- package/ios/audioapi/ios/core/{IOSRecorderCallback.h → utils/IOSRecorderCallback.h} +7 -17
- package/ios/audioapi/ios/core/utils/IOSRecorderCallback.mm +172 -0
- package/ios/audioapi/ios/system/AudioEngine.h +19 -16
- package/ios/audioapi/ios/system/AudioEngine.mm +101 -134
- package/ios/audioapi/ios/system/AudioSessionManager.h +25 -11
- package/ios/audioapi/ios/system/AudioSessionManager.mm +273 -202
- package/ios/audioapi/ios/system/LockScreenManager.mm +39 -23
- package/ios/audioapi/ios/system/NotificationManager.mm +37 -52
- package/lib/commonjs/AudioAPIModule/AudioAPIModule.js +90 -0
- package/lib/commonjs/AudioAPIModule/AudioAPIModule.js.map +1 -0
- package/lib/commonjs/AudioAPIModule/globals.d.js +6 -0
- package/lib/commonjs/AudioAPIModule/globals.d.js.map +1 -0
- package/lib/commonjs/AudioAPIModule/index.js +14 -0
- package/lib/commonjs/AudioAPIModule/index.js.map +1 -0
- package/lib/commonjs/api.js +18 -12
- package/lib/commonjs/api.js.map +1 -1
- package/lib/commonjs/api.web.js +8 -0
- package/lib/commonjs/api.web.js.map +1 -1
- package/lib/commonjs/core/AudioBufferBaseSourceNode.js +3 -0
- package/lib/commonjs/core/AudioBufferBaseSourceNode.js.map +1 -1
- package/lib/commonjs/core/AudioBufferQueueSourceNode.js +5 -2
- package/lib/commonjs/core/AudioBufferQueueSourceNode.js.map +1 -1
- package/lib/commonjs/core/AudioContext.js +5 -8
- package/lib/commonjs/core/AudioContext.js.map +1 -1
- package/lib/commonjs/core/AudioNode.js +1 -1
- package/lib/commonjs/core/AudioNode.js.map +1 -1
- package/lib/commonjs/core/AudioParam.js +18 -11
- package/lib/commonjs/core/AudioParam.js.map +1 -1
- package/lib/commonjs/core/AudioRecorder.js +43 -55
- package/lib/commonjs/core/AudioRecorder.js.map +1 -1
- package/lib/commonjs/core/BaseAudioContext.js +61 -30
- package/lib/commonjs/core/BaseAudioContext.js.map +1 -1
- package/lib/commonjs/core/ConvolverNode.js +37 -0
- package/lib/commonjs/core/ConvolverNode.js.map +1 -0
- package/lib/commonjs/core/DelayNode.js +17 -0
- package/lib/commonjs/core/DelayNode.js.map +1 -0
- package/lib/commonjs/core/IIRFilterNode.js +19 -0
- package/lib/commonjs/core/IIRFilterNode.js.map +1 -0
- package/lib/commonjs/core/OfflineAudioContext.js +3 -6
- package/lib/commonjs/core/OfflineAudioContext.js.map +1 -1
- package/lib/commonjs/plugin/withAudioAPI.js +46 -0
- package/lib/commonjs/plugin/withAudioAPI.js.map +1 -1
- package/lib/commonjs/specs/NativeAudioAPIModule.js.map +1 -1
- package/lib/commonjs/system/AudioManager.js +4 -7
- package/lib/commonjs/system/AudioManager.js.map +1 -1
- package/lib/commonjs/types.js +16 -23
- package/lib/commonjs/types.js.map +1 -1
- package/lib/commonjs/utils/filePresets.js +43 -0
- package/lib/commonjs/utils/filePresets.js.map +1 -0
- package/lib/commonjs/utils/index.js +12 -27
- package/lib/commonjs/utils/index.js.map +1 -1
- package/lib/commonjs/web-core/AudioContext.js +21 -1
- package/lib/commonjs/web-core/AudioContext.js.map +1 -1
- package/lib/commonjs/web-core/ConvolverNode.js +40 -0
- package/lib/commonjs/web-core/ConvolverNode.js.map +1 -0
- package/lib/commonjs/web-core/ConvolverNodeOptions.js +6 -0
- package/lib/commonjs/web-core/ConvolverNodeOptions.js.map +1 -0
- package/lib/commonjs/web-core/DelayNode.js +17 -0
- package/lib/commonjs/web-core/DelayNode.js.map +1 -0
- package/lib/commonjs/web-core/IIRFilterNode.js +19 -0
- package/lib/commonjs/web-core/IIRFilterNode.js.map +1 -0
- package/lib/commonjs/web-core/OfflineAudioContext.js +20 -0
- package/lib/commonjs/web-core/OfflineAudioContext.js.map +1 -1
- package/lib/module/AudioAPIModule/AudioAPIModule.js +87 -0
- package/lib/module/AudioAPIModule/AudioAPIModule.js.map +1 -0
- package/lib/module/AudioAPIModule/globals.d.js +4 -0
- package/lib/module/AudioAPIModule/globals.d.js.map +1 -0
- package/lib/module/AudioAPIModule/index.js +4 -0
- package/lib/module/AudioAPIModule/index.js.map +1 -0
- package/lib/module/api.js +3 -12
- package/lib/module/api.js.map +1 -1
- package/lib/module/api.web.js +1 -0
- package/lib/module/api.web.js.map +1 -1
- package/lib/module/core/AudioBufferBaseSourceNode.js +3 -0
- package/lib/module/core/AudioBufferBaseSourceNode.js.map +1 -1
- package/lib/module/core/AudioBufferQueueSourceNode.js +5 -2
- package/lib/module/core/AudioBufferQueueSourceNode.js.map +1 -1
- package/lib/module/core/AudioContext.js +5 -8
- package/lib/module/core/AudioContext.js.map +1 -1
- package/lib/module/core/AudioNode.js +1 -1
- package/lib/module/core/AudioNode.js.map +1 -1
- package/lib/module/core/AudioParam.js +18 -11
- package/lib/module/core/AudioParam.js.map +1 -1
- package/lib/module/core/AudioRecorder.js +44 -56
- package/lib/module/core/AudioRecorder.js.map +1 -1
- package/lib/module/core/BaseAudioContext.js +63 -32
- package/lib/module/core/BaseAudioContext.js.map +1 -1
- package/lib/module/core/ConvolverNode.js +31 -0
- package/lib/module/core/ConvolverNode.js.map +1 -0
- package/lib/module/core/DelayNode.js +11 -0
- package/lib/module/core/DelayNode.js.map +1 -0
- package/lib/module/core/IIRFilterNode.js +13 -0
- package/lib/module/core/IIRFilterNode.js.map +1 -0
- package/lib/module/core/OfflineAudioContext.js +3 -6
- package/lib/module/core/OfflineAudioContext.js.map +1 -1
- package/lib/module/plugin/withAudioAPI.js +47 -1
- package/lib/module/plugin/withAudioAPI.js.map +1 -1
- package/lib/module/specs/NativeAudioAPIModule.js.map +1 -1
- package/lib/module/system/AudioManager.js +4 -7
- package/lib/module/system/AudioManager.js.map +1 -1
- package/lib/module/types.js +15 -22
- package/lib/module/types.js.map +1 -1
- package/lib/module/utils/filePresets.js +39 -0
- package/lib/module/utils/filePresets.js.map +1 -0
- package/lib/module/utils/index.js +10 -10
- package/lib/module/utils/index.js.map +1 -1
- package/lib/module/web-core/AudioContext.js +21 -1
- package/lib/module/web-core/AudioContext.js.map +1 -1
- package/lib/module/web-core/ConvolverNode.js +34 -0
- package/lib/module/web-core/ConvolverNode.js.map +1 -0
- package/lib/module/web-core/ConvolverNodeOptions.js +4 -0
- package/lib/module/web-core/ConvolverNodeOptions.js.map +1 -0
- package/lib/module/web-core/DelayNode.js +11 -0
- package/lib/module/web-core/DelayNode.js.map +1 -0
- package/lib/module/web-core/IIRFilterNode.js +13 -0
- package/lib/module/web-core/IIRFilterNode.js.map +1 -0
- package/lib/module/web-core/OfflineAudioContext.js +20 -0
- package/lib/module/web-core/OfflineAudioContext.js.map +1 -1
- package/lib/typescript/AudioAPIModule/AudioAPIModule.d.ts +36 -0
- package/lib/typescript/AudioAPIModule/AudioAPIModule.d.ts.map +1 -0
- package/lib/typescript/AudioAPIModule/index.d.ts +2 -0
- package/lib/typescript/AudioAPIModule/index.d.ts.map +1 -0
- package/lib/typescript/api.d.ts +3 -9
- package/lib/typescript/api.d.ts.map +1 -1
- package/lib/typescript/api.web.d.ts +1 -0
- package/lib/typescript/api.web.d.ts.map +1 -1
- package/lib/typescript/core/AudioBufferBaseSourceNode.d.ts +1 -0
- package/lib/typescript/core/AudioBufferBaseSourceNode.d.ts.map +1 -1
- package/lib/typescript/core/AudioBufferQueueSourceNode.d.ts +1 -1
- package/lib/typescript/core/AudioBufferQueueSourceNode.d.ts.map +1 -1
- package/lib/typescript/core/AudioContext.d.ts +1 -1
- package/lib/typescript/core/AudioContext.d.ts.map +1 -1
- package/lib/typescript/core/AudioNode.d.ts +2 -1
- package/lib/typescript/core/AudioNode.d.ts.map +1 -1
- package/lib/typescript/core/AudioParam.d.ts.map +1 -1
- package/lib/typescript/core/AudioRecorder.d.ts +13 -6
- package/lib/typescript/core/AudioRecorder.d.ts.map +1 -1
- package/lib/typescript/core/BaseAudioContext.d.ts +9 -3
- package/lib/typescript/core/BaseAudioContext.d.ts.map +1 -1
- package/lib/typescript/core/ConvolverNode.d.ts +12 -0
- package/lib/typescript/core/ConvolverNode.d.ts.map +1 -0
- package/lib/typescript/core/DelayNode.d.ts +9 -0
- package/lib/typescript/core/DelayNode.d.ts.map +1 -0
- package/lib/typescript/core/IIRFilterNode.d.ts +5 -0
- package/lib/typescript/core/IIRFilterNode.d.ts.map +1 -0
- package/lib/typescript/core/OfflineAudioContext.d.ts +1 -1
- package/lib/typescript/core/OfflineAudioContext.d.ts.map +1 -1
- package/lib/typescript/events/types.d.ts +4 -0
- package/lib/typescript/events/types.d.ts.map +1 -1
- package/lib/typescript/interfaces.d.ts +34 -34
- package/lib/typescript/interfaces.d.ts.map +1 -1
- package/lib/typescript/plugin/withAudioAPI.d.ts +1 -0
- package/lib/typescript/plugin/withAudioAPI.d.ts.map +1 -1
- package/lib/typescript/specs/NativeAudioAPIModule.d.ts +2 -1
- package/lib/typescript/specs/NativeAudioAPIModule.d.ts.map +1 -1
- package/lib/typescript/system/AudioManager.d.ts +3 -2
- package/lib/typescript/system/AudioManager.d.ts.map +1 -1
- package/lib/typescript/types.d.ts +42 -34
- package/lib/typescript/types.d.ts.map +1 -1
- package/lib/typescript/utils/filePresets.d.ts +9 -0
- package/lib/typescript/utils/filePresets.d.ts.map +1 -0
- package/lib/typescript/utils/index.d.ts +1 -8
- package/lib/typescript/utils/index.d.ts.map +1 -1
- package/lib/typescript/web-core/AudioContext.d.ts +9 -2
- package/lib/typescript/web-core/AudioContext.d.ts.map +1 -1
- package/lib/typescript/web-core/BaseAudioContext.d.ts +7 -1
- package/lib/typescript/web-core/BaseAudioContext.d.ts.map +1 -1
- package/lib/typescript/web-core/ConvolverNode.d.ts +11 -0
- package/lib/typescript/web-core/ConvolverNode.d.ts.map +1 -0
- package/lib/typescript/web-core/ConvolverNodeOptions.d.ts +6 -0
- package/lib/typescript/web-core/ConvolverNodeOptions.d.ts.map +1 -0
- package/lib/typescript/web-core/DelayNode.d.ts +8 -0
- package/lib/typescript/web-core/DelayNode.d.ts.map +1 -0
- package/lib/typescript/web-core/IIRFilterNode.d.ts +5 -0
- package/lib/typescript/web-core/IIRFilterNode.d.ts.map +1 -0
- package/lib/typescript/web-core/OfflineAudioContext.d.ts +8 -1
- package/lib/typescript/web-core/OfflineAudioContext.d.ts.map +1 -1
- package/package.json +11 -4
- package/scripts/download-prebuilt-binaries.sh +61 -0
- package/scripts/rnaa_utils.rb +8 -0
- package/scripts/validate-worklets-version.js +27 -0
- package/src/AudioAPIModule/AudioAPIModule.ts +122 -0
- package/src/AudioAPIModule/globals.d.ts +33 -0
- package/src/AudioAPIModule/index.ts +1 -0
- package/src/api.ts +4 -52
- package/src/api.web.ts +1 -0
- package/src/core/AudioBufferBaseSourceNode.ts +8 -0
- package/src/core/AudioBufferQueueSourceNode.ts +8 -2
- package/src/core/AudioContext.ts +5 -8
- package/src/core/AudioNode.ts +4 -3
- package/src/core/AudioParam.ts +18 -11
- package/src/core/AudioRecorder.ts +63 -78
- package/src/core/BaseAudioContext.ts +120 -54
- package/src/core/ConvolverNode.ts +35 -0
- package/src/core/DelayNode.ts +13 -0
- package/src/core/IIRFilterNode.ts +25 -0
- package/src/core/OfflineAudioContext.ts +4 -7
- package/src/events/types.ts +5 -0
- package/src/interfaces.ts +51 -34
- package/src/plugin/withAudioAPI.ts +61 -0
- package/src/specs/NativeAudioAPIModule.ts +3 -2
- package/src/system/AudioManager.ts +13 -19
- package/src/types.ts +45 -36
- package/src/utils/filePresets.ts +47 -0
- package/src/utils/index.ts +13 -19
- package/src/web-core/AudioContext.tsx +40 -1
- package/src/web-core/BaseAudioContext.tsx +11 -1
- package/src/web-core/ConvolverNode.tsx +43 -0
- package/src/web-core/ConvolverNodeOptions.tsx +6 -0
- package/src/web-core/DelayNode.tsx +12 -0
- package/src/web-core/IIRFilterNode.tsx +25 -0
- package/src/web-core/OfflineAudioContext.tsx +39 -0
- package/android/src/main/cpp/audioapi/android/core/utils/FileUtils.h +0 -34
- package/android/src/main/cpp/audioapi/android/core/utils/FileUtilts.cpp +0 -133
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/FFmpegAudioFileOptions.cpp +0 -154
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/FFmpegAudioFileOptions.h +0 -41
- package/android/src/main/cpp/audioapi/android/core/utils/miniaudioBackend/MiniAudioFileOptions.cpp +0 -47
- package/android/src/main/cpp/audioapi/android/core/utils/miniaudioBackend/MiniAudioFileOptions.h +0 -28
- package/common/cpp/audioapi/libs/ffmpeg/INSTRUCTIONS.md +0 -32
- package/common/cpp/audioapi/libs/ffmpeg/create_xcframework.sh +0 -111
- package/common/cpp/audioapi/libs/ffmpeg/ffmpeg_setup.sh +0 -391
- package/ios/audioapi/ios/core/IOSAudioFileOptions.h +0 -36
- package/ios/audioapi/ios/core/IOSAudioFileOptions.mm +0 -140
- package/ios/audioapi/ios/core/IOSAudioFileWriter.mm +0 -223
- package/ios/audioapi/ios/core/IOSRecorderCallback.mm +0 -189
- package/lib/commonjs/utils/bitEnums.js +0 -33
- package/lib/commonjs/utils/bitEnums.js.map +0 -1
- package/lib/module/utils/bitEnums.js +0 -27
- package/lib/module/utils/bitEnums.js.map +0 -1
- package/lib/typescript/utils/bitEnums.d.ts +0 -4
- package/lib/typescript/utils/bitEnums.d.ts.map +0 -1
- package/metro-config/index.d.ts +0 -5
- package/metro-config/index.js +0 -41
- package/metro-config/tsconfig.json +0 -3
- package/src/utils/bitEnums.ts +0 -51
- package/common/cpp/audioapi/external/{libavcodec.xcframework → ffmpeg_ios/libavcodec.xcframework}/Info.plist +5 -5
- package/common/cpp/audioapi/external/{libavcodec.xcframework → ffmpeg_ios/libavcodec.xcframework}/ios-arm64/libavcodec.framework/Info.plist +0 -0
- package/common/cpp/audioapi/external/{libavcodec.xcframework → ffmpeg_ios/libavcodec.xcframework}/ios-arm64_x86_64-simulator/libavcodec.framework/Info.plist +0 -0
- package/common/cpp/audioapi/external/{libavformat.xcframework → ffmpeg_ios/libavformat.xcframework}/Info.plist +0 -0
- package/common/cpp/audioapi/external/{libavformat.xcframework → ffmpeg_ios/libavformat.xcframework}/ios-arm64/libavformat.framework/Info.plist +0 -0
- package/common/cpp/audioapi/external/{libavformat.xcframework → ffmpeg_ios/libavformat.xcframework}/ios-arm64_x86_64-simulator/libavformat.framework/Info.plist +0 -0
- package/common/cpp/audioapi/external/{libavutil.xcframework → ffmpeg_ios/libavutil.xcframework}/Info.plist +5 -5
- package/common/cpp/audioapi/external/{libavutil.xcframework → ffmpeg_ios/libavutil.xcframework}/ios-arm64/libavutil.framework/Info.plist +0 -0
- package/common/cpp/audioapi/external/{libavutil.xcframework → ffmpeg_ios/libavutil.xcframework}/ios-arm64_x86_64-simulator/libavutil.framework/Info.plist +0 -0
- package/common/cpp/audioapi/external/{libswresample.xcframework → ffmpeg_ios/libswresample.xcframework}/Info.plist +5 -5
- /package/common/cpp/audioapi/external/{libswresample.xcframework → ffmpeg_ios/libswresample.xcframework}/ios-arm64/libswresample.framework/Info.plist +0 -0
- /package/common/cpp/audioapi/external/{libswresample.xcframework → ffmpeg_ios/libswresample.xcframework}/ios-arm64_x86_64-simulator/libswresample.framework/Info.plist +0 -0
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
#include <audioapi/dsp/VectorMath.h>
|
|
3
3
|
#include <audioapi/utils/AudioArray.h>
|
|
4
4
|
#include <audioapi/utils/AudioBus.h>
|
|
5
|
+
#include <algorithm>
|
|
6
|
+
#include <memory>
|
|
7
|
+
#include <utility>
|
|
8
|
+
#include <vector>
|
|
5
9
|
|
|
6
10
|
// Implementation of channel summing/mixing is based on the WebKit approach,
|
|
7
11
|
// source:
|
|
@@ -16,9 +20,7 @@ namespace audioapi {
|
|
|
16
20
|
*/
|
|
17
21
|
|
|
18
22
|
AudioBus::AudioBus(size_t size, int numberOfChannels, float sampleRate)
|
|
19
|
-
: numberOfChannels_(numberOfChannels),
|
|
20
|
-
sampleRate_(sampleRate),
|
|
21
|
-
size_(size) {
|
|
23
|
+
: numberOfChannels_(numberOfChannels), sampleRate_(sampleRate), size_(size) {
|
|
22
24
|
createChannels();
|
|
23
25
|
}
|
|
24
26
|
|
|
@@ -34,6 +36,34 @@ AudioBus::AudioBus(const AudioBus &other) {
|
|
|
34
36
|
}
|
|
35
37
|
}
|
|
36
38
|
|
|
39
|
+
AudioBus::AudioBus(AudioBus &&other) noexcept
|
|
40
|
+
: channels_(std::move(other.channels_)),
|
|
41
|
+
numberOfChannels_(other.numberOfChannels_),
|
|
42
|
+
sampleRate_(other.sampleRate_),
|
|
43
|
+
size_(other.size_) {
|
|
44
|
+
other.numberOfChannels_ = 0;
|
|
45
|
+
other.sampleRate_ = 0.0f;
|
|
46
|
+
other.size_ = 0;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
AudioBus &AudioBus::operator=(const AudioBus &other) {
|
|
50
|
+
if (this == &other) {
|
|
51
|
+
return *this;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
numberOfChannels_ = other.numberOfChannels_;
|
|
55
|
+
sampleRate_ = other.sampleRate_;
|
|
56
|
+
size_ = other.size_;
|
|
57
|
+
|
|
58
|
+
createChannels();
|
|
59
|
+
|
|
60
|
+
for (int i = 0; i < numberOfChannels_; i += 1) {
|
|
61
|
+
channels_[i] = std::make_shared<AudioArray>(*other.channels_[i]);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
return *this;
|
|
65
|
+
}
|
|
66
|
+
|
|
37
67
|
AudioBus::~AudioBus() {
|
|
38
68
|
channels_.clear();
|
|
39
69
|
}
|
|
@@ -182,9 +212,7 @@ float AudioBus::maxAbsValue() const {
|
|
|
182
212
|
return maxAbsValue;
|
|
183
213
|
}
|
|
184
214
|
|
|
185
|
-
void AudioBus::sum(
|
|
186
|
-
const AudioBus *source,
|
|
187
|
-
ChannelInterpretation interpretation) {
|
|
215
|
+
void AudioBus::sum(const AudioBus *source, ChannelInterpretation interpretation) {
|
|
188
216
|
sum(source, 0, 0, getSize(), interpretation);
|
|
189
217
|
}
|
|
190
218
|
|
|
@@ -228,8 +256,7 @@ void AudioBus::sum(
|
|
|
228
256
|
|
|
229
257
|
// Source and destination channel counts are the same. Just sum the channels.
|
|
230
258
|
for (int i = 0; i < numberOfChannels_; i += 1) {
|
|
231
|
-
getChannel(i)->sum(
|
|
232
|
-
source->getChannel(i), sourceStart, destinationStart, length);
|
|
259
|
+
getChannel(i)->sum(source->getChannel(i), sourceStart, destinationStart, length);
|
|
233
260
|
}
|
|
234
261
|
}
|
|
235
262
|
|
|
@@ -252,8 +279,7 @@ void AudioBus::copy(
|
|
|
252
279
|
|
|
253
280
|
if (source->getNumberOfChannels() == getNumberOfChannels()) {
|
|
254
281
|
for (int i = 0; i < getNumberOfChannels(); i += 1) {
|
|
255
|
-
getChannel(i)->copy(
|
|
256
|
-
source->getChannel(i), sourceStart, destinationStart, length);
|
|
282
|
+
getChannel(i)->copy(source->getChannel(i), sourceStart, destinationStart, length);
|
|
257
283
|
}
|
|
258
284
|
|
|
259
285
|
return;
|
|
@@ -285,15 +311,13 @@ void AudioBus::discreteSum(
|
|
|
285
311
|
size_t sourceStart,
|
|
286
312
|
size_t destinationStart,
|
|
287
313
|
size_t length) const {
|
|
288
|
-
int numberOfChannels =
|
|
289
|
-
std::min(getNumberOfChannels(), source->getNumberOfChannels());
|
|
314
|
+
int numberOfChannels = std::min(getNumberOfChannels(), source->getNumberOfChannels());
|
|
290
315
|
|
|
291
316
|
// In case of source > destination, we "down-mix" and drop the extra channels.
|
|
292
317
|
// In case of source < destination, we "up-mix" as many channels as we have,
|
|
293
318
|
// leaving the remaining channels untouched.
|
|
294
319
|
for (int i = 0; i < numberOfChannels; i++) {
|
|
295
|
-
getChannel(i)->sum(
|
|
296
|
-
source->getChannel(i), sourceStart, destinationStart, length);
|
|
320
|
+
getChannel(i)->sum(source->getChannel(i), sourceStart, destinationStart, length);
|
|
297
321
|
}
|
|
298
322
|
}
|
|
299
323
|
|
|
@@ -306,14 +330,11 @@ void AudioBus::sumByUpMixing(
|
|
|
306
330
|
int numberOfChannels = getNumberOfChannels();
|
|
307
331
|
|
|
308
332
|
// Mono to stereo (1 -> 2, 4)
|
|
309
|
-
if (numberOfSourceChannels == 1 &&
|
|
310
|
-
(numberOfChannels == 2 || numberOfChannels == 4)) {
|
|
333
|
+
if (numberOfSourceChannels == 1 && (numberOfChannels == 2 || numberOfChannels == 4)) {
|
|
311
334
|
AudioArray *sourceChannel = source->getChannelByType(ChannelMono);
|
|
312
335
|
|
|
313
|
-
getChannelByType(ChannelLeft)
|
|
314
|
-
|
|
315
|
-
getChannelByType(ChannelRight)
|
|
316
|
-
->sum(sourceChannel, sourceStart, destinationStart, length);
|
|
336
|
+
getChannelByType(ChannelLeft)->sum(sourceChannel, sourceStart, destinationStart, length);
|
|
337
|
+
getChannelByType(ChannelRight)->sum(sourceChannel, sourceStart, destinationStart, length);
|
|
317
338
|
return;
|
|
318
339
|
}
|
|
319
340
|
|
|
@@ -321,55 +342,30 @@ void AudioBus::sumByUpMixing(
|
|
|
321
342
|
if (numberOfSourceChannels == 1 && numberOfChannels == 6) {
|
|
322
343
|
AudioArray *sourceChannel = source->getChannel(0);
|
|
323
344
|
|
|
324
|
-
getChannelByType(ChannelCenter)
|
|
325
|
-
->sum(sourceChannel, sourceStart, destinationStart, length);
|
|
345
|
+
getChannelByType(ChannelCenter)->sum(sourceChannel, sourceStart, destinationStart, length);
|
|
326
346
|
return;
|
|
327
347
|
}
|
|
328
348
|
|
|
329
349
|
// Stereo 2 to stereo 4 or 5.1 (2 -> 4, 6)
|
|
330
|
-
if (numberOfSourceChannels == 2 &&
|
|
331
|
-
(numberOfChannels == 4 || numberOfChannels == 6)) {
|
|
350
|
+
if (numberOfSourceChannels == 2 && (numberOfChannels == 4 || numberOfChannels == 6)) {
|
|
332
351
|
getChannelByType(ChannelLeft)
|
|
333
|
-
->sum(
|
|
334
|
-
source->getChannelByType(ChannelLeft),
|
|
335
|
-
sourceStart,
|
|
336
|
-
destinationStart,
|
|
337
|
-
length);
|
|
352
|
+
->sum(source->getChannelByType(ChannelLeft), sourceStart, destinationStart, length);
|
|
338
353
|
getChannelByType(ChannelRight)
|
|
339
|
-
->sum(
|
|
340
|
-
source->getChannelByType(ChannelRight),
|
|
341
|
-
sourceStart,
|
|
342
|
-
destinationStart,
|
|
343
|
-
length);
|
|
354
|
+
->sum(source->getChannelByType(ChannelRight), sourceStart, destinationStart, length);
|
|
344
355
|
return;
|
|
345
356
|
}
|
|
346
357
|
|
|
347
358
|
// Stereo 4 to 5.1 (4 -> 6)
|
|
348
359
|
if (numberOfSourceChannels == 4 && numberOfChannels == 6) {
|
|
349
360
|
getChannelByType(ChannelLeft)
|
|
350
|
-
->sum(
|
|
351
|
-
source->getChannelByType(ChannelLeft),
|
|
352
|
-
sourceStart,
|
|
353
|
-
destinationStart,
|
|
354
|
-
length);
|
|
361
|
+
->sum(source->getChannelByType(ChannelLeft), sourceStart, destinationStart, length);
|
|
355
362
|
getChannelByType(ChannelRight)
|
|
356
|
-
->sum(
|
|
357
|
-
source->getChannelByType(ChannelRight),
|
|
358
|
-
sourceStart,
|
|
359
|
-
destinationStart,
|
|
360
|
-
length);
|
|
363
|
+
->sum(source->getChannelByType(ChannelRight), sourceStart, destinationStart, length);
|
|
361
364
|
getChannelByType(ChannelSurroundLeft)
|
|
362
|
-
->sum(
|
|
363
|
-
source->getChannelByType(ChannelSurroundLeft),
|
|
364
|
-
sourceStart,
|
|
365
|
-
destinationStart,
|
|
366
|
-
length);
|
|
365
|
+
->sum(source->getChannelByType(ChannelSurroundLeft), sourceStart, destinationStart, length);
|
|
367
366
|
getChannelByType(ChannelSurroundRight)
|
|
368
367
|
->sum(
|
|
369
|
-
source->getChannelByType(ChannelSurroundRight),
|
|
370
|
-
sourceStart,
|
|
371
|
-
destinationStart,
|
|
372
|
-
length);
|
|
368
|
+
source->getChannelByType(ChannelSurroundRight), sourceStart, destinationStart, length);
|
|
373
369
|
return;
|
|
374
370
|
}
|
|
375
371
|
|
|
@@ -392,15 +388,9 @@ void AudioBus::sumByDownMixing(
|
|
|
392
388
|
float *destinationData = getChannelByType(ChannelMono)->getData();
|
|
393
389
|
|
|
394
390
|
dsp::multiplyByScalarThenAddToOutput(
|
|
395
|
-
sourceLeft + sourceStart,
|
|
396
|
-
0.5f,
|
|
397
|
-
destinationData + destinationStart,
|
|
398
|
-
length);
|
|
391
|
+
sourceLeft + sourceStart, 0.5f, destinationData + destinationStart, length);
|
|
399
392
|
dsp::multiplyByScalarThenAddToOutput(
|
|
400
|
-
sourceRight + sourceStart,
|
|
401
|
-
0.5f,
|
|
402
|
-
destinationData + destinationStart,
|
|
403
|
-
length);
|
|
393
|
+
sourceRight + sourceStart, 0.5f, destinationData + destinationStart, length);
|
|
404
394
|
return;
|
|
405
395
|
}
|
|
406
396
|
|
|
@@ -410,33 +400,19 @@ void AudioBus::sumByDownMixing(
|
|
|
410
400
|
if (numberOfSourceChannels == 4 && numberOfChannels == 1) {
|
|
411
401
|
float *sourceLeft = source->getChannelByType(ChannelLeft)->getData();
|
|
412
402
|
float *sourceRight = source->getChannelByType(ChannelRight)->getData();
|
|
413
|
-
float *sourceSurroundLeft =
|
|
414
|
-
|
|
415
|
-
float *sourceSurroundRight =
|
|
416
|
-
source->getChannelByType(ChannelSurroundRight)->getData();
|
|
403
|
+
float *sourceSurroundLeft = source->getChannelByType(ChannelSurroundLeft)->getData();
|
|
404
|
+
float *sourceSurroundRight = source->getChannelByType(ChannelSurroundRight)->getData();
|
|
417
405
|
|
|
418
406
|
float *destinationData = getChannelByType(ChannelMono)->getData();
|
|
419
407
|
|
|
420
408
|
dsp::multiplyByScalarThenAddToOutput(
|
|
421
|
-
sourceLeft + sourceStart,
|
|
422
|
-
0.25f,
|
|
423
|
-
destinationData + destinationStart,
|
|
424
|
-
length);
|
|
409
|
+
sourceLeft + sourceStart, 0.25f, destinationData + destinationStart, length);
|
|
425
410
|
dsp::multiplyByScalarThenAddToOutput(
|
|
426
|
-
sourceRight + sourceStart,
|
|
427
|
-
0.25f,
|
|
428
|
-
destinationData + destinationStart,
|
|
429
|
-
length);
|
|
411
|
+
sourceRight + sourceStart, 0.25f, destinationData + destinationStart, length);
|
|
430
412
|
dsp::multiplyByScalarThenAddToOutput(
|
|
431
|
-
sourceSurroundLeft + sourceStart,
|
|
432
|
-
0.25f,
|
|
433
|
-
destinationData + destinationStart,
|
|
434
|
-
length);
|
|
413
|
+
sourceSurroundLeft + sourceStart, 0.25f, destinationData + destinationStart, length);
|
|
435
414
|
dsp::multiplyByScalarThenAddToOutput(
|
|
436
|
-
sourceSurroundRight + sourceStart,
|
|
437
|
-
0.25f,
|
|
438
|
-
destinationData + destinationStart,
|
|
439
|
-
length);
|
|
415
|
+
sourceSurroundRight + sourceStart, 0.25f, destinationData + destinationStart, length);
|
|
440
416
|
return;
|
|
441
417
|
}
|
|
442
418
|
|
|
@@ -447,38 +423,24 @@ void AudioBus::sumByDownMixing(
|
|
|
447
423
|
float *sourceLeft = source->getChannelByType(ChannelLeft)->getData();
|
|
448
424
|
float *sourceRight = source->getChannelByType(ChannelRight)->getData();
|
|
449
425
|
float *sourceCenter = source->getChannelByType(ChannelCenter)->getData();
|
|
450
|
-
float *sourceSurroundLeft =
|
|
451
|
-
|
|
452
|
-
float *sourceSurroundRight =
|
|
453
|
-
source->getChannelByType(ChannelSurroundRight)->getData();
|
|
426
|
+
float *sourceSurroundLeft = source->getChannelByType(ChannelSurroundLeft)->getData();
|
|
427
|
+
float *sourceSurroundRight = source->getChannelByType(ChannelSurroundRight)->getData();
|
|
454
428
|
|
|
455
429
|
float *destinationData = getChannelByType(ChannelMono)->getData();
|
|
456
430
|
|
|
457
431
|
dsp::multiplyByScalarThenAddToOutput(
|
|
458
|
-
sourceLeft + sourceStart,
|
|
459
|
-
SQRT_HALF,
|
|
460
|
-
destinationData + destinationStart,
|
|
461
|
-
length);
|
|
432
|
+
sourceLeft + sourceStart, SQRT_HALF, destinationData + destinationStart, length);
|
|
462
433
|
dsp::multiplyByScalarThenAddToOutput(
|
|
463
|
-
sourceRight + sourceStart,
|
|
464
|
-
SQRT_HALF,
|
|
465
|
-
destinationData + destinationStart,
|
|
466
|
-
length);
|
|
434
|
+
sourceRight + sourceStart, SQRT_HALF, destinationData + destinationStart, length);
|
|
467
435
|
dsp::add(
|
|
468
436
|
sourceCenter + sourceStart,
|
|
469
437
|
destinationData + destinationStart,
|
|
470
438
|
destinationData + destinationStart,
|
|
471
439
|
length);
|
|
472
440
|
dsp::multiplyByScalarThenAddToOutput(
|
|
473
|
-
sourceSurroundLeft + sourceStart,
|
|
474
|
-
0.5f,
|
|
475
|
-
destinationData + destinationStart,
|
|
476
|
-
length);
|
|
441
|
+
sourceSurroundLeft + sourceStart, 0.5f, destinationData + destinationStart, length);
|
|
477
442
|
dsp::multiplyByScalarThenAddToOutput(
|
|
478
|
-
sourceSurroundRight + sourceStart,
|
|
479
|
-
0.5f,
|
|
480
|
-
destinationData + destinationStart,
|
|
481
|
-
length);
|
|
443
|
+
sourceSurroundRight + sourceStart, 0.5f, destinationData + destinationStart, length);
|
|
482
444
|
|
|
483
445
|
return;
|
|
484
446
|
}
|
|
@@ -489,35 +451,21 @@ void AudioBus::sumByDownMixing(
|
|
|
489
451
|
if (numberOfSourceChannels == 4 && numberOfChannels == 2) {
|
|
490
452
|
float *sourceLeft = source->getChannelByType(ChannelLeft)->getData();
|
|
491
453
|
float *sourceRight = source->getChannelByType(ChannelRight)->getData();
|
|
492
|
-
float *sourceSurroundLeft =
|
|
493
|
-
|
|
494
|
-
float *sourceSurroundRight =
|
|
495
|
-
source->getChannelByType(ChannelSurroundRight)->getData();
|
|
454
|
+
float *sourceSurroundLeft = source->getChannelByType(ChannelSurroundLeft)->getData();
|
|
455
|
+
float *sourceSurroundRight = source->getChannelByType(ChannelSurroundRight)->getData();
|
|
496
456
|
|
|
497
457
|
float *destinationLeft = getChannelByType(ChannelLeft)->getData();
|
|
498
458
|
float *destinationRight = getChannelByType(ChannelRight)->getData();
|
|
499
459
|
|
|
500
460
|
dsp::multiplyByScalarThenAddToOutput(
|
|
501
|
-
sourceLeft + sourceStart,
|
|
502
|
-
0.5f,
|
|
503
|
-
destinationLeft + destinationStart,
|
|
504
|
-
length);
|
|
461
|
+
sourceLeft + sourceStart, 0.5f, destinationLeft + destinationStart, length);
|
|
505
462
|
dsp::multiplyByScalarThenAddToOutput(
|
|
506
|
-
sourceSurroundLeft + sourceStart,
|
|
507
|
-
0.5f,
|
|
508
|
-
destinationLeft + destinationStart,
|
|
509
|
-
length);
|
|
463
|
+
sourceSurroundLeft + sourceStart, 0.5f, destinationLeft + destinationStart, length);
|
|
510
464
|
|
|
511
465
|
dsp::multiplyByScalarThenAddToOutput(
|
|
512
|
-
sourceRight + sourceStart,
|
|
513
|
-
0.5f,
|
|
514
|
-
destinationRight + destinationStart,
|
|
515
|
-
length);
|
|
466
|
+
sourceRight + sourceStart, 0.5f, destinationRight + destinationStart, length);
|
|
516
467
|
dsp::multiplyByScalarThenAddToOutput(
|
|
517
|
-
sourceSurroundRight + sourceStart,
|
|
518
|
-
0.5f,
|
|
519
|
-
destinationRight + destinationStart,
|
|
520
|
-
length);
|
|
468
|
+
sourceSurroundRight + sourceStart, 0.5f, destinationRight + destinationStart, length);
|
|
521
469
|
return;
|
|
522
470
|
}
|
|
523
471
|
|
|
@@ -529,10 +477,8 @@ void AudioBus::sumByDownMixing(
|
|
|
529
477
|
float *sourceLeft = source->getChannelByType(ChannelLeft)->getData();
|
|
530
478
|
float *sourceRight = source->getChannelByType(ChannelRight)->getData();
|
|
531
479
|
float *sourceCenter = source->getChannelByType(ChannelCenter)->getData();
|
|
532
|
-
float *sourceSurroundLeft =
|
|
533
|
-
|
|
534
|
-
float *sourceSurroundRight =
|
|
535
|
-
source->getChannelByType(ChannelSurroundRight)->getData();
|
|
480
|
+
float *sourceSurroundLeft = source->getChannelByType(ChannelSurroundLeft)->getData();
|
|
481
|
+
float *sourceSurroundRight = source->getChannelByType(ChannelSurroundRight)->getData();
|
|
536
482
|
|
|
537
483
|
float *destinationLeft = getChannelByType(ChannelLeft)->getData();
|
|
538
484
|
float *destinationRight = getChannelByType(ChannelRight)->getData();
|
|
@@ -543,15 +489,9 @@ void AudioBus::sumByDownMixing(
|
|
|
543
489
|
destinationLeft + destinationStart,
|
|
544
490
|
length);
|
|
545
491
|
dsp::multiplyByScalarThenAddToOutput(
|
|
546
|
-
sourceCenter + sourceStart,
|
|
547
|
-
SQRT_HALF,
|
|
548
|
-
destinationLeft + destinationStart,
|
|
549
|
-
length);
|
|
492
|
+
sourceCenter + sourceStart, SQRT_HALF, destinationLeft + destinationStart, length);
|
|
550
493
|
dsp::multiplyByScalarThenAddToOutput(
|
|
551
|
-
sourceSurroundLeft + sourceStart,
|
|
552
|
-
SQRT_HALF,
|
|
553
|
-
destinationLeft + destinationStart,
|
|
554
|
-
length);
|
|
494
|
+
sourceSurroundLeft + sourceStart, SQRT_HALF, destinationLeft + destinationStart, length);
|
|
555
495
|
|
|
556
496
|
dsp::add(
|
|
557
497
|
sourceRight + sourceStart,
|
|
@@ -559,15 +499,9 @@ void AudioBus::sumByDownMixing(
|
|
|
559
499
|
destinationRight + destinationStart,
|
|
560
500
|
length);
|
|
561
501
|
dsp::multiplyByScalarThenAddToOutput(
|
|
562
|
-
sourceCenter + sourceStart,
|
|
563
|
-
SQRT_HALF,
|
|
564
|
-
destinationRight + destinationStart,
|
|
565
|
-
length);
|
|
502
|
+
sourceCenter + sourceStart, SQRT_HALF, destinationRight + destinationStart, length);
|
|
566
503
|
dsp::multiplyByScalarThenAddToOutput(
|
|
567
|
-
sourceSurroundRight + sourceStart,
|
|
568
|
-
SQRT_HALF,
|
|
569
|
-
destinationRight + destinationStart,
|
|
570
|
-
length);
|
|
504
|
+
sourceSurroundRight + sourceStart, SQRT_HALF, destinationRight + destinationStart, length);
|
|
571
505
|
return;
|
|
572
506
|
}
|
|
573
507
|
|
|
@@ -580,17 +514,13 @@ void AudioBus::sumByDownMixing(
|
|
|
580
514
|
float *sourceLeft = source->getChannelByType(ChannelLeft)->getData();
|
|
581
515
|
float *sourceRight = source->getChannelByType(ChannelRight)->getData();
|
|
582
516
|
float *sourceCenter = source->getChannelByType(ChannelCenter)->getData();
|
|
583
|
-
float *sourceSurroundLeft =
|
|
584
|
-
|
|
585
|
-
float *sourceSurroundRight =
|
|
586
|
-
source->getChannelByType(ChannelSurroundRight)->getData();
|
|
517
|
+
float *sourceSurroundLeft = source->getChannelByType(ChannelSurroundLeft)->getData();
|
|
518
|
+
float *sourceSurroundRight = source->getChannelByType(ChannelSurroundRight)->getData();
|
|
587
519
|
|
|
588
520
|
float *destinationLeft = getChannelByType(ChannelLeft)->getData();
|
|
589
521
|
float *destinationRight = getChannelByType(ChannelRight)->getData();
|
|
590
|
-
float *destinationSurroundLeft =
|
|
591
|
-
|
|
592
|
-
float *destinationSurroundRight =
|
|
593
|
-
getChannelByType(ChannelSurroundRight)->getData();
|
|
522
|
+
float *destinationSurroundLeft = getChannelByType(ChannelSurroundLeft)->getData();
|
|
523
|
+
float *destinationSurroundRight = getChannelByType(ChannelSurroundRight)->getData();
|
|
594
524
|
|
|
595
525
|
dsp::add(
|
|
596
526
|
sourceLeft + sourceStart,
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
#include <audioapi/core/types/ChannelInterpretation.h>
|
|
4
4
|
|
|
5
5
|
#include <algorithm>
|
|
6
|
+
#include <cstddef>
|
|
6
7
|
#include <memory>
|
|
7
8
|
#include <vector>
|
|
8
|
-
#include <cstddef>
|
|
9
9
|
|
|
10
10
|
namespace audioapi {
|
|
11
11
|
|
|
@@ -24,8 +24,11 @@ class AudioBus {
|
|
|
24
24
|
ChannelSurroundRight = 5,
|
|
25
25
|
};
|
|
26
26
|
|
|
27
|
+
explicit AudioBus() = default;
|
|
27
28
|
explicit AudioBus(size_t size, int numberOfChannels, float sampleRate);
|
|
28
29
|
AudioBus(const AudioBus &other);
|
|
30
|
+
AudioBus(AudioBus &&other) noexcept;
|
|
31
|
+
AudioBus &operator=(const AudioBus &other);
|
|
29
32
|
|
|
30
33
|
~AudioBus();
|
|
31
34
|
|
|
@@ -46,21 +49,24 @@ class AudioBus {
|
|
|
46
49
|
void zero();
|
|
47
50
|
void zero(size_t start, size_t length);
|
|
48
51
|
|
|
49
|
-
void sum(
|
|
50
|
-
|
|
52
|
+
void sum(
|
|
53
|
+
const AudioBus *source,
|
|
54
|
+
ChannelInterpretation interpretation = ChannelInterpretation::SPEAKERS);
|
|
55
|
+
void sum(
|
|
56
|
+
const AudioBus *source,
|
|
57
|
+
size_t start,
|
|
58
|
+
size_t length,
|
|
59
|
+
ChannelInterpretation interpretation = ChannelInterpretation::SPEAKERS);
|
|
51
60
|
void sum(
|
|
52
61
|
const AudioBus *source,
|
|
53
62
|
size_t sourceStart,
|
|
54
63
|
size_t destinationStart,
|
|
55
|
-
size_t length,
|
|
64
|
+
size_t length,
|
|
65
|
+
ChannelInterpretation interpretation = ChannelInterpretation::SPEAKERS);
|
|
56
66
|
|
|
57
67
|
void copy(const AudioBus *source);
|
|
58
68
|
void copy(const AudioBus *source, size_t start, size_t length);
|
|
59
|
-
void copy(
|
|
60
|
-
const AudioBus *source,
|
|
61
|
-
size_t sourceStart,
|
|
62
|
-
size_t destinationStart,
|
|
63
|
-
size_t length);
|
|
69
|
+
void copy(const AudioBus *source, size_t sourceStart, size_t destinationStart, size_t length);
|
|
64
70
|
|
|
65
71
|
private:
|
|
66
72
|
std::vector<std::shared_ptr<AudioArray>> channels_;
|
|
@@ -75,11 +81,8 @@ class AudioBus {
|
|
|
75
81
|
size_t sourceStart,
|
|
76
82
|
size_t destinationStart,
|
|
77
83
|
size_t length) const;
|
|
78
|
-
void
|
|
79
|
-
|
|
80
|
-
size_t sourceStart,
|
|
81
|
-
size_t destinationStart,
|
|
82
|
-
size_t length);
|
|
84
|
+
void
|
|
85
|
+
sumByUpMixing(const AudioBus *source, size_t sourceStart, size_t destinationStart, size_t length);
|
|
83
86
|
void sumByDownMixing(
|
|
84
87
|
const AudioBus *source,
|
|
85
88
|
size_t sourceStart,
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
#include <audioapi/utils/AudioFileProperties.h>
|
|
2
|
+
|
|
3
|
+
#include <audioapi/jsi/JsiHostObject.h>
|
|
4
|
+
#include <jsi/jsi.h>
|
|
5
|
+
#include <algorithm>
|
|
6
|
+
#include <memory>
|
|
7
|
+
#include <string>
|
|
8
|
+
|
|
9
|
+
namespace audioapi {
|
|
10
|
+
|
|
11
|
+
AudioFileProperties::AudioFileProperties(
|
|
12
|
+
FileDirectory directory,
|
|
13
|
+
const std::string &subDirectory,
|
|
14
|
+
const std::string &fileNamePrefix,
|
|
15
|
+
int channelCount,
|
|
16
|
+
size_t batchDurationSeconds,
|
|
17
|
+
Format format,
|
|
18
|
+
float sampleRate,
|
|
19
|
+
size_t bitRate,
|
|
20
|
+
BitDepth bitDepth,
|
|
21
|
+
int flacCompressionLevel,
|
|
22
|
+
int androidFlushIntervalMs,
|
|
23
|
+
IOSAudioQuality iosAudioQuality)
|
|
24
|
+
: directory(directory),
|
|
25
|
+
subDirectory(subDirectory),
|
|
26
|
+
fileNamePrefix(fileNamePrefix),
|
|
27
|
+
channelCount(channelCount),
|
|
28
|
+
batchDurationSeconds(batchDurationSeconds),
|
|
29
|
+
format(format),
|
|
30
|
+
sampleRate(sampleRate),
|
|
31
|
+
bitRate(bitRate),
|
|
32
|
+
bitDepth(bitDepth),
|
|
33
|
+
flacCompressionLevel(flacCompressionLevel),
|
|
34
|
+
androidFlushIntervalMs(androidFlushIntervalMs),
|
|
35
|
+
iosAudioQuality(iosAudioQuality) {}
|
|
36
|
+
|
|
37
|
+
std::shared_ptr<AudioFileProperties> AudioFileProperties::CreateFromJSIValue(
|
|
38
|
+
facebook::jsi::Runtime &runtime,
|
|
39
|
+
const facebook::jsi::Value &value) {
|
|
40
|
+
auto options = value.getObject(runtime);
|
|
41
|
+
|
|
42
|
+
FileDirectory directory =
|
|
43
|
+
static_cast<FileDirectory>(options.getProperty(runtime, "directory").getNumber());
|
|
44
|
+
|
|
45
|
+
std::string subDirectory =
|
|
46
|
+
options.getProperty(runtime, "subDirectory").asString(runtime).utf8(runtime);
|
|
47
|
+
|
|
48
|
+
std::string fileNamePrefix =
|
|
49
|
+
options.getProperty(runtime, "fileNamePrefix").asString(runtime).utf8(runtime);
|
|
50
|
+
|
|
51
|
+
int channelCount = static_cast<int>(options.getProperty(runtime, "channelCount").getNumber());
|
|
52
|
+
|
|
53
|
+
size_t batchDurationSeconds =
|
|
54
|
+
static_cast<size_t>(options.getProperty(runtime, "batchDurationSeconds").getNumber());
|
|
55
|
+
|
|
56
|
+
Format format = static_cast<Format>(options.getProperty(runtime, "format").getNumber());
|
|
57
|
+
|
|
58
|
+
int androidFlushIntervalMs =
|
|
59
|
+
static_cast<int>(options.getProperty(runtime, "androidFlushIntervalMs").getNumber());
|
|
60
|
+
|
|
61
|
+
auto presetOptions = options.getProperty(runtime, "preset").getObject(runtime);
|
|
62
|
+
|
|
63
|
+
float sampleRate =
|
|
64
|
+
static_cast<float>(presetOptions.getProperty(runtime, "sampleRate").getNumber());
|
|
65
|
+
|
|
66
|
+
size_t bitRate = static_cast<size_t>(presetOptions.getProperty(runtime, "bitRate").getNumber());
|
|
67
|
+
|
|
68
|
+
BitDepth bitDepth =
|
|
69
|
+
static_cast<BitDepth>(presetOptions.getProperty(runtime, "bitDepth").getNumber());
|
|
70
|
+
|
|
71
|
+
int flacCompressionLevel =
|
|
72
|
+
static_cast<int>(presetOptions.getProperty(runtime, "flacCompressionLevel").getNumber());
|
|
73
|
+
|
|
74
|
+
IOSAudioQuality iosAudioQuality =
|
|
75
|
+
static_cast<IOSAudioQuality>(presetOptions.getProperty(runtime, "iosQuality").getNumber());
|
|
76
|
+
|
|
77
|
+
return std::make_shared<AudioFileProperties>(
|
|
78
|
+
directory,
|
|
79
|
+
subDirectory,
|
|
80
|
+
fileNamePrefix,
|
|
81
|
+
channelCount,
|
|
82
|
+
batchDurationSeconds,
|
|
83
|
+
format,
|
|
84
|
+
sampleRate,
|
|
85
|
+
bitRate,
|
|
86
|
+
bitDepth,
|
|
87
|
+
flacCompressionLevel,
|
|
88
|
+
androidFlushIntervalMs,
|
|
89
|
+
iosAudioQuality);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
} // namespace audioapi
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
#pragma once
|
|
2
|
+
|
|
3
|
+
#include <cstddef>
|
|
4
|
+
#include <memory>
|
|
5
|
+
#include <string>
|
|
6
|
+
|
|
7
|
+
namespace facebook {
|
|
8
|
+
namespace jsi {
|
|
9
|
+
class Runtime;
|
|
10
|
+
class Value;
|
|
11
|
+
} // namespace jsi
|
|
12
|
+
} // namespace facebook
|
|
13
|
+
|
|
14
|
+
namespace audioapi {
|
|
15
|
+
|
|
16
|
+
class AudioFileProperties {
|
|
17
|
+
public:
|
|
18
|
+
enum class Format {
|
|
19
|
+
WAV = 1,
|
|
20
|
+
CAF = 2,
|
|
21
|
+
M4A = 3,
|
|
22
|
+
FLAC = 4,
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
enum class BitDepth {
|
|
26
|
+
Bit16 = 1,
|
|
27
|
+
Bit24 = 2,
|
|
28
|
+
Bit32 = 3,
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
enum class IOSAudioQuality {
|
|
32
|
+
Min = 1,
|
|
33
|
+
Low = 2,
|
|
34
|
+
Medium = 3,
|
|
35
|
+
High = 4,
|
|
36
|
+
Max = 5,
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
enum class FileDirectory {
|
|
40
|
+
Document = 1,
|
|
41
|
+
Cache = 2,
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
AudioFileProperties(
|
|
45
|
+
FileDirectory directory,
|
|
46
|
+
const std::string &subDirectory,
|
|
47
|
+
const std::string &fileNamePrefix,
|
|
48
|
+
int channelCount,
|
|
49
|
+
size_t batchDurationSeconds,
|
|
50
|
+
Format format,
|
|
51
|
+
float sampleRate,
|
|
52
|
+
size_t bitRate,
|
|
53
|
+
BitDepth bitDepth,
|
|
54
|
+
int flacCompressionLevel,
|
|
55
|
+
int androidFlushIntervalMs,
|
|
56
|
+
IOSAudioQuality iosAudioQuality);
|
|
57
|
+
|
|
58
|
+
static std::shared_ptr<AudioFileProperties> CreateFromJSIValue(
|
|
59
|
+
facebook::jsi::Runtime &runtime,
|
|
60
|
+
const facebook::jsi::Value &value);
|
|
61
|
+
|
|
62
|
+
FileDirectory directory;
|
|
63
|
+
std::string subDirectory;
|
|
64
|
+
std::string fileNamePrefix;
|
|
65
|
+
int channelCount;
|
|
66
|
+
size_t batchDurationSeconds;
|
|
67
|
+
Format format;
|
|
68
|
+
float sampleRate;
|
|
69
|
+
size_t bitRate;
|
|
70
|
+
BitDepth bitDepth;
|
|
71
|
+
int flacCompressionLevel;
|
|
72
|
+
int androidFlushIntervalMs;
|
|
73
|
+
IOSAudioQuality iosAudioQuality;
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
} // namespace audioapi
|
|
@@ -4,10 +4,7 @@ namespace audioapi {
|
|
|
4
4
|
|
|
5
5
|
CircularAudioArray::CircularAudioArray(size_t size) : AudioArray(size) {}
|
|
6
6
|
|
|
7
|
-
void CircularAudioArray::push_back(
|
|
8
|
-
const float *data,
|
|
9
|
-
size_t size,
|
|
10
|
-
bool skipAvailableSpaceCheck) {
|
|
7
|
+
void CircularAudioArray::push_back(const float *data, size_t size, bool skipAvailableSpaceCheck) {
|
|
11
8
|
if (size > size_) {
|
|
12
9
|
throw std::overflow_error("size exceeds CircularAudioArray size_");
|
|
13
10
|
}
|
|
@@ -24,14 +21,10 @@ void CircularAudioArray::push_back(
|
|
|
24
21
|
memcpy(data_ + vWriteIndex_, data, size * sizeof(float));
|
|
25
22
|
}
|
|
26
23
|
|
|
27
|
-
vWriteIndex_ = vWriteIndex_ + size > size_ ? vWriteIndex_ + size - size_
|
|
28
|
-
: vWriteIndex_ + size;
|
|
24
|
+
vWriteIndex_ = vWriteIndex_ + size > size_ ? vWriteIndex_ + size - size_ : vWriteIndex_ + size;
|
|
29
25
|
}
|
|
30
26
|
|
|
31
|
-
void CircularAudioArray::pop_front(
|
|
32
|
-
float *data,
|
|
33
|
-
size_t size,
|
|
34
|
-
bool skipAvailableDataCheck) {
|
|
27
|
+
void CircularAudioArray::pop_front(float *data, size_t size, bool skipAvailableDataCheck) {
|
|
35
28
|
if (size > size_) {
|
|
36
29
|
throw std::overflow_error("size exceeds CircularAudioArray size_");
|
|
37
30
|
}
|
|
@@ -48,8 +41,7 @@ void CircularAudioArray::pop_front(
|
|
|
48
41
|
memcpy(data, data_ + vReadIndex_, size * sizeof(float));
|
|
49
42
|
}
|
|
50
43
|
|
|
51
|
-
vReadIndex_ = vReadIndex_ + size > size_ ? vReadIndex_ + size - size_
|
|
52
|
-
: vReadIndex_ + size;
|
|
44
|
+
vReadIndex_ = vReadIndex_ + size > size_ ? vReadIndex_ + size - size_ : vReadIndex_ + size;
|
|
53
45
|
}
|
|
54
46
|
|
|
55
47
|
void CircularAudioArray::pop_back(
|
|
@@ -66,10 +58,7 @@ void CircularAudioArray::pop_back(
|
|
|
66
58
|
}
|
|
67
59
|
|
|
68
60
|
if (vWriteIndex_ <= offset) {
|
|
69
|
-
memcpy(
|
|
70
|
-
data,
|
|
71
|
-
data_ + size_ - (offset - vWriteIndex_) - size,
|
|
72
|
-
size * sizeof(float));
|
|
61
|
+
memcpy(data, data_ + size_ - (offset - vWriteIndex_) - size, size * sizeof(float));
|
|
73
62
|
} else if (vWriteIndex_ <= size + offset) {
|
|
74
63
|
auto partSize = size + offset - vWriteIndex_;
|
|
75
64
|
memcpy(data, data_ + size_ - partSize, partSize * sizeof(float));
|
|
@@ -78,8 +67,7 @@ void CircularAudioArray::pop_back(
|
|
|
78
67
|
memcpy(data, data_ + vWriteIndex_ - size - offset, size * sizeof(float));
|
|
79
68
|
}
|
|
80
69
|
|
|
81
|
-
vReadIndex_ = vWriteIndex_ - offset < 0 ? size + vWriteIndex_ - offset
|
|
82
|
-
: vWriteIndex_ - offset;
|
|
70
|
+
vReadIndex_ = vWriteIndex_ - offset < 0 ? size + vWriteIndex_ - offset : vWriteIndex_ - offset;
|
|
83
71
|
}
|
|
84
72
|
|
|
85
73
|
size_t CircularAudioArray::getNumberOfAvailableFrames() const {
|