Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Commit 9fd0ce9

Browse files
author
xianing
committed
Merge remote-tracking branch 'origin/dev/3.4.5' into dev/3.4.5
2 parents 2a45665 + a8f2eef commit 9fd0ce9

4 files changed

Lines changed: 77 additions & 12 deletions

File tree

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ extension RawAudioDataMain: AgoraRtcEngineDelegate {
209209
}
210210
}
211211

212+
212213
// audio data plugin, here you can process raw audio data
213214
// note this all happens in CPU so it comes with a performance cost
214-
extension RawAudioDataMain: AgoraAudioFrameDelegate {
215+
extension RawAudioDataMain: AgoraAudioFrameDelegate{
215216
func onRecord(_ frame: AgoraAudioFrame) -> Bool {
216217
return true
217218
}
@@ -227,4 +228,35 @@ extension RawAudioDataMain: AgoraAudioFrameDelegate {
227228
func onPlaybackAudioFrame(beforeMixing frame: AgoraAudioFrame, uid: UInt) -> Bool {
228229
return true
229230
}
231+
232+
func getObservedFramePosition() -> AgoraAudioFramePosition {
233+
return .record
234+
}
235+
236+
func getMixedAudioParams() -> AgoraAudioParam {
237+
let param = AgoraAudioParam()
238+
param.channel = 1
239+
param.mode = .readOnly
240+
param.sampleRate = 44100
241+
param.samplesPerCall = 1024
242+
return param
243+
}
244+
245+
func getRecordAudioParams() -> AgoraAudioParam {
246+
let param = AgoraAudioParam()
247+
param.channel = 1
248+
param.mode = .readOnly
249+
param.sampleRate = 44100
250+
param.samplesPerCall = 1024
251+
return param
252+
}
253+
254+
func getPlaybackAudioParams() -> AgoraAudioParam {
255+
let param = AgoraAudioParam()
256+
param.channel = 1
257+
param.mode = .readOnly
258+
param.sampleRate = 44100
259+
param.samplesPerCall = 1024
260+
return param
261+
}
230262
}

‎macOS/APIExample/Commons/AgoraExtension.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,17 @@ extension AgoraClientRole {
8787
}
8888
}
8989

90-
extension AgoraVideoBackgroundSourceType {
90+
extension AgoraVirtualBackgroundSourceType {
9191
func description() -> String {
9292
switch self {
93-
case .none: return "None".localized
9493
case .color: return "Colored Background".localized
9594
case .img: return "Image Background".localized
9695
default:
9796
return "\(self.rawValue)"
9897
}
9998
}
100-
static func allValues() -> [AgoraVideoBackgroundSourceType] {
101-
return [.none, .color, .img]
99+
static func allValues() -> [AgoraVirtualBackgroundSourceType] {
100+
return [.color, .img]
102101
}
103102
}
104103

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ extension RawAudioData: AgoraRtcEngineDelegate {
308308

309309
// audio data plugin, here you can process raw audio data
310310
// note this all happens in CPU so it comes with a performance cost
311-
extension RawAudioData: AgoraAudioFrameDelegate {
311+
extension RawAudioData: AgoraAudioFrameDelegate{
312312
func onRecord(_ frame: AgoraAudioFrame) -> Bool {
313313
return true
314314
}
@@ -324,4 +324,37 @@ extension RawAudioData: AgoraAudioFrameDelegate {
324324
func onPlaybackAudioFrame(beforeMixing frame: AgoraAudioFrame, uid: UInt) -> Bool {
325325
return true
326326
}
327+
328+
func getObservedFramePosition() -> AgoraAudioFramePosition {
329+
return .record
330+
}
331+
332+
func getMixedAudioParams() -> AgoraAudioParam {
333+
let param = AgoraAudioParam()
334+
param.channel = 1
335+
param.mode = .readOnly
336+
param.sampleRate = 44100
337+
param.samplesPerCall = 1024
338+
return param
339+
}
340+
341+
func getRecordAudioParams() -> AgoraAudioParam {
342+
let param = AgoraAudioParam()
343+
param.channel = 1
344+
param.mode = .readOnly
345+
param.sampleRate = 44100
346+
param.samplesPerCall = 1024
347+
return param
348+
}
349+
350+
func getPlaybackAudioParams() -> AgoraAudioParam {
351+
let param = AgoraAudioParam()
352+
param.channel = 1
353+
param.mode = .readOnly
354+
param.sampleRate = 44100
355+
param.samplesPerCall = 1024
356+
return param
357+
}
358+
359+
327360
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ class JoinChannelVideoMain: BaseViewController {
222222
--- Background Picker ---
223223
*/
224224
@IBOutlet weak var selectBackgroundPicker: Picker!
225-
private let backgroundTypes = AgoraVideoBackgroundSourceType.allValues()
226-
var selectedBackgroundType: AgoraVideoBackgroundSourceType? {
225+
private let backgroundTypes = AgoraVirtualBackgroundSourceType.allValues()
226+
var selectedBackgroundType: AgoraVirtualBackgroundSourceType? {
227227
let index = self.selectBackgroundPicker.indexOfSelectedItem
228228
if index >= 0 && index < backgroundTypes.count {
229229
return backgroundTypes[index]
@@ -294,8 +294,8 @@ class JoinChannelVideoMain: BaseViewController {
294294
}
295295

296296
private func setBackground(){
297-
let backgroundSource = AgoraVideoBackgroundSource()
298-
backgroundSource.backgroundSourceType = selectedBackgroundType ?? .none
297+
let backgroundSource = AgoraVirtualBackgroundSource()
298+
backgroundSource.backgroundSourceType = selectedBackgroundType ?? .img
299299
switch self.selectedBackgroundType {
300300
case .color:
301301
backgroundSource.color = 0x000000
@@ -308,7 +308,7 @@ class JoinChannelVideoMain: BaseViewController {
308308
default:
309309
break
310310
}
311-
agoraKit.enableVideoBackgroundSubstitution(true, backData: backgroundSource)
311+
agoraKit.enableVirtualBackground(true, backData: backgroundSource)
312312
}
313313

314314
func layoutVideos(_ count: Int) {
@@ -530,7 +530,8 @@ extension JoinChannelVideoMain: AgoraRtcEngineDelegate {
530530
/// Reports the video background substitution success or failed.
531531
/// @param enabled whether background substitution is enabled.
532532
/// @param reason The reason of the background substitution callback. See [AgoraVideoBackgroundSourceStateReason](AgoraVideoBackgroundSourceStateReason).
533-
func rtcEngine(_ engine: AgoraRtcEngineKit, videoBackgroundSourceEnabled enabled: Bool, reason: AgoraVideoBackgroundSourceStateReason) {
533+
534+
func rtcEngine(_ engine: AgoraRtcEngineKit, virtualBackgroundSourceEnabled enabled: Bool, reason: AgoraVirtualBackgroundSourceStateReason) {
534535
if reason != .vbsStateReasonSuccess {
535536
LogUtils.log(message: "background substitution failed to enabled for \(reason.rawValue)", level: .warning)
536537
}

0 commit comments

Comments
 (0)