agora-electron-sdk 3.4.1 → 3.4.2-build.706

package/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.4.2-build.706 (July 16th, 2022)
+videoSourceSetAddonLogFile
 ## 3.4.1 (April 26st, 2021)
 * add new api:
   - adjustLoopbackRecordingSignalVolume

package/agora_node_ext/agora_node_ext.cpp

@@ -14,7 +14,6 @@
 using v8::Object;
 using agora::rtc::NodeRtcEngine;
 
-LogHelper g_logHelper("./agoraAddonlog.txt");
 
 /**
  * Initialize NODEJS ADDON
@@ -22,6 +21,7 @@ LogHelper g_logHelper("./agoraAddonlog.txt");
 void InitExt(Local<Object> module)
 {
 	LOG_ENTER;
+    LogHelper::getInstance("./agoraAddonlog.txt");
     NodeRtcEngine::Init(module);
     LOG_LEAVE;
 }

package/agora_node_ext/agora_rtc_engine.cpp

@@ -13,6 +13,7 @@
 #include "node_uid.h"
 #include "agora_video_source.h"
 #include "node_napi_api.h"
+#include "log_helper.h"
 #include "IAgoraRtcEngine2.h"
 #include <string>
 #include <nan.h>
@@ -193,6 +194,7 @@ namespace agora {
                 PROPERTY_METHOD_DEFINE(videoSourceEnableEncryption)
                 PROPERTY_METHOD_DEFINE(videoSourceSetEncryptionMode)
                 PROPERTY_METHOD_DEFINE(videoSourceSetEncryptionSecret);
+                PROPERTY_METHOD_DEFINE(videoSourceSetAddonLogFile);
                 PROPERTY_METHOD_DEFINE(setBool);
                 PROPERTY_METHOD_DEFINE(setInt);
                 PROPERTY_METHOD_DEFINE(setUInt);
@@ -321,6 +323,11 @@ namespace agora {
                 PROPERTY_METHOD_DEFINE(getAudioMixingFileDuration);
                 PROPERTY_METHOD_DEFINE(setProcessDpiAwareness);
                 PROPERTY_METHOD_DEFINE(videoSourceSetProcessDpiAwareness);
+                PROPERTY_METHOD_DEFINE(startAudioRecordingWithConfig);
+                /**
+                 * setAddonLogFile
+                 */
+                PROPERTY_METHOD_DEFINE(setAddonLogFile);
                 EN_PROPERTY_DEFINE()
                 module->Set(context, Nan::New<v8::String>("NodeRtcEngine").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked());
         }
@@ -2550,6 +2557,29 @@ namespace agora {
             LOG_LEAVE;
         }
 
+        NAPI_API_DEFINE(NodeRtcEngine, videoSourceSetAddonLogFile)
+        {
+            LOG_ENTER;
+            napi_status status = napi_ok;
+            int result = -1;
+            do{
+                NodeRtcEngine *pEngine = nullptr;
+                napi_get_native_this(args, pEngine);
+                CHECK_NATIVE_THIS(pEngine);
+                nodestring path;
+                napi_get_param_1(args, nodestring, path);
+                string sPath;
+                sPath = path ? string(path) : "";
+                
+                if (!pEngine->m_videoSourceSink.get() || pEngine->m_videoSourceSink->setAddonLogFile(sPath.c_str()) != node_ok) {
+                    break;
+                }
+                result = 0;
+            } while (false);
+            napi_set_int_result(args, result);
+            LOG_LEAVE;
+        }
+
         NAPI_API_DEFINE(NodeRtcEngine, leaveChannel)
         {
             LOG_ENTER;
@@ -3546,13 +3576,13 @@ namespace agora {
                 napi_status status = napi_ok;
                 NodeString filepath;
                 bool loopback, replace;
-                int cycle;
+                int cycle, startPos = 0;
                 napi_get_native_this(args, pEngine);
                 CHECK_NATIVE_THIS(pEngine);
-                napi_get_param_4(args, nodestring, filepath, bool, loopback, bool, replace, int32, cycle);
+                napi_get_param_5(args, nodestring, filepath, bool, loopback, bool, replace, int32, cycle, int32, startPos);
                 CHECK_NAPI_STATUS(pEngine, status);
                 RtcEngineParameters rep(pEngine->m_engine);
-                result = rep.startAudioMixing(filepath, loopback, replace, cycle);
+                result = rep.startAudioMixing(filepath, loopback, replace, cycle, startPos);
             } while (false);
             napi_set_int_result(args, result);
             LOG_LEAVE;
@@ -6079,13 +6109,13 @@ namespace agora {
                 napi_get_native_this(args, pEngine);
                 CHECK_NATIVE_THIS(pEngine);
                 NodeString filePath;
-                unsigned int soundId, loopCount, gain, startPos;
+                unsigned int soundId, loopCount, gain, startPos = 0;
                 double pitch, pan;
                 bool publish;
 
                 napi_get_param_8(args, uint32, soundId, nodestring, filePath, uint32, loopCount, double, pitch, double, pan, uint32, gain, bool, publish, uint32, startPos);
-                
-                result = pEngine->m_engine->getEffectCurrentPosition(soundId);
+
+                result = pEngine->m_engine->playEffect(soundId, filePath, loopCount, pitch, pan, gain, publish, startPos);
             } while (false);
             napi_set_int_result(args, result);
 
@@ -6126,6 +6156,70 @@ namespace agora {
 
             LOG_LEAVE;
         }
+
+        NAPI_API_DEFINE(NodeRtcEngine, startAudioRecordingWithConfig)
+        {
+            LOG_ENTER;
+            int result = -1;
+            do {
+                NodeRtcEngine *pEngine = nullptr;
+                napi_status status = napi_ok;
+                Isolate *isolate = args.GetIsolate();
+                napi_get_native_this(args, pEngine);
+                CHECK_NATIVE_THIS(pEngine);
+                if(args[0]->IsObject()) {
+                    Local<Object> obj;
+                    status = napi_get_value_object_(isolate, args[0], obj);
+                    CHECK_NAPI_STATUS(pEngine, status);
+                    NodeString filePath;
+                    napi_get_object_property_nodestring_(isolate, obj, "filePath", filePath);
+                    CHECK_NAPI_STATUS(pEngine, status);
+
+                    int recordingQuality;
+                    napi_get_object_property_int32_(isolate, obj, "recordingQuality", recordingQuality);
+                    CHECK_NAPI_STATUS(pEngine, status);
+
+                    int recordingPosition;
+                    napi_get_object_property_int32_(isolate, obj, "recordingPosition", recordingPosition);
+                    CHECK_NAPI_STATUS(pEngine, status);
+
+                    int recordingSampleRate;
+                    napi_get_object_property_int32_(isolate, obj, "recordingSampleRate", recordingSampleRate);
+                    CHECK_NAPI_STATUS(pEngine, status);
+
+                    AudioRecordingConfiguration config;
+                    config.filePath = (char *)filePath;
+                    config.recordingQuality = (AUDIO_RECORDING_QUALITY_TYPE)recordingQuality;
+                    config.recordingPosition = (AUDIO_RECORDING_POSITION)recordingPosition;
+                    config.recordingSampleRate = recordingSampleRate;
+                    result = pEngine->m_engine->startAudioRecording(config);
+                }
+
+            } while (false);
+            napi_set_int_result(args, result);
+            
+            LOG_LEAVE;
+        }
+
+        NAPI_API_DEFINE(NodeRtcEngine, setAddonLogFile)
+        {
+            LOG_ENTER;
+            napi_status status = napi_ok;
+            int result = -1;
+            do{
+                NodeRtcEngine *pEngine = nullptr;
+                napi_get_native_this(args, pEngine);
+                CHECK_NATIVE_THIS(pEngine);
+                nodestring path;
+                napi_get_param_1(args, nodestring, path);
+                string sPath;
+                sPath = path ? string(path) : "";
+                
+                result = LogHelper::getInstance()->setAddonLogPath(sPath.c_str());
+            } while (false);
+            napi_set_int_result(args, result);
+            LOG_LEAVE;
+        }
         /**
          * NodeRtcChannel
          */

package/agora_node_ext/agora_rtc_engine.h

@@ -253,6 +253,7 @@ namespace agora {
             NAPI_API(videoSourceEnableEncryption);
             NAPI_API(videoSourceSetEncryptionMode);
             NAPI_API(videoSourceSetEncryptionSecret);
+            NAPI_API(videoSourceSetAddonLogFile);
             /*
             * Native interface used to setup local and remote video canvas.
             */
@@ -381,6 +382,12 @@ namespace agora {
 
             NAPI_API(setProcessDpiAwareness);
             NAPI_API(videoSourceSetProcessDpiAwareness);
+
+            NAPI_API(startAudioRecordingWithConfig);
+            /*
+             * setAddonLogFile
+             */
+            NAPI_API(setAddonLogFile);
             
         public:
             Isolate* getIsolate() { return m_isolate; }
@@ -569,6 +576,33 @@ namespace agora {
             } \
         } while (false);
 
+/*
+* to extract four parameters from JS call parameters.
+*/
+#define napi_get_param_5(argv, type1, param1, type2, param2, type3, param3, type4, param4, type5, param5) \
+        do { \
+            status = napi_get_value_##type1##_(argv[0], (param1)); \
+            if(status != napi_ok) { \
+                break; \
+            } \
+            status = napi_get_value_##type2##_(argv[1], (param2)); \
+            if(status != napi_ok) { \
+                break; \
+            } \
+            status = napi_get_value_##type3##_(argv[2], (param3)); \
+            if(status != napi_ok) { \
+                break; \
+            } \
+            status = napi_get_value_##type4##_(argv[3], (param4)); \
+            if(status != napi_ok) { \
+                break; \
+            } \
+            status = napi_get_value_##type5##_(argv[4], (param5)); \
+            if(status != napi_ok) { \
+                break; \
+            } \
+        } while (false);
+
 /*
 * to extract seven parameters from JS call parameters.
 */