react-native-audio-api 0.11.0-alpha.0 → 0.11.0-alpha.2
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 +257 -74
- package/android/src/main/cpp/audioapi/android/core/AndroidAudioRecorder.h +33 -19
- package/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp +13 -20
- package/android/src/main/cpp/audioapi/android/core/utils/AndroidFileWriterBackend.h +15 -15
- package/android/src/main/cpp/audioapi/android/core/utils/AndroidRecorderCallback.cpp +170 -0
- package/android/src/main/cpp/audioapi/android/core/utils/AndroidRecorderCallback.h +46 -0
- 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 +381 -302
- package/android/src/main/cpp/audioapi/android/core/utils/ffmpegBackend/FFmpegFileWriter.h +49 -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 +155 -95
- package/android/src/main/cpp/audioapi/android/core/utils/miniaudioBackend/MiniAudioFileWriter.h +9 -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 +109 -44
- package/common/cpp/audioapi/HostObjects/inputs/AudioRecorderHostObject.h +8 -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 +31 -108
- package/common/cpp/audioapi/core/inputs/AudioRecorder.h +46 -46
- 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 +28 -11
- package/ios/audioapi/ios/core/IOSAudioRecorder.mm +229 -44
- package/ios/audioapi/ios/core/NativeAudioPlayer.m +16 -13
- package/ios/audioapi/ios/core/NativeAudioRecorder.h +6 -3
- package/ios/audioapi/ios/core/NativeAudioRecorder.m +67 -6
- package/ios/audioapi/ios/core/utils/AudioDecoder.mm +22 -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/utils/IOSFileWriter.h +53 -0
- package/ios/audioapi/ios/core/utils/IOSFileWriter.mm +224 -0
- package/ios/audioapi/ios/core/utils/IOSRecorderCallback.h +47 -0
- 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 +56 -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 +57 -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 +16 -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 +36 -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 +43 -30
- 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 +86 -84
- 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 +55 -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 +47 -32
- 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 -35
- package/ios/audioapi/ios/core/IOSAudioFileOptions.mm +0 -135
- package/ios/audioapi/ios/core/IOSAudioFileWriter.h +0 -38
- package/ios/audioapi/ios/core/IOSAudioFileWriter.mm +0 -187
- 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
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
#pragma once
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
#include <jsi/jsi.h>
|
|
5
|
-
#include <audioapi/core/utils/worklets/WorkletsRunner.h>
|
|
6
3
|
#include <audioapi/core/AudioNode.h>
|
|
7
4
|
#include <audioapi/core/BaseAudioContext.h>
|
|
8
|
-
#include <audioapi/utils/
|
|
9
|
-
#include <audioapi/utils/AudioArray.h>
|
|
5
|
+
#include <audioapi/core/utils/worklets/WorkletsRunner.h>
|
|
10
6
|
#include <audioapi/jsi/AudioArrayBuffer.h>
|
|
7
|
+
#include <audioapi/utils/AudioArray.h>
|
|
8
|
+
#include <audioapi/utils/AudioBus.h>
|
|
9
|
+
#include <jsi/jsi.h>
|
|
11
10
|
|
|
12
11
|
#include <memory>
|
|
13
12
|
#include <vector>
|
|
@@ -21,11 +20,15 @@ class WorkletNode : public AudioNode {
|
|
|
21
20
|
BaseAudioContext *context,
|
|
22
21
|
size_t bufferLength,
|
|
23
22
|
size_t inputChannelCount,
|
|
24
|
-
WorkletsRunner &&workletRunner
|
|
25
|
-
|
|
23
|
+
WorkletsRunner &&workletRunner)
|
|
24
|
+
: AudioNode(context) {}
|
|
26
25
|
|
|
27
26
|
protected:
|
|
28
|
-
std::shared_ptr<AudioBus> processNode(
|
|
27
|
+
std::shared_ptr<AudioBus> processNode(
|
|
28
|
+
const std::shared_ptr<AudioBus> &processingBus,
|
|
29
|
+
int framesToProcess) override {
|
|
30
|
+
return processingBus;
|
|
31
|
+
}
|
|
29
32
|
};
|
|
30
33
|
#else
|
|
31
34
|
|
|
@@ -37,14 +40,14 @@ class WorkletNode : public AudioNode {
|
|
|
37
40
|
BaseAudioContext *context,
|
|
38
41
|
size_t bufferLength,
|
|
39
42
|
size_t inputChannelCount,
|
|
40
|
-
WorkletsRunner &&workletRunner
|
|
41
|
-
);
|
|
43
|
+
WorkletsRunner &&workletRunner);
|
|
42
44
|
|
|
43
45
|
~WorkletNode() override = default;
|
|
44
46
|
|
|
45
47
|
protected:
|
|
46
|
-
std::shared_ptr<AudioBus> processNode(
|
|
47
|
-
|
|
48
|
+
std::shared_ptr<AudioBus> processNode(
|
|
49
|
+
const std::shared_ptr<AudioBus> &processingBus,
|
|
50
|
+
int framesToProcess) override;
|
|
48
51
|
|
|
49
52
|
private:
|
|
50
53
|
WorkletsRunner workletRunner_;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
#include <audioapi/core/effects/WorkletProcessingNode.h>
|
|
2
2
|
#include <audioapi/core/utils/Constants.h>
|
|
3
|
+
#include <memory>
|
|
4
|
+
#include <utility>
|
|
3
5
|
|
|
4
6
|
namespace audioapi {
|
|
5
7
|
|
|
@@ -19,8 +21,7 @@ WorkletProcessingNode::WorkletProcessingNode(
|
|
|
19
21
|
inputBuffsHandles_[i] = std::make_shared<AudioArrayBuffer>(inputAudioArray);
|
|
20
22
|
|
|
21
23
|
auto outputAudioArray = std::make_shared<AudioArray>(RENDER_QUANTUM_SIZE);
|
|
22
|
-
outputBuffsHandles_[i] =
|
|
23
|
-
std::make_shared<AudioArrayBuffer>(outputAudioArray);
|
|
24
|
+
outputBuffsHandles_[i] = std::make_shared<AudioArrayBuffer>(outputAudioArray);
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
27
|
|
|
@@ -52,8 +53,7 @@ std::shared_ptr<AudioBus> WorkletProcessingNode::processNode(
|
|
|
52
53
|
inputJsArray.setValueAtIndex(rt, ch, inputArrayBuffer);
|
|
53
54
|
|
|
54
55
|
// Create output array buffer
|
|
55
|
-
auto outputArrayBuffer =
|
|
56
|
-
jsi::ArrayBuffer(rt, outputBuffsHandles_[ch]);
|
|
56
|
+
auto outputArrayBuffer = jsi::ArrayBuffer(rt, outputBuffsHandles_[ch]);
|
|
57
57
|
outputJsArray.setValueAtIndex(rt, ch, outputArrayBuffer);
|
|
58
58
|
}
|
|
59
59
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
#pragma once
|
|
2
2
|
|
|
3
|
-
#include <jsi/jsi.h>
|
|
4
|
-
#include <audioapi/core/utils/worklets/WorkletsRunner.h>
|
|
5
3
|
#include <audioapi/core/AudioNode.h>
|
|
6
4
|
#include <audioapi/core/BaseAudioContext.h>
|
|
7
|
-
#include <audioapi/utils/
|
|
8
|
-
#include <audioapi/utils/AudioArray.h>
|
|
5
|
+
#include <audioapi/core/utils/worklets/WorkletsRunner.h>
|
|
9
6
|
#include <audioapi/jsi/AudioArrayBuffer.h>
|
|
7
|
+
#include <audioapi/utils/AudioArray.h>
|
|
8
|
+
#include <audioapi/utils/AudioBus.h>
|
|
9
|
+
#include <jsi/jsi.h>
|
|
10
10
|
|
|
11
11
|
#include <memory>
|
|
12
12
|
#include <vector>
|
|
@@ -16,13 +16,15 @@ namespace audioapi {
|
|
|
16
16
|
#if RN_AUDIO_API_TEST
|
|
17
17
|
class WorkletProcessingNode : public AudioNode {
|
|
18
18
|
public:
|
|
19
|
-
explicit WorkletProcessingNode(
|
|
20
|
-
|
|
21
|
-
WorkletsRunner &&workletRunner
|
|
22
|
-
) : AudioNode(context) {}
|
|
19
|
+
explicit WorkletProcessingNode(BaseAudioContext *context, WorkletsRunner &&workletRunner)
|
|
20
|
+
: AudioNode(context) {}
|
|
23
21
|
|
|
24
22
|
protected:
|
|
25
|
-
std::shared_ptr<AudioBus> processNode(
|
|
23
|
+
std::shared_ptr<AudioBus> processNode(
|
|
24
|
+
const std::shared_ptr<AudioBus> &processingBus,
|
|
25
|
+
int framesToProcess) override {
|
|
26
|
+
return processingBus;
|
|
27
|
+
}
|
|
26
28
|
};
|
|
27
29
|
#else
|
|
28
30
|
|
|
@@ -30,13 +32,12 @@ using namespace facebook;
|
|
|
30
32
|
|
|
31
33
|
class WorkletProcessingNode : public AudioNode {
|
|
32
34
|
public:
|
|
33
|
-
explicit WorkletProcessingNode(
|
|
34
|
-
BaseAudioContext *context,
|
|
35
|
-
WorkletsRunner &&workletRunner
|
|
36
|
-
);
|
|
35
|
+
explicit WorkletProcessingNode(BaseAudioContext *context, WorkletsRunner &&workletRunner);
|
|
37
36
|
|
|
38
37
|
protected:
|
|
39
|
-
std::shared_ptr<AudioBus> processNode(
|
|
38
|
+
std::shared_ptr<AudioBus> processNode(
|
|
39
|
+
const std::shared_ptr<AudioBus> &processingBus,
|
|
40
|
+
int framesToProcess) override;
|
|
40
41
|
|
|
41
42
|
private:
|
|
42
43
|
WorkletsRunner workletRunner_;
|
|
@@ -1,135 +1,58 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
2
|
#include <audioapi/core/inputs/AudioRecorder.h>
|
|
3
|
-
#include <audioapi/core/
|
|
4
|
-
#include <audioapi/core/
|
|
5
|
-
#include <audioapi/events/AudioEventHandlerRegistry.h>
|
|
6
|
-
#include <audioapi/utils/AudioBus.h>
|
|
7
|
-
#include <audioapi/utils/CircularAudioArray.h>
|
|
3
|
+
#include <audioapi/core/utils/AudioFileWriter.h>
|
|
4
|
+
#include <audioapi/core/utils/AudioRecorderCallback.h>
|
|
8
5
|
|
|
9
6
|
namespace audioapi {
|
|
10
7
|
|
|
11
|
-
AudioRecorder::
|
|
12
|
-
|
|
13
|
-
: audioEventHandlerRegistry_(audioEventHandlerRegistry) {
|
|
14
|
-
isRunning_.store(false);
|
|
15
|
-
fileOutputEnabled_.store(false);
|
|
16
|
-
callbackOutputEnabled_.store(false);
|
|
17
|
-
isConnected_.store(false);
|
|
18
|
-
}
|
|
8
|
+
void AudioRecorder::setOnErrorCallback(uint64_t callbackId) {
|
|
9
|
+
std::scoped_lock lock(callbackMutex_, fileWriterMutex_, errorCallbackMutex_);
|
|
19
10
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
11
|
+
if (usesFileOutput()) {
|
|
12
|
+
fileWriter_->setOnErrorCallback(callbackId);
|
|
13
|
+
}
|
|
23
14
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
// adapterNode_ = node;
|
|
28
|
-
// adapterNodeLock_.unlock();
|
|
29
|
-
// isConnected_.store(true);
|
|
30
|
-
// node->init(ringBufferSize_);
|
|
31
|
-
// adapterNodeLock_.lock();
|
|
32
|
-
// adapterNode_ = node;
|
|
33
|
-
// adapterNodeLock_.unlock();
|
|
34
|
-
}
|
|
15
|
+
if (usesCallback()) {
|
|
16
|
+
dataCallback_->setOnErrorCallback(callbackId);
|
|
17
|
+
}
|
|
35
18
|
|
|
36
|
-
|
|
37
|
-
// adapterNodeLock_.lock();
|
|
38
|
-
// adapterNode_ = nullptr;
|
|
39
|
-
// adapterNodeLock_.unlock();
|
|
40
|
-
// isConnected_.store(false);
|
|
19
|
+
errorCallbackId_.store(callbackId, std::memory_order_release);
|
|
41
20
|
}
|
|
42
21
|
|
|
43
|
-
void AudioRecorder::
|
|
44
|
-
|
|
45
|
-
size_t bufferLength,
|
|
46
|
-
size_t channelCount,
|
|
47
|
-
uint64_t callbackId) {
|
|
48
|
-
callbackProperties_.sampleRate = sampleRate;
|
|
49
|
-
callbackProperties_.bufferLength = bufferLength;
|
|
50
|
-
callbackProperties_.channelCount = channelCount;
|
|
51
|
-
callbackProperties_.callbackId = callbackId;
|
|
52
|
-
|
|
53
|
-
callbackOutputEnabled_.store(true);
|
|
54
|
-
}
|
|
22
|
+
void AudioRecorder::clearOnErrorCallback() {
|
|
23
|
+
std::scoped_lock lock(callbackMutex_, fileWriterMutex_, errorCallbackMutex_);
|
|
55
24
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
}
|
|
25
|
+
if (usesFileOutput()) {
|
|
26
|
+
fileWriter_->clearOnErrorCallback();
|
|
27
|
+
}
|
|
60
28
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
// if (!hasCallback()) {
|
|
65
|
-
// return;
|
|
66
|
-
// }
|
|
67
|
-
|
|
68
|
-
// auto audioBuffer = std::make_shared<AudioBuffer>(bus);
|
|
69
|
-
// auto audioBufferHostObject =
|
|
70
|
-
// std::make_shared<AudioBufferHostObject>(audioBuffer);
|
|
71
|
-
|
|
72
|
-
// std::unordered_map<std::string, EventValue> body = {};
|
|
73
|
-
// body.insert({"buffer", audioBufferHostObject});
|
|
74
|
-
// body.insert({"numFrames", numFrames});
|
|
75
|
-
|
|
76
|
-
// if (audioEventHandlerRegistry_ != nullptr) {
|
|
77
|
-
// audioEventHandlerRegistry_->invokeHandlerWithEventBody(
|
|
78
|
-
// "audioReady", onAudioReadyCallbackId_, body);
|
|
79
|
-
// }
|
|
80
|
-
}
|
|
29
|
+
if (usesCallback()) {
|
|
30
|
+
dataCallback_->clearOnErrorCallback();
|
|
31
|
+
}
|
|
81
32
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
// return;
|
|
85
|
-
// }
|
|
33
|
+
errorCallbackId_.store(0, std::memory_order_release);
|
|
34
|
+
}
|
|
86
35
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
// auto *outputChannel = bus->getChannel(0)->getData();
|
|
90
|
-
// auto availableFrames =
|
|
91
|
-
// static_cast<int>(circularBuffer_->getNumberOfAvailableFrames());
|
|
36
|
+
double AudioRecorder::getCurrentDuration() const {
|
|
37
|
+
double duration = 0.0;
|
|
92
38
|
|
|
93
|
-
|
|
94
|
-
|
|
39
|
+
if (usesFileOutput()) {
|
|
40
|
+
duration = fileWriter_->getCurrentDuration();
|
|
41
|
+
}
|
|
95
42
|
|
|
96
|
-
|
|
43
|
+
return duration;
|
|
97
44
|
}
|
|
98
45
|
|
|
99
46
|
bool AudioRecorder::usesCallback() const {
|
|
100
|
-
return callbackOutputEnabled_.load();
|
|
47
|
+
return callbackOutputEnabled_.load(std::memory_order_acquire);
|
|
101
48
|
}
|
|
102
49
|
|
|
103
50
|
bool AudioRecorder::usesFileOutput() const {
|
|
104
|
-
return fileOutputEnabled_.load();
|
|
51
|
+
return fileOutputEnabled_.load(std::memory_order_acquire);
|
|
105
52
|
}
|
|
106
53
|
|
|
107
54
|
bool AudioRecorder::isConnected() const {
|
|
108
|
-
return isConnected_.load();
|
|
55
|
+
return isConnected_.load(std::memory_order_acquire);
|
|
109
56
|
}
|
|
110
57
|
|
|
111
|
-
// AudioRecorder::AudioRecorder(
|
|
112
|
-
// const std::shared_ptr<AudioEventHandlerRegistry>
|
|
113
|
-
// &audioEventHandlerRegistry)
|
|
114
|
-
// audioEventHandlerRegistry_(audioEventHandlerRegistry) {
|
|
115
|
-
// constexpr int minRingBufferSize = 8192;
|
|
116
|
-
// ringBufferSize_ = std::max(2 * bufferLength, minRingBufferSize);
|
|
117
|
-
|
|
118
|
-
// circularBuffer_ = std::make_shared<CircularAudioArray>(ringBufferSize_);
|
|
119
|
-
// isRunning_.store(false);
|
|
120
|
-
// }
|
|
121
|
-
|
|
122
|
-
// void AudioRecorder::writeToBuffers(const float *data, int numFrames) {
|
|
123
|
-
// if (adapterNodeLock_.try_lock()) {
|
|
124
|
-
// if (adapterNode_ != nullptr) {
|
|
125
|
-
// adapterNode_->buff_->write(data, numFrames);
|
|
126
|
-
// }
|
|
127
|
-
// adapterNodeLock_.unlock();
|
|
128
|
-
// }
|
|
129
|
-
|
|
130
|
-
// if (hasCallback()) {
|
|
131
|
-
// circularBuffer_->push_back(data, numFrames);
|
|
132
|
-
// }
|
|
133
|
-
// }
|
|
134
|
-
|
|
135
58
|
} // namespace audioapi
|
|
@@ -1,81 +1,81 @@
|
|
|
1
1
|
#pragma once
|
|
2
2
|
|
|
3
|
-
#include <
|
|
3
|
+
#include <audioapi/utils/Result.hpp>
|
|
4
4
|
#include <atomic>
|
|
5
|
+
#include <memory>
|
|
5
6
|
#include <mutex>
|
|
6
7
|
#include <string>
|
|
8
|
+
#include <tuple>
|
|
7
9
|
|
|
8
10
|
namespace audioapi {
|
|
9
11
|
|
|
10
|
-
class RecorderAdapterNode;
|
|
11
12
|
class AudioBus;
|
|
13
|
+
class AudioFileWriter;
|
|
12
14
|
class CircularAudioArray;
|
|
15
|
+
class RecorderAdapterNode;
|
|
16
|
+
class AudioFileProperties;
|
|
17
|
+
class AudioRecorderCallback;
|
|
13
18
|
class AudioEventHandlerRegistry;
|
|
14
19
|
|
|
15
20
|
class AudioRecorder {
|
|
16
21
|
public:
|
|
17
|
-
|
|
22
|
+
enum class RecorderState { Idle = 0, Recording, Paused };
|
|
23
|
+
explicit AudioRecorder(
|
|
24
|
+
const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
|
|
25
|
+
: audioEventHandlerRegistry_(audioEventHandlerRegistry) {}
|
|
18
26
|
virtual ~AudioRecorder() = default;
|
|
19
27
|
|
|
20
|
-
virtual
|
|
21
|
-
virtual std::string stop() = 0;
|
|
28
|
+
virtual Result<std::string, std::string> start() = 0;
|
|
29
|
+
virtual Result<std::tuple<std::string, double, double>, std::string> stop() = 0;
|
|
22
30
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
virtual void enableFileOutput(
|
|
26
|
-
float sampleRate,
|
|
27
|
-
size_t channelCount,
|
|
28
|
-
size_t bitRate,
|
|
29
|
-
size_t iosFlags,
|
|
30
|
-
size_t androidFlags) = 0;
|
|
31
|
+
virtual Result<std::string, std::string> enableFileOutput(
|
|
32
|
+
std::shared_ptr<AudioFileProperties> properties) = 0;
|
|
31
33
|
virtual void disableFileOutput() = 0;
|
|
32
34
|
|
|
33
35
|
virtual void pause() = 0;
|
|
34
36
|
virtual void resume() = 0;
|
|
35
37
|
|
|
36
|
-
void connect(const std::shared_ptr<RecorderAdapterNode> &node);
|
|
37
|
-
void disconnect();
|
|
38
|
+
virtual void connect(const std::shared_ptr<RecorderAdapterNode> &node) = 0;
|
|
39
|
+
virtual void disconnect() = 0;
|
|
40
|
+
|
|
41
|
+
virtual Result<NoneType, std::string> setOnAudioReadyCallback(
|
|
42
|
+
float sampleRate,
|
|
43
|
+
size_t bufferLength,
|
|
44
|
+
int channelCount,
|
|
45
|
+
uint64_t callbackId) = 0;
|
|
46
|
+
virtual void clearOnAudioReadyCallback() = 0;
|
|
38
47
|
|
|
39
|
-
void
|
|
40
|
-
|
|
41
|
-
size_t bufferLength,
|
|
42
|
-
size_t channelCount,
|
|
43
|
-
uint64_t callbackId);
|
|
44
|
-
void clearOnAudioReadyCallback();
|
|
48
|
+
void setOnErrorCallback(uint64_t callbackId);
|
|
49
|
+
void clearOnErrorCallback();
|
|
45
50
|
|
|
46
|
-
|
|
47
|
-
const std::shared_ptr<AudioBus> &bus,
|
|
48
|
-
int numFrames);
|
|
49
|
-
void sendRemainingCallbackData();
|
|
51
|
+
virtual double getCurrentDuration() const;
|
|
50
52
|
|
|
51
53
|
bool usesCallback() const;
|
|
52
54
|
bool usesFileOutput() const;
|
|
53
55
|
bool isConnected() const;
|
|
54
56
|
|
|
57
|
+
virtual bool isRecording() const = 0;
|
|
58
|
+
virtual bool isPaused() const = 0;
|
|
59
|
+
virtual bool isIdle() const = 0;
|
|
60
|
+
|
|
55
61
|
protected:
|
|
56
|
-
|
|
57
|
-
float sampleRate;
|
|
58
|
-
size_t bufferLength;
|
|
59
|
-
size_t channelCount;
|
|
60
|
-
uint64_t callbackId;
|
|
61
|
-
};
|
|
62
|
-
|
|
63
|
-
CallbackProperties callbackProperties_;
|
|
64
|
-
// size_t ringBufferSize_;
|
|
65
|
-
|
|
66
|
-
std::atomic<bool> isRunning_;
|
|
67
|
-
std::atomic<bool> fileOutputEnabled_;
|
|
68
|
-
std::atomic<bool> callbackOutputEnabled_;
|
|
69
|
-
std::atomic<bool> isConnected_;
|
|
70
|
-
// std::shared_ptr<CircularAudioArray> circularBuffer_;
|
|
71
|
-
|
|
72
|
-
mutable std::mutex adapterNodeLock_;
|
|
73
|
-
std::shared_ptr<RecorderAdapterNode> adapterNode_ = nullptr;
|
|
62
|
+
std::atomic<RecorderState> state_{RecorderState::Idle};
|
|
74
63
|
|
|
75
|
-
std::
|
|
76
|
-
|
|
64
|
+
std::atomic<bool> isConnected_{false};
|
|
65
|
+
std::atomic<bool> fileOutputEnabled_{false};
|
|
66
|
+
std::atomic<bool> callbackOutputEnabled_{false};
|
|
67
|
+
|
|
68
|
+
std::mutex callbackMutex_;
|
|
69
|
+
std::mutex fileWriterMutex_;
|
|
70
|
+
std::mutex errorCallbackMutex_;
|
|
71
|
+
mutable std::mutex adapterNodeMutex_;
|
|
77
72
|
|
|
78
|
-
|
|
73
|
+
std::atomic<uint64_t> errorCallbackId_{0};
|
|
74
|
+
|
|
75
|
+
std::shared_ptr<AudioFileWriter> fileWriter_ = nullptr;
|
|
76
|
+
std::shared_ptr<RecorderAdapterNode> adapterNode_ = nullptr;
|
|
77
|
+
std::shared_ptr<AudioRecorderCallback> dataCallback_ = nullptr;
|
|
78
|
+
std::shared_ptr<AudioEventHandlerRegistry> audioEventHandlerRegistry_;
|
|
79
79
|
};
|
|
80
80
|
|
|
81
81
|
} // namespace audioapi
|
|
@@ -2,14 +2,13 @@
|
|
|
2
2
|
#include <audioapi/utils/AudioArray.h>
|
|
3
3
|
#include <audioapi/utils/AudioBus.h>
|
|
4
4
|
|
|
5
|
+
#include <algorithm>
|
|
6
|
+
#include <memory>
|
|
5
7
|
#include <utility>
|
|
6
8
|
|
|
7
9
|
namespace audioapi {
|
|
8
10
|
|
|
9
|
-
AudioBuffer::AudioBuffer(
|
|
10
|
-
int numberOfChannels,
|
|
11
|
-
size_t length,
|
|
12
|
-
float sampleRate) {
|
|
11
|
+
AudioBuffer::AudioBuffer(int numberOfChannels, size_t length, float sampleRate) {
|
|
13
12
|
bus_ = std::make_shared<AudioBus>(length, numberOfChannels, sampleRate);
|
|
14
13
|
}
|
|
15
14
|
|
|
@@ -45,8 +44,7 @@ void AudioBuffer::copyFromChannel(
|
|
|
45
44
|
memcpy(
|
|
46
45
|
destination,
|
|
47
46
|
bus_->getChannel(channelNumber)->getData() + startInChannel,
|
|
48
|
-
std::min(destinationLength, getLength() - startInChannel) *
|
|
49
|
-
sizeof(float));
|
|
47
|
+
std::min(destinationLength, getLength() - startInChannel) * sizeof(float));
|
|
50
48
|
}
|
|
51
49
|
|
|
52
50
|
void AudioBuffer::copyToChannel(
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
#pragma once
|
|
2
2
|
|
|
3
3
|
#include <algorithm>
|
|
4
|
+
#include <cstddef>
|
|
5
|
+
#include <cstring>
|
|
4
6
|
#include <memory>
|
|
5
7
|
#include <string>
|
|
6
8
|
#include <vector>
|
|
7
|
-
#include <cstddef>
|
|
8
|
-
#include <cstring>
|
|
9
9
|
|
|
10
10
|
namespace audioapi {
|
|
11
11
|
|
|
@@ -28,11 +28,8 @@ class AudioBuffer : public std::enable_shared_from_this<AudioBuffer> {
|
|
|
28
28
|
size_t destinationLength,
|
|
29
29
|
int channelNumber,
|
|
30
30
|
size_t startInChannel) const;
|
|
31
|
-
void
|
|
32
|
-
|
|
33
|
-
size_t sourceLength,
|
|
34
|
-
int channelNumber,
|
|
35
|
-
size_t startInChannel);
|
|
31
|
+
void
|
|
32
|
+
copyToChannel(const float *source, size_t sourceLength, int channelNumber, size_t startInChannel);
|
|
36
33
|
|
|
37
34
|
private:
|
|
38
35
|
friend class AudioBufferSourceNode;
|
|
@@ -5,14 +5,15 @@
|
|
|
5
5
|
#include <audioapi/events/AudioEventHandlerRegistry.h>
|
|
6
6
|
#include <audioapi/utils/AudioArray.h>
|
|
7
7
|
#include <audioapi/utils/AudioBus.h>
|
|
8
|
+
#include <memory>
|
|
9
|
+
#include <string>
|
|
10
|
+
#include <unordered_map>
|
|
8
11
|
|
|
9
12
|
namespace audioapi {
|
|
10
13
|
AudioBufferBaseSourceNode::AudioBufferBaseSourceNode(
|
|
11
14
|
BaseAudioContext *context,
|
|
12
15
|
bool pitchCorrection)
|
|
13
|
-
: AudioScheduledSourceNode(context),
|
|
14
|
-
pitchCorrection_(pitchCorrection),
|
|
15
|
-
vReadIndex_(0.0) {
|
|
16
|
+
: AudioScheduledSourceNode(context), pitchCorrection_(pitchCorrection), vReadIndex_(0.0) {
|
|
16
17
|
onPositionChangedInterval_ = static_cast<int>(context->getSampleRate() * 0.1);
|
|
17
18
|
|
|
18
19
|
detuneParam_ = std::make_shared<AudioParam>(
|
|
@@ -20,41 +21,31 @@ AudioBufferBaseSourceNode::AudioBufferBaseSourceNode(
|
|
|
20
21
|
playbackRateParam_ = std::make_shared<AudioParam>(
|
|
21
22
|
1.0, MOST_NEGATIVE_SINGLE_FLOAT, MOST_POSITIVE_SINGLE_FLOAT, context);
|
|
22
23
|
|
|
23
|
-
playbackRateBus_ =
|
|
24
|
-
RENDER_QUANTUM_SIZE * 3, channelCount_, context_->getSampleRate());
|
|
24
|
+
playbackRateBus_ =
|
|
25
|
+
std::make_shared<AudioBus>(RENDER_QUANTUM_SIZE * 3, channelCount_, context_->getSampleRate());
|
|
25
26
|
|
|
26
|
-
stretch_ =
|
|
27
|
-
std::make_shared<signalsmith::stretch::SignalsmithStretch<float>>();
|
|
27
|
+
stretch_ = std::make_shared<signalsmith::stretch::SignalsmithStretch<float>>();
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
std::shared_ptr<AudioParam> AudioBufferBaseSourceNode::getDetuneParam() const {
|
|
31
31
|
return detuneParam_;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
std::shared_ptr<AudioParam> AudioBufferBaseSourceNode::getPlaybackRateParam()
|
|
35
|
-
const {
|
|
34
|
+
std::shared_ptr<AudioParam> AudioBufferBaseSourceNode::getPlaybackRateParam() const {
|
|
36
35
|
return playbackRateParam_;
|
|
37
36
|
}
|
|
38
37
|
|
|
39
|
-
void AudioBufferBaseSourceNode::
|
|
40
|
-
|
|
41
|
-
context_->audioEventHandlerRegistry_ == nullptr) {
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
context_->audioEventHandlerRegistry_->unregisterHandler(
|
|
46
|
-
"positionChanged", onPositionChangedCallbackId_);
|
|
47
|
-
onPositionChangedCallbackId_ = 0;
|
|
48
|
-
}
|
|
38
|
+
void AudioBufferBaseSourceNode::setOnPositionChangedCallbackId(uint64_t callbackId) {
|
|
39
|
+
auto oldCallbackId = onPositionChangedCallbackId_.exchange(callbackId, std::memory_order_acq_rel);
|
|
49
40
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
41
|
+
if (oldCallbackId != 0) {
|
|
42
|
+
audioEventHandlerRegistry_->unregisterHandler("positionChanged", oldCallbackId);
|
|
43
|
+
}
|
|
53
44
|
}
|
|
54
45
|
|
|
55
46
|
void AudioBufferBaseSourceNode::setOnPositionChangedInterval(int interval) {
|
|
56
|
-
onPositionChangedInterval_ =
|
|
57
|
-
context_->getSampleRate() * static_cast<float>(interval) / 1000);
|
|
47
|
+
onPositionChangedInterval_ =
|
|
48
|
+
static_cast<int>(context_->getSampleRate() * static_cast<float>(interval) / 1000);
|
|
58
49
|
}
|
|
59
50
|
|
|
60
51
|
int AudioBufferBaseSourceNode::getOnPositionChangedInterval() const {
|
|
@@ -65,15 +56,28 @@ std::mutex &AudioBufferBaseSourceNode::getBufferLock() {
|
|
|
65
56
|
return bufferLock_;
|
|
66
57
|
}
|
|
67
58
|
|
|
59
|
+
double AudioBufferBaseSourceNode::getInputLatency() const {
|
|
60
|
+
if (pitchCorrection_) {
|
|
61
|
+
return static_cast<double>(stretch_->inputLatency()) / context_->getSampleRate();
|
|
62
|
+
}
|
|
63
|
+
return 0;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
double AudioBufferBaseSourceNode::getOutputLatency() const {
|
|
67
|
+
if (pitchCorrection_) {
|
|
68
|
+
return static_cast<double>(stretch_->outputLatency()) / context_->getSampleRate();
|
|
69
|
+
}
|
|
70
|
+
return 0;
|
|
71
|
+
}
|
|
72
|
+
|
|
68
73
|
void AudioBufferBaseSourceNode::sendOnPositionChangedEvent() {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
std::unordered_map<std::string, EventValue> body = {
|
|
73
|
-
{"value", getCurrentPosition()}};
|
|
74
|
+
auto onPositionChangedCallbackId = onPositionChangedCallbackId_.load(std::memory_order_acquire);
|
|
75
|
+
|
|
76
|
+
if (onPositionChangedCallbackId != 0 && onPositionChangedTime_ > onPositionChangedInterval_) {
|
|
77
|
+
std::unordered_map<std::string, EventValue> body = {{"value", getCurrentPosition()}};
|
|
74
78
|
|
|
75
|
-
|
|
76
|
-
"positionChanged",
|
|
79
|
+
audioEventHandlerRegistry_->invokeHandlerWithEventBody(
|
|
80
|
+
"positionChanged", onPositionChangedCallbackId, body);
|
|
77
81
|
|
|
78
82
|
onPositionChangedTime_ = 0;
|
|
79
83
|
}
|
|
@@ -88,34 +92,26 @@ void AudioBufferBaseSourceNode::processWithPitchCorrection(
|
|
|
88
92
|
size_t offsetLength = 0;
|
|
89
93
|
|
|
90
94
|
auto time = context_->getCurrentTime();
|
|
91
|
-
auto playbackRate =
|
|
92
|
-
playbackRateParam_->processKRateParam(framesToProcess, time), 0.0f, 3.0f);
|
|
93
|
-
auto detune =
|
|
94
|
-
detuneParam_->processKRateParam(framesToProcess, time) / 100.0f,
|
|
95
|
-
-12.0f,
|
|
96
|
-
12.0f);
|
|
95
|
+
auto playbackRate =
|
|
96
|
+
std::clamp(playbackRateParam_->processKRateParam(framesToProcess, time), 0.0f, 3.0f);
|
|
97
|
+
auto detune =
|
|
98
|
+
std::clamp(detuneParam_->processKRateParam(framesToProcess, time) / 100.0f, -12.0f, 12.0f);
|
|
97
99
|
|
|
98
100
|
playbackRateBus_->zero();
|
|
99
101
|
|
|
100
|
-
auto framesNeededToStretch =
|
|
101
|
-
static_cast<int>(playbackRate * static_cast<float>(framesToProcess));
|
|
102
|
+
auto framesNeededToStretch = static_cast<int>(playbackRate * static_cast<float>(framesToProcess));
|
|
102
103
|
|
|
103
|
-
updatePlaybackInfo(
|
|
104
|
-
playbackRateBus_, framesNeededToStretch, startOffset, offsetLength);
|
|
104
|
+
updatePlaybackInfo(playbackRateBus_, framesNeededToStretch, startOffset, offsetLength);
|
|
105
105
|
|
|
106
106
|
if (playbackRate == 0.0f || (!isPlaying() && !isStopScheduled())) {
|
|
107
107
|
processingBus->zero();
|
|
108
108
|
return;
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
-
processWithoutInterpolation(
|
|
112
|
-
playbackRateBus_, startOffset, offsetLength, playbackRate);
|
|
111
|
+
processWithoutInterpolation(playbackRateBus_, startOffset, offsetLength, playbackRate);
|
|
113
112
|
|
|
114
113
|
stretch_->process(
|
|
115
|
-
playbackRateBus_.get()[0],
|
|
116
|
-
framesNeededToStretch,
|
|
117
|
-
processingBus.get()[0],
|
|
118
|
-
framesToProcess);
|
|
114
|
+
playbackRateBus_.get()[0], framesNeededToStretch, processingBus.get()[0], framesToProcess);
|
|
119
115
|
|
|
120
116
|
if (detune != 0.0f) {
|
|
121
117
|
stretch_->setTransposeSemitones(detune);
|
|
@@ -139,24 +135,19 @@ void AudioBufferBaseSourceNode::processWithoutPitchCorrection(
|
|
|
139
135
|
}
|
|
140
136
|
|
|
141
137
|
if (std::fabs(computedPlaybackRate) == 1.0) {
|
|
142
|
-
processWithoutInterpolation(
|
|
143
|
-
processingBus, startOffset, offsetLength, computedPlaybackRate);
|
|
138
|
+
processWithoutInterpolation(processingBus, startOffset, offsetLength, computedPlaybackRate);
|
|
144
139
|
} else {
|
|
145
|
-
processWithInterpolation(
|
|
146
|
-
processingBus, startOffset, offsetLength, computedPlaybackRate);
|
|
140
|
+
processWithInterpolation(processingBus, startOffset, offsetLength, computedPlaybackRate);
|
|
147
141
|
}
|
|
148
142
|
|
|
149
143
|
sendOnPositionChangedEvent();
|
|
150
144
|
}
|
|
151
145
|
|
|
152
|
-
float AudioBufferBaseSourceNode::getComputedPlaybackRateValue(
|
|
153
|
-
int framesToProcess) {
|
|
146
|
+
float AudioBufferBaseSourceNode::getComputedPlaybackRateValue(int framesToProcess) {
|
|
154
147
|
auto time = context_->getCurrentTime();
|
|
155
148
|
|
|
156
|
-
auto playbackRate =
|
|
157
|
-
|
|
158
|
-
auto detune = std::pow(
|
|
159
|
-
2.0f, detuneParam_->processKRateParam(framesToProcess, time) / 1200.0f);
|
|
149
|
+
auto playbackRate = playbackRateParam_->processKRateParam(framesToProcess, time);
|
|
150
|
+
auto detune = std::pow(2.0f, detuneParam_->processKRateParam(framesToProcess, time) / 1200.0f);
|
|
160
151
|
|
|
161
152
|
return playbackRate * detune;
|
|
162
153
|
}
|