Merge pull request #224 from AgoraIO/dev/3.1.0

Dev/3.1.0
AgoraIO · Aug 14, 2020 · 34755e5 · 34755e5
2 parents 7523b52 + bdbdf8c
commit 34755e5
Show file tree

Hide file tree

Showing 35 changed files with 1,003 additions and 66 deletions.
diff --git a/Group-Video/OpenVideoCall-Android/app/build.gradle b/Group-Video/OpenVideoCall-Android/app/build.gradle
@@ -52,7 +52,7 @@ dependencies {
  exclude group: 'com.google.android', module: 'android'
  }
 
- implementation 'io.agora.rtc:full-sdk:2.9.2'
+ implementation 'io.agora.rtc:full-sdk:3.1.0'
  androidTestImplementation 'com.android.support.test:rules:1.0.2'
  androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
 }
diff --git a/Group-Video/OpenVideoCall-Android/app/src/main/java/io/agora/openvcall/ui/BaseActivity.java b/Group-Video/OpenVideoCall-Android/app/src/main/java/io/agora/openvcall/ui/BaseActivity.java
@@ -20,6 +20,7 @@
 import io.agora.openvcall.model.*;
 import io.agora.propeller.Constant;
 import io.agora.rtc.RtcEngine;
+import io.agora.rtc.internal.EncryptionConfig;
 import io.agora.rtc.video.VideoCanvas;
 import io.agora.rtc.video.VideoEncoderConfiguration;
 
@@ -361,9 +362,18 @@ protected void disablePreProcessor() {
  }
 
  protected void configEngine(VideoEncoderConfiguration.VideoDimensions videoDimension, VideoEncoderConfiguration.FRAME_RATE fps, String encryptionKey, String encryptionMode) {
+ EncryptionConfig config = new EncryptionConfig();
  if (!TextUtils.isEmpty(encryptionKey)) {
- rtcEngine().setEncryptionMode(encryptionMode);
- rtcEngine().setEncryptionSecret(encryptionKey);
+ config.encryptionKey = encryptionKey;
+
+ if(TextUtils.equals(encryptionMode, "AES-128-XTS")) {
+ config.encryptionMode = EncryptionConfig.EncryptionMode.AES_128_XTS;
+ } else if(TextUtils.equals(encryptionMode, "AES-256-XTS")) {
+ config.encryptionMode = EncryptionConfig.EncryptionMode.AES_256_XTS;
+ }
+ rtcEngine().enableEncryption(true, config);
+ } else {
+ rtcEngine().enableEncryption(false, config);
  }
 
  log.debug("configEngine " + videoDimension + " " + fps + " " + encryptionMode);

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.cpp b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.cpp
@@ -35,14 +35,17 @@ CHINESESIMPLIFIED_API LPCTSTR IDS_PRE_BTNWEB = _T("Web-compatible");
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_KEYTIP = _T("加密密钥");
 
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_ENCTYPE = _T("EncType:");
-CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128XTS = _T("aes-128");
+CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128XTS = _T("AES_128_XTS");
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128GCM = _T("aes-128-gcm");
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CCM = _T("aes-128-ccm");
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CTR = _T("aes-128-ctr");
-CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256XTS = _T("aes-256");
+CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256XTS = _T("AES_256_XTS");
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256GCM = _T("aes-256-gcm");
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CCM = _T("aes-256-ccm");
 CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CTR = _T("aes-256-ctr");
+CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_SM4_128ECB = _T("SM4_128_ECB");
+CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES_128_ECB = _T("AES_128_ECB");
+
 
 CHINESESIMPLIFIED_API LPCTSTR IDS_SET_RESOLUTION = _T("分辨率");
 CHINESESIMPLIFIED_API LPCTSTR IDS_SET_MFR = _T("最大帧率");

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h
@@ -48,6 +48,8 @@ extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256XTS;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256GCM;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CCM;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CTR;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES_128_ECB;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_SM4_128ECB;
 
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_RESOLUTION;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_MFR;

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/Source.def b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/Source.def
@@ -37,6 +37,8 @@ IDS_CHN_AES256XTS DATA;
 IDS_CHN_AES256GCM DATA;
 IDS_CHN_AES256CCM DATA;
 IDS_CHN_AES256CTR DATA;
+IDS_CHN_AES_128_ECB DATA;
+IDS_CHN_SM4_128ECB DATA;
 
 IDS_SET_RESOLUTION DATA;
 IDS_SET_MFR DATA;

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.cpp b/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.cpp
@@ -35,14 +35,16 @@ ENGLISH_API LPCTSTR IDS_CHN_CHTIP = _T("ChannelName");
 ENGLISH_API LPCTSTR IDS_CHN_KEYTIP = _T("EncryptionKey");
 
 ENGLISH_API LPCTSTR IDS_CHN_ENCTYPE = _T("EncType:");
-ENGLISH_API LPCTSTR IDS_CHN_AES128XTS = _T("aes-128");
+ENGLISH_API LPCTSTR IDS_CHN_AES128XTS = _T("AES_128_XTS");
 ENGLISH_API LPCTSTR IDS_CHN_AES128GCM = _T("aes-128-gcm");
 ENGLISH_API LPCTSTR IDS_CHN_AES128CCM = _T("aes-128-ccm");
 ENGLISH_API LPCTSTR IDS_CHN_AES128CTR = _T("aes-128-ctr");
-ENGLISH_API LPCTSTR IDS_CHN_AES256XTS = _T("aes-256");
+ENGLISH_API LPCTSTR IDS_CHN_AES256XTS = _T("AES_256_XTS");
 ENGLISH_API LPCTSTR IDS_CHN_AES256GCM = _T("aes-256-gcm");
 ENGLISH_API LPCTSTR IDS_CHN_AES256CCM = _T("aes-256-ccm");
 ENGLISH_API LPCTSTR IDS_CHN_AES256CTR = _T("aes-256-ctr");
+ENGLISH_API LPCTSTR IDS_CHN_SM4_128ECB = _T("SM4_128_ECB");
+ENGLISH_API LPCTSTR IDS_CHN_AES_128_ECB = _T("AES_128_ECB");
 
 ENGLISH_API LPCTSTR IDS_SET_RESOLUTION = _T("Resolution");
 ENGLISH_API LPCTSTR IDS_SET_MFR = _T("Max Frame rate");

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.h b/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.h
@@ -49,6 +49,8 @@ extern ENGLISH_API LPCTSTR IDS_CHN_AES256XTS;
 extern ENGLISH_API LPCTSTR IDS_CHN_AES256GCM;
 extern ENGLISH_API LPCTSTR IDS_CHN_AES256CCM;
 extern ENGLISH_API LPCTSTR IDS_CHN_AES256CTR;
+extern ENGLISH_API LPCTSTR IDS_CHN_AES_128_ECB;
+extern ENGLISH_API LPCTSTR IDS_CHN_SM4_128ECB;
 
 extern ENGLISH_API LPCTSTR IDS_SET_RESOLUTION;
 extern ENGLISH_API LPCTSTR IDS_SET_MFR;

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/English/Source.def b/Group-Video/OpenVideoCall-Windows-MFC/Language/English/Source.def
@@ -37,6 +37,8 @@ IDS_CHN_AES256XTS DATA;
 IDS_CHN_AES256GCM DATA;
 IDS_CHN_AES256CCM DATA;
 IDS_CHN_AES256CTR DATA;
+IDS_CHN_AES_128_ECB DATA;
+IDS_CHN_SM4_128ECB DATA;
 
 IDS_SET_RESOLUTION DATA;
 IDS_SET_MFR DATA;

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/AgoraObject.cpp b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/AgoraObject.cpp
@@ -541,6 +541,12 @@ BOOL CAgoraObject::SetEncryptionSecret(LPCTSTR lpKey, int nEncryptType)
  return nRet == 0 ? TRUE : FALSE;
 }
 
+BOOL CAgoraObject::EnableEncryption(bool enabled, const EncryptionConfig & config)
+{
+ int nRet = m_lpAgoraEngine->enableEncryption(enabled, config);
+ return nRet == 0 ? TRUE : FALSE;
+}
+
 BOOL CAgoraObject::EnableLocalRender(BOOL bEnable)
 {
  int nRet = 0;

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/AgoraObject.h b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/AgoraObject.h
@@ -93,6 +93,8 @@ class CAgoraObject
 
  BOOL SetEncryptionSecret(LPCTSTR lpKey, int nEncryptType = 0);
 
+ BOOL EnableEncryption(bool enabled, const EncryptionConfig& config);
+
  BOOL EnableLocalRender(BOOL bEnable);
 
  int CreateMessageStream();

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp
@@ -107,6 +107,8 @@ void CEnterChannelDlg::InitCtrls()
  m_cmbEncType.SetFaceColor(RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF));
  m_cmbEncType.InsertString(0, LANG_STR("IDS_CHN_AES128XTS"));
  m_cmbEncType.InsertString(1, LANG_STR("IDS_CHN_AES256XTS"));
+ m_cmbEncType.InsertString(2, LANG_STR("IDS_CHN_AES_128_ECB"));
+ m_cmbEncType.InsertString(3, LANG_STR("IDS_CHN_SM4_128ECB"));
  m_cmbEncType.SetCurSel(0);
 
  m_btnJoin.MoveWindow(ClientRect.Width() / 2 - 180, 212, 360, 36, TRUE);
@@ -196,7 +198,18 @@ void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
 
  m_ctrEncKey.GetWindowText(strKey);
  if (strKey.GetLength() > 0)
- CAgoraObject::GetAgoraObject()->SetEncryptionSecret(strKey, m_cmbEncType.GetCurSel());
+ {
+ // configuration of encrypt
+ EncryptionConfig config;
+ // set encrypt mode
+ config.encryptionMode = ENCRYPTION_MODE(m_cmbEncType.GetCurSel() + 1);
+ // set encrypt key
+ char szKey[520] = { 0 };
+ WideCharToMultiByte(CP_UTF8, 0, strKey.GetBuffer(0), strKey.GetLength(), szKey, 520, NULL, NULL);
+ config.encryptionKey = szKey;
+ // EnableEncryption of engine.
+ CAgoraObject::GetAgoraObject()->EnableEncryption(true, config);
+ }
  GetParent()->SendMessage(WM_JOINCHANNEL, 0, 0);
 }
 

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/OpenVideoCall.vcxproj b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/OpenVideoCall.vcxproj
@@ -22,7 +22,7 @@
  <ProjectGuid>{26AF88DC-1933-4A1B-9991-21DF11DCE388}</ProjectGuid>
  <RootNamespace>AgoraVideoCall</RootNamespace>
  <Keyword>MFCProj</Keyword>
- <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall.pro b/Group-Video/OpenVideoCall-Windows/OpenVideoCall.pro
@@ -94,7 +94,7 @@ CONFIG(debug, debug|release) {
  QMAKE_POST_LINK += copy $${AGORASDKDLLPATH}\*.dll .\Debug
 } else {
  QMAKE_POST_LINK += copy $${AGORASDKDLLPATH}\*.dll .\Release
- QMAKE_POST_LINK += && windeployqt Release\OpenLive.exe
+ QMAKE_POST_LINK += && windeployqt Release\OpenVideoCall.exe
 }
 
 }