Merge remote-tracking branch 'origin/dev/3.4.5' into dev/3.4.5

Author: xianing

iOS/APIExample/Examples/Advanced/RawAudioData/RawAudioData.swift

@@ -209,9 +209,10 @@ extension RawAudioDataMain: AgoraRtcEngineDelegate {
     }
 }
 
+
 // audio data plugin, here you can process raw audio data
 // note this all happens in CPU so it comes with a performance cost
-extension RawAudioDataMain: AgoraAudioFrameDelegate {
+extension RawAudioDataMain: AgoraAudioFrameDelegate{
     func onRecord(_ frame: AgoraAudioFrame) -> Bool {
         return true
     }
@@ -227,4 +228,35 @@ extension RawAudioDataMain: AgoraAudioFrameDelegate {
     func onPlaybackAudioFrame(beforeMixing frame: AgoraAudioFrame, uid: UInt) -> Bool {
         return true
     }
+    
+    func getObservedFramePosition() -> AgoraAudioFramePosition {
+        return .record
+    }
+    
+    func getMixedAudioParams() -> AgoraAudioParam {
+        let param = AgoraAudioParam()
+        param.channel = 1
+        param.mode = .readOnly
+        param.sampleRate = 44100
+        param.samplesPerCall = 1024
+        return param
+    }
+    
+    func getRecordAudioParams() -> AgoraAudioParam {
+        let param = AgoraAudioParam()
+        param.channel = 1
+        param.mode = .readOnly
+        param.sampleRate = 44100
+        param.samplesPerCall = 1024
+        return param
+    }
+    
+    func getPlaybackAudioParams() -> AgoraAudioParam {
+        let param = AgoraAudioParam()
+        param.channel = 1
+        param.mode = .readOnly
+        param.sampleRate = 44100
+        param.samplesPerCall = 1024
+        return param
+    }
 }

macOS/APIExample/Commons/AgoraExtension.swift

@@ -87,18 +87,17 @@ extension AgoraClientRole {
     }
 }
 
-extension AgoraVideoBackgroundSourceType {
+extension AgoraVirtualBackgroundSourceType {
     func description() -> String {
         switch self {
-        case .none: return "None".localized
         case .color: return "Colored Background".localized
         case .img: return "Image Background".localized
         default:
             return "\(self.rawValue)"
         }
     }
-    static func allValues() -> [AgoraVideoBackgroundSourceType] {
-        return [.none, .color, .img]
+    static func allValues() -> [AgoraVirtualBackgroundSourceType] {
+        return [.color, .img]
     }
 }
 

macOS/APIExample/Examples/Advanced/RawAudioData/RawAudioData.swift

@@ -308,7 +308,7 @@ extension RawAudioData: AgoraRtcEngineDelegate {
 
 // audio data plugin, here you can process raw audio data
 // note this all happens in CPU so it comes with a performance cost
-extension RawAudioData: AgoraAudioFrameDelegate {
+extension RawAudioData: AgoraAudioFrameDelegate{
     func onRecord(_ frame: AgoraAudioFrame) -> Bool {
         return true
     }
@@ -324,4 +324,37 @@ extension RawAudioData: AgoraAudioFrameDelegate {
     func onPlaybackAudioFrame(beforeMixing frame: AgoraAudioFrame, uid: UInt) -> Bool {
         return true
     }
+    
+    func getObservedFramePosition() -> AgoraAudioFramePosition {
+        return .record
+    }
+    
+    func getMixedAudioParams() -> AgoraAudioParam {
+        let param = AgoraAudioParam()
+        param.channel = 1
+        param.mode = .readOnly
+        param.sampleRate = 44100
+        param.samplesPerCall = 1024
+        return param
+    }
+    
+    func getRecordAudioParams() -> AgoraAudioParam {
+        let param = AgoraAudioParam()
+        param.channel = 1
+        param.mode = .readOnly
+        param.sampleRate = 44100
+        param.samplesPerCall = 1024
+        return param
+    }
+    
+    func getPlaybackAudioParams() -> AgoraAudioParam {
+        let param = AgoraAudioParam()
+        param.channel = 1
+        param.mode = .readOnly
+        param.sampleRate = 44100
+        param.samplesPerCall = 1024
+        return param
+    }
+    
+    
 }

macOS/APIExample/Examples/Basic/JoinChannelVideo/JoinChannelVideo.swift

@@ -222,8 +222,8 @@ class JoinChannelVideoMain: BaseViewController {
      --- Background Picker ---
      */
     @IBOutlet weak var selectBackgroundPicker: Picker!
-    private let backgroundTypes = AgoraVideoBackgroundSourceType.allValues()
-    var selectedBackgroundType: AgoraVideoBackgroundSourceType? {
+    private let backgroundTypes = AgoraVirtualBackgroundSourceType.allValues()
+    var selectedBackgroundType: AgoraVirtualBackgroundSourceType? {
         let index = self.selectBackgroundPicker.indexOfSelectedItem
         if index >= 0 && index < backgroundTypes.count {
             return backgroundTypes[index]
@@ -294,8 +294,8 @@ class JoinChannelVideoMain: BaseViewController {
     }
 
     private func setBackground(){
-        let backgroundSource = AgoraVideoBackgroundSource()
-        backgroundSource.backgroundSourceType = selectedBackgroundType ?? .none
+        let backgroundSource = AgoraVirtualBackgroundSource()
+        backgroundSource.backgroundSourceType = selectedBackgroundType ?? .img
         switch self.selectedBackgroundType {
         case .color:
             backgroundSource.color = 0x000000
@@ -308,7 +308,7 @@ class JoinChannelVideoMain: BaseViewController {
         default:
             break
         }
-        agoraKit.enableVideoBackgroundSubstitution(true, backData: backgroundSource)
+        agoraKit.enableVirtualBackground(true, backData: backgroundSource)
     }
 
     func layoutVideos(_ count: Int) {
@@ -530,7 +530,8 @@ extension JoinChannelVideoMain: AgoraRtcEngineDelegate {
     /// Reports the video background substitution success or failed.
     /// @param enabled whether background substitution is enabled.
     /// @param reason The reason of the background substitution callback. See [AgoraVideoBackgroundSourceStateReason](AgoraVideoBackgroundSourceStateReason).
-    func rtcEngine(_ engine: AgoraRtcEngineKit, videoBackgroundSourceEnabled enabled: Bool, reason: AgoraVideoBackgroundSourceStateReason) {
+    
+    func rtcEngine(_ engine: AgoraRtcEngineKit, virtualBackgroundSourceEnabled enabled: Bool, reason: AgoraVirtualBackgroundSourceStateReason) {
         if reason != .vbsStateReasonSuccess {
             LogUtils.log(message: "background substitution failed to enabled for \(reason.rawValue)", level: .warning)
         }