From 27e9f729fa9532ebc22afea84aa80434b8765fa5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 11:37:33 +0800
Subject: [PATCH] 2021-08-28 1.更新SDK
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_factory | 1
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java | 47 +++++++++++++++--------
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java | 4 ++
HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml | 1
Shared.Droid.HDLLinphone/Shared.Droid.HDLLinphone/Jars/HDLLinphoneSDK-V1.0.1.aar | 0
HDLLinphoneSDKDemoNew/app/libs/HDLLinphoneSDK-V1.0.1.aar | 0
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java | 41 +++++++++++---------
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_default | 2
8 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
index 24a01d8..5f51e41 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
@@ -381,8 +381,10 @@
if (isVideoCall) {
params.enableVideo(true);
params.enableLowBandwidth(false);
+ params.setAudioBandwidthLimit(0); // disable limitation
} else {
params.enableVideo(false);
+ params.setAudioBandwidthLimit(40); // disable limitation
}
if (addressToCall != null) {
@@ -415,6 +417,7 @@
Call currentCall = HDLLinphoneService.getCore().getCurrentCall();
CallParams params = HDLLinphoneService.getCore().createCallParams(currentCall);
params.enableVideo(true);
+ params.setAudioBandwidthLimit(0); // disable limitation
currentCall.acceptWithParams(params);
} catch (Exception e) {
e.printStackTrace();
@@ -430,6 +433,7 @@
Call currentCall = HDLLinphoneService.getCore().getCurrentCall();
CallParams params = HDLLinphoneService.getCore().createCallParams(currentCall);
params.enableVideo(enableVideo);
+ params.setAudioBandwidthLimit(enableVideo ? 0 : 40);
currentCall.acceptWithParams(params);
} catch (Exception e) {
e.printStackTrace();
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java
index 7c8aa5a..54d633a 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java
@@ -315,34 +315,37 @@
mCore.setUserCertificatesPath(userCerts);
//2.璁剧疆UserAgent
setUserAgent();
+ //3.璁剧疆鎾斁閾冨０
// mCore.setNativeRingingEnabled(true);
// mCore.setRemoteRingbackTone(mRingSoundFile);
// mCore.setTone(ToneID.CallWaiting, mRingSoundFile);
// mCore.setRing(mRingSoundFile);
// mCore.setPlayFile(mPauseSoundFile);
+ //4.绂佺敤鎵嬫満鎽勫儚澶磋棰戦噰闆�
// mCore.enableVideoCapture(false);//绂佺敤鎵嬫満鎽勫儚澶磋棰戦噰闆�
- mCore.setNetworkReachable(true);
- //3.鍥炲０娑堥櫎
+// mCore.setNetworkReachable(true);
+ //5.鍥炲０娑堥櫎
mCore.enableEchoCancellation(true);
mCore.enableEchoLimiter(true);
- //4.鑷�傚簲鐮佺巼鎺у埗
+ mCore.enableMic(true);//鍚敤楹﹀厠椋�
+ //6.鑷�傚簲鐮佺巼鎺у埗
mCore.enableAdaptiveRateControl(true);
- //5.audio 鐮佺巼璁剧疆
- mCore.getConfig().setInt("audio", "codec_bitrate_limit", 36);
- //6.瑙嗛灏哄鍋忓ソ璁剧疆 榛樿qvga
+ //7.audio 鐮佺巼璁剧疆
+// mCore.getConfig().setInt("audio", "codec_bitrate_limit", 36);
+ //8.瑙嗛鐩稿叧璁剧疆
+ mCore.setVideoPreset("custom");//瑙嗛棰勮涓篶ustom
+ mCore.setPreferredFramerate(5);//FPS浼樺厛璁剧疆涓�5
VideoDefinition preferredVideoDefinition =
Factory.instance().createVideoDefinitionFromName("qvga");
- mCore.setPreferredVideoDefinition(preferredVideoDefinition);
- //7.璁剧疆甯﹀闄愬埗锛屽甫瀹藉崟浣嶄负kbits/s, 0琛ㄧず鏃犻檺
- mCore.setUploadBandwidth(1536);
- mCore.setDownloadBandwidth(1536);
- //8.璁剧疆鍚敤H264缂栫爜
- mCore.getConfig().setBool("app", "open_h264_download_enabled", true);
- //9.璁剧疆瑙嗛鐨勯粯璁ょ瓥鐣�
+ mCore.setPreferredVideoDefinition(preferredVideoDefinition);//瑙嗛灏哄鍋忓ソ榛樿qvga
+ //9.璁剧疆甯﹀闄愬埗锛屽甫瀹藉崟浣嶄负kbits/s, 0琛ㄧず鏃犻檺
+// mCore.setUploadBandwidth(1536);
+// mCore.setDownloadBandwidth(1536);
+ //10.璁剧疆瑙嗛鐨勯粯璁ょ瓥鐣�
VideoActivationPolicy vap = mCore.getVideoActivationPolicy();
vap.setAutomaticallyInitiate(true);
mCore.setVideoActivationPolicy(vap);
- //10.璁剧疆缂栫爜鏍煎紡
+ //11.璁剧疆缂栫爜鏍煎紡
setCodecMime();
}
@@ -350,21 +353,21 @@
* 璁剧疆缂栫爜鏍煎紡
*/
private void setCodecMime() {
+ //1.鍚敤PCMA PCMU 8000Hz
PayloadType[] ptList = mCore.getAudioPayloadTypes();
for (PayloadType pt : ptList) {
-
- org.linphone.mediastream.Log.d("payloadaudio", pt.getMimeType());
- if (pt.getMimeType().equals("PCMA") && pt.getClockRate() == 8000) {
+// HDLLog.i("payloadaudio", pt.getMimeType());
+ if ((pt.getMimeType().equals("PCMA") || pt.getMimeType().equals("PCMU")) && pt.getClockRate() == 8000) {
pt.enable(true);
-
} else {
pt.enable(false);
}
}
mCore.setAudioPayloadTypes(ptList);
-
+ //2.璁剧疆VP8銆丠264銆丠265 绛夊惎鐢�
PayloadType[] ptVideoList = mCore.getVideoPayloadTypes();
for (PayloadType pt : ptVideoList) {
+// HDLLog.i("VideoPayload", pt.getMimeType());
pt.enable(true);
}
mCore.setVideoPayloadTypes(ptVideoList);
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_default b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_default
index 7aebd28..17261ae 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_default
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_default
@@ -1,5 +1,5 @@
[sip]
-contact="Linphone Android" <sip:linphone.android@unknown-host>
+contact="HDL Android" <sip:hdlsdk.android@unknown-host>
use_info=0
use_ipv6=1
keepalive_period=30000
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_factory b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_factory
index 06f7fec..9b17fac 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_factory
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/raw/linphonerc_factory
@@ -31,4 +31,3 @@
prefer_basic_chat_room=1
[assistant]
-xmlrpc_url=https://subscribe.linphone.org:444/wizard.php
\ No newline at end of file
diff --git a/HDLLinphoneSDKDemoNew/app/libs/HDLLinphoneSDK-V1.0.1.aar b/HDLLinphoneSDKDemoNew/app/libs/HDLLinphoneSDK-V1.0.1.aar
index 458cd44..90cd108 100644
--- a/HDLLinphoneSDKDemoNew/app/libs/HDLLinphoneSDK-V1.0.1.aar
+++ b/HDLLinphoneSDKDemoNew/app/libs/HDLLinphoneSDK-V1.0.1.aar
Binary files differ
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml b/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml
index 83e5059..7c53299 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml
+++ b/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
</intent-filter>
</activity>
+
</application>
</manifest>
\ No newline at end of file
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
index ab92dee..81e7414 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
+++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
@@ -4,22 +4,17 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import com.hdl.hdllinphonesdk.HDLLinphoneKit;
+import com.hdl.hdllinphonesdk.activity.HDLLinphoneIntercomActivity;
import com.hdl.hdllinphonesdk.activity.HDLLinphoneMonitorActivity;
import com.hdl.hdllinphonesdk.callback.OnHDLLinphoneCallListener;
-//import com.hdl.hdllinphonesdk.core.EasyLinphone;
import com.hdl.hdllinphonesdk.core.service.HDLLinphoneService;
import com.hdl.hdllinphonesdk.utils.HDLLog;
-import org.linphone.core.Address;
-import org.linphone.core.Call;
-import org.linphone.core.CallParams;
import org.linphone.core.Core;
import org.linphone.core.ProxyConfig;
@@ -53,8 +48,12 @@
// HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:5060");
// HDLLinphoneKit.getInstance().setAccountAndLogin("6666", "85521566", "test-gz.hdlcontrol.com:5060");
- HDLLinphoneKit.getInstance().setAccountAndLogin("7777", "85521566", "test-gz.hdlcontrol.com:5060");
-//
+ HDLLinphoneKit.getInstance().setAccountAndLogin("7777", "85521566", "test-gz.hdlcontrol.com:35060");
+
+
+
+
+ //
// HDLLinphoneKit.getInstance().setAccountAndLogin("8888", "85521566", "test-gz.hdlcontrol.com:5060");
//
// HDLLinphoneKit.getInstance().setAccountAndLogin("4444", "85521566", "test-gz.hdlcontrol.com:5060");
@@ -67,7 +66,7 @@
@Override
public void onClick(View v) {
clearProxyConfig();
- HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:5060");
+ HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:35060");
}
});
@@ -89,7 +88,20 @@
mTextView3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- logout();
+ HDLLinphoneKit.getInstance().getCore().enableVideoCapture(false);//绂佺敤鎵嬫満鎽勫儚澶磋棰戦噰闆�
+// //1.鍚敤PCMA 8000
+// PayloadType[] ptList = HDLLinphoneKit.getInstance().getCore().getAudioPayloadTypes();
+// for (PayloadType pt : ptList) {
+//// HDLLog.i("payloadaudio", pt.getMimeType());
+// if ((pt.getMimeType().equals("PCMA") || pt.getMimeType().equals("PCMU")) && pt.getClockRate() == 8000) {
+//// pt.enable(true);
+// HDLLog.i("payloadaudio true", pt.getMimeType() + ": "+ pt.getClockRate()+"HZ " + pt.enabled());
+// } else {
+//// pt.enable(false);
+// HDLLog.i("payloadaudio false", pt.getMimeType() + ": "+ pt.getClockRate()+"HZ "+ pt.enabled());
+// }
+// }
+// logout();
}
});
@@ -170,14 +182,17 @@
@Override
public void onUnlockAction() {
+//
+ HDLLinphoneKit.getInstance().getCore().enableVideoCapture(true);//绂佺敤鎵嬫満鎽勫儚澶磋棰戦噰闆�
+
// showToast("寮�閿�");
// EasyLinphone.callTo("61723164995779",true);
- openSuccess = !openSuccess;
- if(openSuccess){
- HDLLinphoneKit.getInstance().onOpenSuccess();
- }else{
- HDLLinphoneKit.getInstance().onOpenError("璁惧涓嶅湪绾�");
- }
+// openSuccess = !openSuccess;
+// if(openSuccess){
+// HDLLinphoneKit.getInstance().onOpenSuccess();
+// }else{
+// HDLLinphoneKit.getInstance().onOpenError("璁惧涓嶅湪绾�");
+// }
}
diff --git a/Shared.Droid.HDLLinphone/Shared.Droid.HDLLinphone/Jars/HDLLinphoneSDK-V1.0.1.aar b/Shared.Droid.HDLLinphone/Shared.Droid.HDLLinphone/Jars/HDLLinphoneSDK-V1.0.1.aar
index 458cd44..33a0158 100644
--- a/Shared.Droid.HDLLinphone/Shared.Droid.HDLLinphone/Jars/HDLLinphoneSDK-V1.0.1.aar
+++ b/Shared.Droid.HDLLinphone/Shared.Droid.HDLLinphone/Jars/HDLLinphoneSDK-V1.0.1.aar
Binary files differ
--
Gitblit v1.8.0