Merge branch 'dev/3.4.0' of https://github.i.agoralab.co/AgoraIO/API-Examples into dev/3.4.0

� Conflicts:
�	Android/APIExample/lib-component/build.gradle

Author: xianing

Android/APIExample/build.gradle

@@ -4,6 +4,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url 'https://www.jitpack.io' }
 
     }
     dependencies {
@@ -20,6 +21,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://www.jitpack.io' }
     }
 }
 

Android/APIExample/lib-component/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-//    api 'io.agora.rtc:full-sdk:3.4.0'0
+    api 'com.github.agorabuilder:native-full-sdk:3.4.0'
     api 'io.agora:agoraplayer:1.2.2'
 
-}
+}

Android/APIExample/lib-raw-data/src/main/cpp/io_agora_advancedvideo_rawdata_MediaPreProcessing.cpp

@@ -179,6 +179,9 @@ class AgoraVideoFrameObserver : public agora::media::IVideoFrameObserver
         return true;
     }
 
+    virtual VIDEO_FRAME_TYPE getVideoFormatPreference() override {
+        return FRAME_TYPE_YUV420; // Please don't modify videoFormatPreference in this raw data processing plugin, otherwise it won't work.
+    }
 };
 
 /**Listener to get audio frame*/
@@ -295,6 +298,8 @@ class AgoraAudioFrameObserver : public agora::media::IAudioFrameObserver
         writebackAudioFrame(audioFrame, _javaDirectPlayBufferMixAudio);
         return true;
     }
+
+
 };
 
 

iOS/APIExample/Examples/Advanced/VideoChat/VideoChat.swift

@@ -17,7 +17,7 @@ class VideoChatEntry: UIViewController {
     @IBOutlet var resolutionBtn: UIButton!
     @IBOutlet var fpsBtn: UIButton!
     @IBOutlet var orientationBtn: UIButton!
-    var width:Int = 640, height:Int = 360, orientation:AgoraVideoOutputOrientationMode = .adaptative, fps: AgoraVideoFrameRate = .fps30
+    var width:Int = 640, height:Int = 360, orientation:AgoraVideoOutputOrientationMode = .adaptative, fps: AgoraVideoFrameRate = .fps15
 
     override func viewDidLoad() {
         super.viewDidLoad()

iOS/Podfile

@@ -6,12 +6,12 @@ target 'APIExample' do
   use_frameworks!
   pod 'Floaty', '~> 4.2.0'  
   pod 'AGEVideoLayout', '~> 1.0.2'
-  # pod 'AgoraRtcEngine_iOS', '3.4.0'
+  pod 'AgoraRtcEngine_iOS', '3.4.0'
   pod 'AgoraMediaPlayer_iOS', '1.2.2'
 end
 
 target 'Agora-ScreenShare-Extension' do
 
   use_frameworks!
-  # pod 'AgoraRtcEngine_iOS', '3.4.0'
+  pod 'AgoraRtcEngine_iOS', '3.4.0'
 end

macOS/Podfile

@@ -7,7 +7,7 @@ target 'APIExample' do
 
   # Pods for APIExample
   pod 'AGEVideoLayout', '~> 1.0.2'
-  # pod 'AgoraRtcEngine_macOS', '3.4.0'
+  pod 'AgoraRtcEngine_macOS', '3.4.0'
 
   target 'APIExampleTests' do
     inherit! :search_paths