[Audio Streamer] Release of 2.3.0 (added custom sampling rate

Author: hoffmatteo

packages/audio_streamer/CHANGELOG.md

@@ -1,41 +1,59 @@
+## 2.3.0
+
+- implemented custom sample rate functionality
+- [PR#521](https://github.com/cph-cachet/flutter-plugins/pull/521)
+- [PR#522](https://github.com/cph-cachet/flutter-plugins/pull/522)
+
 ## 2.2.0+1
+
 - updated example app podfile to correctly include permission for iOS
 - updated README to include podfile permission
 
 ## 2.2.0
+
 - upgrade of `permission_handler: ^10.0.0`
 - Upgraded to Dart 2.17 and Flutter 3.0
 
 ## 2.1.0
+
 - upgrade of `permission_handler: ^9.2.0`
 - [PR#503](https://github.com/cph-cachet/flutter-plugins/pull/503)
 - [PR#504](https://github.com/cph-cachet/flutter-plugins/pull/504)
 
 ## 2.0.3
+
 - [PR#371](https://github.com/cph-cachet/flutter-plugins/pull/371)
 
 ## 2.0.2
+
 - [PR#364](https://github.com/cph-cachet/flutter-plugins/pull/364)
 - upgrade to `permission_handler: ^8.1.0`
- 
+
 ## 2.0.0
+
 - Null safety migration
 
 ## 1.3.0
+
 - Fixed an issue where using another media player/recorder would cause the plugin to go into an error state on iOS (see https://github.com/cph-cachet/flutter-plugins/issues/86)
 
 ## 1.2.0
+
 - Fixed an issue where the AVAudioRecorder would crash on iOS (see https://github.com/cph-cachet/flutter-plugins/issues/91)
 
 ## 1.1.6
+
 - Upgrade to `permission_handler` v. 5.
 
 ## 1.1.5
+
 - Added a getter for the sample rate field.
 
 ## 1.1.0
+
 - Able to stream audio data on Android as well
 - The plugin will now record as soon as the permission dialog ends.
 
 ## 1.0.0
+
 - Able to stream audio data on iOS.

packages/audio_streamer/ios/Classes/SwiftAudioStreamerPlugin.swift

@@ -8,6 +8,7 @@ public class SwiftAudioStreamerPlugin: NSObject, FlutterPlugin, FlutterStreamHan
   var engine = AVAudioEngine()
   var audioData: [Float] = []
   var recording = false
+  var preferredSampleRate: Int? = nil
 
   // Register plugin
   public static func register(with registrar: FlutterPluginRegistrar) {
@@ -38,38 +39,39 @@ public class SwiftAudioStreamerPlugin: NSObject, FlutterPlugin, FlutterStreamHan
       object: nil)
   }
 
-   @objc func handleInterruption(notification: Notification) {
-        // If no eventSink to emit events to, do nothing (wait)
-        if eventSink == nil {
-            return
-        }
-
-        guard let userInfo = notification.userInfo,
-              let typeValue = userInfo[AVAudioSessionInterruptionTypeKey] as? UInt,
-              let type = AVAudioSession.InterruptionType(rawValue: typeValue)
-        else {
-            return
-        }
-
-        switch type {
-        case .began: ()
-        case .ended:
-            // An interruption ended. Resume playback, if appropriate.
-
-            guard let optionsValue = userInfo[AVAudioSessionInterruptionOptionKey] as? UInt else { return }
-            let options = AVAudioSession.InterruptionOptions(rawValue: optionsValue)
-            if options.contains(.shouldResume) {
-                startRecording()
-            }
-
-        default: 
-            eventSink!(
-              FlutterError(
-                code: "100", message: "Recording was interrupted",
-                details: "Another process interrupted recording."))
-        }
+  @objc func handleInterruption(notification: Notification) {
+    // If no eventSink to emit events to, do nothing (wait)
+    if eventSink == nil {
+      return
+    }
+
+    guard let userInfo = notification.userInfo,
+      let typeValue = userInfo[AVAudioSessionInterruptionTypeKey] as? UInt,
+      let type = AVAudioSession.InterruptionType(rawValue: typeValue)
+    else {
+      return
     }
 
+    switch type {
+    case .began: ()
+    case .ended:
+      // An interruption ended. Resume playback, if appropriate.
+
+      guard let optionsValue = userInfo[AVAudioSessionInterruptionOptionKey] as? UInt else {
+        return
+      }
+      let options = AVAudioSession.InterruptionOptions(rawValue: optionsValue)
+      if options.contains(.shouldResume) {
+        startRecording(sampleRate: preferredSampleRate)
+      }
+
+    default:
+      eventSink!(
+        FlutterError(
+          code: "100", message: "Recording was interrupted",
+          details: "Another process interrupted recording."))
+    }
+  }
 
   // Handle stream emitting (Swift => Flutter)
   private func emitValues(values: [Float]) {
@@ -89,8 +91,8 @@ public class SwiftAudioStreamerPlugin: NSObject, FlutterPlugin, FlutterStreamHan
   ) -> FlutterError? {
     self.eventSink = eventSink
     if let args = arguments as? [String: Any] {
-      let sampleRate = args["sampleRate"] as? Int
-      startRecording(sampleRate: sampleRate)
+      preferredSampleRate = args["sampleRate"] as? Int
+      startRecording(sampleRate: preferredSampleRate)
     } else {
       startRecording(sampleRate: nil)
     }
@@ -108,43 +110,33 @@ public class SwiftAudioStreamerPlugin: NSObject, FlutterPlugin, FlutterStreamHan
   func startRecording(sampleRate: Int?) {
     engine = AVAudioEngine()
 
-    try! AVAudioSession.sharedInstance().setCategory(
-      AVAudioSession.Category.playAndRecord, options: .mixWithOthers)
     do {
+      try AVAudioSession.sharedInstance().setCategory(
+        AVAudioSession.Category.playAndRecord, options: .mixWithOthers)
+      try AVAudioSession.sharedInstance().setActive(true)
+
       if let sampleRateNotNull = sampleRate {
         // Try to set sample rate
-        try print(AVAudioSession.sharedInstance().setPreferredSampleRate(Double(sampleRateNotNull)))
+        try AVAudioSession.sharedInstance().setPreferredSampleRate(Double(sampleRateNotNull))
       }
-    } catch {
-      print("Unexpected error: \(error).")
-    }
 
+      let input = engine.inputNode
+      let bus = 0
 
-    func startRecording() {
-        engine = AVAudioEngine()
-
-        do {
-            try AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playAndRecord, options: .mixWithOthers)
-            try AVAudioSession.sharedInstance().setActive(true)
-            
-            if let sampleRateNotNull = sampleRate {
-              // Try to set sample rate
-              try AVAudioSession.sharedInstance().setPreferredSampleRate(Double(sampleRateNotNull))
-            }
-
-            let input = engine.inputNode
-            let bus = 0
-
-            input.installTap(onBus: bus, bufferSize: 22050, format: input.inputFormat(forBus: bus)) { buffer, _ -> Void in
-                let samples = buffer.floatChannelData?[0]
-                // audio callback, samples in samples[0]...samples[buffer.frameLength-1]
-                let arr = Array(UnsafeBufferPointer(start: samples, count: Int(buffer.frameLength)))
-                self.emitValues(values: arr)
-            }
-
-            try engine.start()
-        } catch {
-            eventSink!(FlutterError(code: "100", message: "Unable to start audio session", details: error.localizedDescription))
-        }
+      input.installTap(onBus: bus, bufferSize: 22050, format: input.inputFormat(forBus: bus)) {
+        buffer, _ -> Void in
+        let samples = buffer.floatChannelData?[0]
+        // audio callback, samples in samples[0]...samples[buffer.frameLength-1]
+        let arr = Array(UnsafeBufferPointer(start: samples, count: Int(buffer.frameLength)))
+        self.emitValues(values: arr)
+      }
+
+      try engine.start()
+    } catch {
+      eventSink!(
+        FlutterError(
+          code: "100", message: "Unable to start audio session", details: error.localizedDescription
+        ))
     }
+  }
 }