Skip to content

Commit 3a12b8e

Browse files
author
xianing
committed
adapt iOS 37200
1 parent cb5c709 commit 3a12b8e

8 files changed

Lines changed: 11 additions & 10 deletions

File tree

iOS/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ virtual bool onTranscodedVideoFrame(VideoFrame& videoFrame) override
148148
// return VIDEO_FRAME_TYPE(mediaDataPlugin.videoFormatter.type);
149149
// }
150150

151-
virtual int getRotationApplied() override
151+
virtual bool getRotationApplied() override
152152
{
153153
return mediaDataPlugin.videoFormatter.rotationApplied;
154154
}

iOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class AudioMixingMain: BaseViewController {
126126
agoraKit.setDefaultAudioRouteToSpeakerphone(true)
127127

128128
// enable volume indicator
129-
agoraKit.enableAudioVolumeIndication(200, smooth: 3)
129+
agoraKit.enableAudioVolumeIndication(200, smooth: 3, reportvad: false)
130130

131131

132132
// start joining channel

iOS/APIExample/Examples/Advanced/CustomVideoSourcePush/CustomVideoSourcePush.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class CustomVideoSourcePushMain: BaseViewController {
8989
// note setupLocalVideo is not working when using pushExternalVideoFrame
9090
// so you will have to prepare the preview yourself
9191
customCamera = AgoraCameraSourcePush(delegate: self, videoView:localVideo)
92-
agoraKit.setExternalVideoSource(true, useTexture: true, encodedFrame: true)
92+
agoraKit.setExternalVideoSource(true, useTexture: true, sourceType: .videoFrame)
9393
customCamera?.startCapture(ofCamera: .defaultCamera())
9494

9595
agoraKit.setVideoEncoderConfiguration(

iOS/APIExample/Examples/Advanced/JoinMultiChannel/JoinMultiChannel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class JoinMultiChannelMain: BaseViewController, AgoraRtcEngineDelegate {
9090
agoraKit.setDefaultAudioRouteToSpeakerphone(true)
9191

9292
// setup external video source
93-
agoraKit.setExternalVideoSource(true, useTexture: false, encodedFrame: true)
93+
agoraKit.setExternalVideoSource(true, useTexture: true, sourceType: .videoFrame)
9494
imageSource.delegate = self
9595
imageSource.startSource()
9696

iOS/APIExample/Examples/Basic/JoinChannelAudio/JoinChannelAudio.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class JoinChannelAudioMain: BaseViewController {
116116
agoraKit.setDefaultAudioRouteToSpeakerphone(true)
117117

118118
// enable volume indicator
119-
agoraKit.enableAudioVolumeIndication(200, smooth: 3)
119+
agoraKit.enableAudioVolumeIndication(200, smooth: 3, reportvad: true)
120120

121121
recordingVolumeSlider.maximumValue = 400
122122
recordingVolumeSlider.minimumValue = 0

iOS/Agora-ScreenShare-Extension/AgoraUploader.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import Foundation
1010
import CoreMedia
1111
import ReplayKit
12+
import AgoraRtcKit
1213

1314
class AgoraUploader {
1415
private static let videoDimension : CGSize = {
@@ -36,7 +37,7 @@ class AgoraUploader {
3637
let kit = AgoraRtcEngineKit.sharedEngine(with: config, delegate: nil)
3738

3839
kit.enableVideo()
39-
kit.setExternalVideoSource(true, useTexture: true, encodedFrame: true)
40+
kit.setExternalVideoSource(true, useTexture: true, sourceType: .videoFrame)
4041
let videoConfig = AgoraVideoEncoderConfiguration(size: AgoraVideoDimension640x360,
4142
frameRate: .fps10,
4243
bitrate: AgoraVideoBitrateStandard,

iOS/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ target 'APIExample' do
66
pod 'Floaty', '~> 4.2.0'
77
pod 'AGEVideoLayout', '~> 1.0.2'
88
pod 'CocoaAsyncSocket', '7.6.5'
9-
pod 'AgoraFFmpegPlayer_iOS_Preview', '4.0.0'
9+
# pod 'AgoraRtcEngine_iOS_Preview', '4.0.0.preview.3'
1010
end
1111

1212
target 'Agora-ScreenShare-Extension' do
13-
pod 'AgoraFFmpegPlayer_iOS_Preview', '4.0.0'
13+
# pod 'AgoraRtcEngine_iOS_Preview', '4.0.0.preview.3'
1414
use_frameworks!
1515
end
1616

@@ -19,7 +19,7 @@ target 'Agora-ScreenShare-Extension(Socket)' do
1919
end
2020

2121
target 'SimpleFilter' do
22-
pod 'AgoraFFmpegPlayer_iOS_Preview', '4.0.0'
22+
# pod 'AgoraRtcEngine_iOS_Preview', '4.0.0.preview.3'
2323
pod 'OpenCV', '~> 4.3.0'
2424
use_frameworks!
2525

macOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ class AudioMixing: BaseViewController {
469469

470470
@IBAction func onStartAudioMixing(_ sender: NSButton) {
471471
if let filepath = Bundle.main.path(forResource: "audiomixing", ofType: "mp3") {
472-
let result = agoraKit.startAudioMixing(filepath, loopback: false, replace: false, cycle: -1)
472+
let result = agoraKit.startAudioMixing("", loopback: false, replace: false, cycle: -1)
473473
if result != 0 {
474474
self.showAlert(title: "Error", message: "startAudioMixing call failed: \(result), please check your params")
475475
} else {

0 commit comments

Comments
 (0)