Adjust volume; rename namespace; preprocessor

AgoraEngine/ML2Support/Editor/PreprocessorDefine.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace Agora.Rtc.Extended
+{
+    // This class adds neccessary preprocessors for run ML2 related code
+    // Otherwise, it assume normal Unity app assemblies for using Agora
+    static class PreprocessorDefine
+    {
+        /// <summary>
+        /// Add define symbols as soon as Unity gets done compiling.
+        /// </summary>
+        [InitializeOnLoadMethod]
+        public static void AddDefineSymbols()
+        {
+            string currentDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+            HashSet<string> defines = new HashSet<string>(currentDefines.Split(';'))
+            {
+                "ML2_ENABLE"
+            };
+
+            // only touch PlayerSettings if we actually modified it,
+            // otherwise it shows up as changed in git each time.
+            string newDefines = string.Join(";", defines);
+            if (newDefines != currentDefines)
+            {
+                PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, newDefines);
+            }
+        }
+    }
+}

AgoraEngine/ML2Support/Scripts/AgoraController.cs

@@ -3,7 +3,7 @@
 using Agora.Rtc;
 using Agora.Util;
 
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     /// <summary>
     ///    The AgoraController serves as the simple plugin controller for MagicLeap2.

AgoraEngine/ML2Support/Scripts/CustomAudioCapturer.cs

@@ -8,7 +8,7 @@
 using UnityEngine.XR.MagicLeap;
 #endif
 
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     /// <summary>
     /// The Custom Audio Capturer class uses Microphone audio source to

AgoraEngine/ML2Support/Scripts/CustomAudioObserver.cs

@@ -7,7 +7,7 @@
 using Agora_RTC_Plugin.API_Example.Examples.Advanced.ProcessAudioRawData;
 using Agora.Util;
 
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     /// <summary>
     /// The Custom AudioSink Player class receives audio frames from the
@@ -201,4 +201,4 @@ public override bool OnPlaybackAudioFrameBeforeMixing(string channel_id,
     }
 
     #endregion
-}
+}

AgoraEngine/ML2Support/Scripts/CustomAudioSinkPlayer.cs

@@ -6,7 +6,7 @@
 using Agora.Rtc;
 using RingBuffer;
 
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     /// <summary>
     /// The Custom AudioSink Player class receives audio frames from the
@@ -61,6 +61,9 @@ public override void Init(IRtcEngine engine, object rtclock)
             mRtcEngine = engine;
             _rtclock = rtclock;
             mRtcEngine.SetExternalAudioSink(true, SAMPLE_RATE, CHANNEL);
+
+            // Increase playback overall volume
+            mRtcEngine.AdjustPlaybackSignalVolume(200);
         }
 
         void KickStartAudio(AudioSource aud, string clipName)

AgoraEngine/ML2Support/Scripts/CustomVideoCapturer.cs

@@ -9,7 +9,7 @@
 
 using Agora.Rtc;
 
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     public class CustomVideoCapturer : IVideoCaptureManager
     {
@@ -374,7 +374,10 @@ void ShareScreen(byte[] bytes, int width, int height)
                 //externalVideoFrame.rotation = 180;
                 externalVideoFrame.timestamp = 0;
                 //Push the external video frame with the frame we just created
-                _rtcEngine.PushVideoFrame(externalVideoFrame);
+                lock (_rtclock)
+                {
+                    _rtcEngine.PushVideoFrame(externalVideoFrame);
+                }
                 if (++timestamp % 100 == 0)
                 {
                     Debug.Log("Pushed video frame = " + timestamp);

AgoraEngine/ML2Support/Scripts/IAudioCaptureManager.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     public abstract class IAudioCaptureManager : MonoBehaviour
     {

AgoraEngine/ML2Support/Scripts/IAudioRenderManager.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     public abstract class IAudioRenderManager : MonoBehaviour
     {

AgoraEngine/ML2Support/Scripts/IVideoCaptureManager.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     /// <summary>
     ///   This interface declares the neccessary methods for managing the views for video streaming.

AgoraEngine/ML2Support/Scripts/IVideoRenderManager.cs

@@ -1,4 +1,4 @@
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     /// <summary>
     ///   This interface declares the neccessary methods for managing the views for video streaming.
@@ -9,4 +9,4 @@ public interface IVideoRenderManager
         void MakeVideoView(uint uid);
         void UpdateVideoView(uint uid, int width, int height, int rotation);
     }
-}
+}

AgoraEngine/ML2Support/Scripts/VideoRenderManager.cs

@@ -4,7 +4,7 @@
 using Agora.Rtc;
 using Agora.Util;
 
-namespace agora_sample
+namespace Agora.Rtc.Extended
 {
     /// <summary>
     ///   The Video Render Manager manages the remote user's view transform.  

AgoraEngine/ML2Support/TestDrivers/VirtualCameraDemo.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using Agora.Rtc;
 using UnityEngine;
+using Agora.Rtc.Extended;
 
 namespace agora_sample
 {
+    // This example runs on the non-ML2 environment to test pushVideoFrame
     public class VirtualCameraDemo : IVideoCaptureManager
     {
         [SerializeField]
@@ -19,12 +21,6 @@ public class VirtualCameraDemo : IVideoCaptureManager
             width = 1280,
             height = 720
         };
-        //[SerializeField]
-        //private int bitrate = 1130;
-        //private FRAME_RATE frameRate = FRAME_RATE.FRAME_RATE_FPS_30;
-        //[SerializeField]
-        //private VIDEO_MIRROR_MODE_TYPE mirrorMode = VIDEO_MIRROR_MODE_TYPE.VIDEO_MIRROR_MODE_DISABLED;
-        // use bitrate: 2260 for broadcast mode
 
         // Pixel format
         public static TextureFormat ConvertFormat = TextureFormat.RGBA32;