fix bug

Author: zhaoyongqiang

iOS/APIExample/Common/AgoraExtension.swift

@@ -94,14 +94,13 @@ extension AgoraAudioScenario {
         switch self {
         case .default: return "Default".localized
         case .gameStreaming: return "Game Streaming".localized
-        case .highDefinition: return "High Defination".localized
         default:
             return "\(self.rawValue)"
         }
     }
 
     static func allValues() -> [AgoraAudioScenario] {
-        return [.default, .gameStreaming, .highDefinition]
+        return [.default, .gameStreaming]
     }
 }
 

iOS/APIExample/Common/ExternalAudio/AgoraPcmSourcePush.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 protocol AgoraPcmSourcePushDelegate {
-    func onAudioFrame(data: Data) -> Void
+    func onAudioFrame(data: UnsafeMutablePointer<UInt8>) -> Void
 }
 
 class AgoraPcmSourcePush: NSObject {
@@ -61,7 +61,8 @@ class AgoraPcmSourcePush: NSObject {
             let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: bufferSize)
             while input.hasBytesAvailable && self.state == .Play {
                 input.read(buffer, maxLength: bufferSize)
-                self.delegate?.onAudioFrame(data: Data(bytes: buffer, count: bufferSize))
+//                self.delegate?.onAudioFrame(data: Data(bytes: buffer, count: bufferSize))
+                self.delegate?.onAudioFrame(data: buffer)
                 Thread.sleep(forTimeInterval: sleepTime)
             }
             buffer.deallocate()

iOS/APIExample/Common/ExternalAudio/ExternalAudio.mm

@@ -215,7 +215,7 @@ virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame)
 
     virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) override { return true; }
 
-    virtual AUDIO_FRAME_POSITION getObservedAudioFramePosition() override {
+    virtual int getObservedAudioFramePosition() override {
         return AUDIO_FRAME_POSITION_NONE;
     }
     virtual AudioParams getPlaybackAudioParams() override {

iOS/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.mm

@@ -251,7 +251,7 @@ virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) ov
         return true;
     }
 
-    virtual AUDIO_FRAME_POSITION getObservedAudioFramePosition() override {
+    virtual int getObservedAudioFramePosition() override {
         return AUDIO_FRAME_POSITION_NONE;
     }
     virtual AudioParams getPlaybackAudioParams() override {

iOS/APIExample/Examples/Advanced/CreateDataStream/CreateDataStream.swift

@@ -79,6 +79,7 @@ class CreateDataStreamMain: BaseViewController {
 
         // enable video module and set up video encoding configs
         agoraKit.enableVideo()
+        agoraKit.enableAudio()
         agoraKit.setVideoEncoderConfiguration(AgoraVideoEncoderConfiguration(size: resolution,
                 frameRate: fps,
                 bitrate: AgoraVideoBitrateStandard,

iOS/APIExample/Examples/Advanced/CustomPcmAudioSource/Base.lproj/CustomPcmAudioSource.storyboard

@@ -103,7 +103,7 @@
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Jll-ir-flF">
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jll-ir-flF">
                                         <rect key="frame" x="345" y="8.5" width="51" height="31"/>
                                         <connections>
                                             <action selector="openOrCloseMic:" destination="wEj-TK-x0n" eventType="valueChanged" id="wEd-JG-xcv"/>

iOS/APIExample/Examples/Advanced/CustomPcmAudioSource/CustomPcmAudioSource.swift

@@ -52,9 +52,9 @@ class CustomPcmAudioSourceMain: BaseViewController {
         }
     }
 
+    let sampleRate:UInt = 44100, channel:UInt = 2, bitPerSample = 16, samples = 441 * 10
     override func viewDidLoad(){
         super.viewDidLoad()
-        let sampleRate:UInt = 44100, channel:UInt = 2, bitPerSample = 16, samples = 441 * 10
 
         // set up agora instance when view loaded
         let config = AgoraRtcEngineConfig()
@@ -122,7 +122,7 @@ class CustomPcmAudioSourceMain: BaseViewController {
         let option = AgoraRtcChannelMediaOptions()
         option.publishCameraTrack = .of(false)
         option.publishCustomAudioTrack = .of(sender.isOn)
-        option.clientRoleType = .of((Int32)(AgoraClientRole.broadcaster.rawValue))
+        option.clientRoleType = .of((Int32)(sender.isOn ? AgoraClientRole.broadcaster.rawValue : AgoraClientRole.audience.rawValue))
         agoraKit.updateChannel(with: option)
     }
 
@@ -137,9 +137,8 @@ class CustomPcmAudioSourceMain: BaseViewController {
 }
 
 extension CustomPcmAudioSourceMain: AgoraPcmSourcePushDelegate {
-    func onAudioFrame(data: Data) {
-        let ret = agoraKit.pushExternalAudioFrameNSData(data, sourceId: 1, timestamp: 0)
-        LogUtils.log(message: "onAudioFrame, result: \(ret)", level: .info)
+    func onAudioFrame(data: UnsafeMutablePointer<UInt8>) {
+        agoraKit.pushExternalAudioFrameRawData(data, samples: samples, sourceId: 0, timestamp: 0)
     }
 }
 

iOS/APIExample/Examples/Advanced/FusionCDN/FusionCDN.swift

@@ -209,6 +209,9 @@ class FusionCDNHost: BaseViewController {
         rtcSwitcher.isEnabled = false
         streamingButton.setTitle("Start Live Streaming", for: .normal)
         streamingButton.setTitleColor(.blue, for: .normal)
+        agoraKit.stopDirectCdnStreaming()
+        agoraKit.stopRtmpStream(streamingUrl)
+        agoraKit.removePublishStreamUrl(streamingUrl)
     }
 
     @IBAction func setRtcStreaming(_ sender: UISwitch) {
@@ -355,7 +358,7 @@ class FusionCDNAudience: BaseViewController {
         guard let mode = configs["mode"] as? StreamingMode else {return}
         guard let channelName = configs["channelName"] as? String else {return}
         if mode == .agoraChannel {
-            streamingUrl = "rtmp://mdetest2.pull.agoramde.agoraio.cn/live/\(channelName)"
+            streamingUrl = "rtmp://push.webdemo.agoraio.cn/lbhd/\(channelName)"
             rtcSwitcher.isEnabled = false
             let ret = mediaPlayerKit.open(withAgoraCDNSrc: streamingUrl, startPos: 0)
             print(ret)
@@ -545,7 +548,7 @@ extension FusionCDNHost: AgoraRtcEngineDelegate {
     }
 
     func rtcEngine(_ engine: AgoraRtcEngineKit, rtmpStreamingChangedToState url: String, state: AgoraRtmpStreamingState, errCode: AgoraRtmpStreamingErrorCode) {
-        self.showAlert(message: "On rtmpStreamingChangedToState, state: \(state.rawValue), errCode: \(errCode.rawValue)")
+        LogUtils.log(message: "On rtmpStreamingChangedToState, state: \(state.rawValue), errCode: \(errCode.rawValue)", level: .info)
     }
 
     func rtcEngine(_ engine: AgoraRtcEngineKit, streamUnpublishedWithUrl url: String) {

iOS/APIExample/Examples/Advanced/LiveStreaming/Base.lproj/LiveStreaming.storyboard

@@ -132,18 +132,20 @@
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w4q-aT-JBc">
                                 <rect key="frame" x="20" y="688" width="80" height="31"/>
+                                <color key="backgroundColor" name="btnPanelBackground"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="80" id="lMn-Oa-jhp"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="Xdc-MD-QxT"/>
                                 </constraints>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="截图">
-                                    <backgroundConfiguration key="background">
+                                <buttonConfiguration key="configuration" style="plain" title="截图" cornerStyle="fixed">
+                                    <backgroundConfiguration key="background" cornerRadius="5">
                                         <color key="backgroundColor" name="btnPanelBackground"/>
+                                        <color key="strokeColor" name="btnPanelBackground"/>
                                     </backgroundConfiguration>
                                     <color key="baseForegroundColor" name="btnPanelForeground"/>
                                 </buttonConfiguration>
                                 <connections>
-                                    <action selector="onTakeSnapshot:" destination="jxp-ZN-2yG" eventType="touchUpInside" id="jUu-C7-xyh"/>
+                                    <action selector="onTakeSnapshot:" destination="jxp-ZN-2yG" eventType="touchUpInside" id="kRb-DS-stE"/>
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wts-5Z-p7a" userLabel="UltraLowLatency">
@@ -209,6 +211,7 @@
                             <constraint firstItem="Wts-5Z-p7a" firstAttribute="top" secondItem="w4q-aT-JBc" secondAttribute="bottom" constant="10" id="eE9-IZ-7gP"/>
                             <constraint firstItem="Wts-5Z-p7a" firstAttribute="leading" secondItem="Uwe-Fi-04a" secondAttribute="leading" id="ewr-t2-jKP"/>
                             <constraint firstItem="CeS-QQ-Djo" firstAttribute="trailing" secondItem="q9v-1n-ZYf" secondAttribute="trailing" id="isT-Rq-5PH"/>
+                            <constraint firstItem="CeS-QQ-Djo" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="w4q-aT-JBc" secondAttribute="trailing" symbolic="YES" id="koD-0t-Wh7"/>
                             <constraint firstItem="Uwe-Fi-04a" firstAttribute="top" secondItem="Wts-5Z-p7a" secondAttribute="bottom" constant="10" id="wl5-PM-CyG"/>
                         </constraints>
                     </view>

iOS/APIExample/Examples/Advanced/LiveStreaming/LiveStreaming.swift

@@ -65,7 +65,6 @@ class LiveStreamingMain: BaseViewController {
     var remoteUid: UInt? {
         didSet {
             foregroundVideoContainer.isHidden = !(role == .broadcaster && remoteUid != nil)
-            takeSnapshot.isEnabled = remoteUid != nil
         }
     }
     var agoraKit: AgoraRtcEngineKit!
@@ -93,7 +92,6 @@ class LiveStreamingMain: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        takeSnapshot.isEnabled = false
         // layout render view
         foregroundVideoContainer.addSubview(foregroundVideo)
         backgroundVideoContainer.addSubview(backgroundVideo)
@@ -192,10 +190,12 @@ class LiveStreamingMain: BaseViewController {
 
     @IBAction func onTakeSnapshot(_ sender: Any) {
         guard let remoteUid = remoteUid else {
+            showAlert(title: "remote user has not joined, and cannot take a screenshot".localized, message: "")
             return
         }
         let path = NSTemporaryDirectory().appending("1.png")
         agoraKit.takeSnapshot(Int(remoteUid), filePath: path)
+        showAlert(title: "Screenshot successful".localized, message: path)
     }
     @IBAction func onTapForegroundVideo(_ sender:UIGestureRecognizer) {
         isLocalVideoForeground = !isLocalVideoForeground