Don't set bandwidth explicitely anymore, in order to benefit from adaptive rate control

This commit is contained in:
Simon Morlat 2017-10-03 17:12:18 +02:00
parent 89084f729a
commit fd69d6636f
6 changed files with 7 additions and 20 deletions

View file

@ -1,6 +1,4 @@
[net]
download_bw=380
upload_bw=380
[sip] [sip]
contact="Linphone Android" <sip:linphone.android@unknown-host> contact="Linphone Android" <sip:linphone.android@unknown-host>

View file

@ -4,6 +4,9 @@
#Paths to resources must be set from LinphoneManager, after creating LinphoneCore. #Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
[net] [net]
mtu=1300 mtu=1300
#Because dynamic bitrate adaption can increase bitrate, we must allow "no limit"
download_bw=0
upload_bw=0
[sip] [sip]
guess_hostname=1 guess_hostname=1

View file

@ -927,20 +927,6 @@ public class LinphonePreferences {
public void setPreferredVideoSize(String preferredVideoSize) { public void setPreferredVideoSize(String preferredVideoSize) {
getLc().setPreferredVideoSizeByName(preferredVideoSize); getLc().setPreferredVideoSizeByName(preferredVideoSize);
String preset = getVideoPreset();
if (!preset.equals("custom")) {
int bandwidth = 512;
if (preferredVideoSize.equals("720p")) {
bandwidth = 1024 + 128;
} else if (preferredVideoSize.equals("vga")) {
bandwidth = 660;
} else if (preferredVideoSize.equals("qvga")) {
bandwidth = 380;
} else if (preferredVideoSize.equals("qcif")) {
bandwidth = 256;
}
setBandwidthLimit(bandwidth);
}
} }
public int getPreferredVideoFps() { public int getPreferredVideoFps() {

@ -1 +1 @@
Subproject commit ddd08052226c879df63b08ab11d4a4917cfc1da5 Subproject commit 7e2a6a56fa6a70a6ec3875cea26f1f1e17910917

@ -1 +1 @@
Subproject commit 6b78f95624660c4e1160c3caac74732250321ce1 Subproject commit 410fca273a8cf0de5992cd2c0d84bbb8e297a097

@ -1 +1 @@
Subproject commit ce3dedb58706f154c647bc99412aca8a42416d9d Subproject commit 5f8fcddce392f1510768949a4691f9e8c170badb