Add HD video configuration in the settings.

This commit is contained in:
Ghislain MARY 2013-07-22 12:08:01 +02:00
parent c811ba6a65
commit 2346b41235
10 changed files with 68 additions and 4 deletions

View file

@ -245,6 +245,16 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setBool:(pol->automatically_accept) forKey:@"accept_video_preference"];
[self setBool:linphone_core_self_view_enabled(lc) forKey:@"self_video_preference"];
[self setBool:linphone_core_video_preview_enabled(lc) forKey:@"preview_preference"];
MSVideoSize vsize = linphone_core_get_preferred_video_size(lc);
int index;
if ((vsize.width == MS_VIDEO_SIZE_720P_W) && (vsize.height == MS_VIDEO_SIZE_720P_H)) {
index = 0;
} else if ((vsize.width == MS_VIDEO_SIZE_VGA_W) && (vsize.height == MS_VIDEO_SIZE_VGA_H)) {
index = 1;
} else {
index = 2;
}
[self setInteger:index forKey:@"video_preferred_size_preference"];
}
{
[self setBool:linphone_core_get_use_info_for_dtmf(lc) forKey:@"sipinfo_dtmf_preference"];
@ -548,6 +558,26 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
linphone_core_set_video_policy(lc, &policy);
linphone_core_enable_self_view(lc, [self boolForKey:@"self_video_preference"]);
linphone_core_enable_video_preview(lc, [self boolForKey:@"preview_preference"]);
MSVideoSize vsize;
int bw;
switch ([self integerForKey:@"video_preferred_size_preference"]) {
case 0:
MS_VIDEO_SIZE_ASSIGN(vsize, 720P);
bw = 1024 * 1024;
break;
case 1:
MS_VIDEO_SIZE_ASSIGN(vsize, VGA);
bw = 512 * 1024;
break;
case 2:
default:
MS_VIDEO_SIZE_ASSIGN(vsize, QVGA);
bw = 380 * 1024;
break;
}
linphone_core_set_preferred_video_size(lc, vsize);
[self setInteger: bw forKey:@"upload_bandwidth_preference"];
[self setInteger: bw forKey:@"download_bandwidth_preference"];
// Primary contact
NSString* displayname = [self stringForKey:@"primary_displayname_preference"];

View file

@ -19,6 +19,8 @@ automatically_accept=0
[net]
firewall_policy=0
download_bw=380
upload_bw=380
[app]
rotation_preference=auto

View file

@ -1,6 +1,4 @@
[net]
download_bw=380
upload_bw=380
mtu=1300
activate_edge_workarounds=0
edge_ping_time=10

View file

@ -1,6 +1,4 @@
[net]
download_bw=512
upload_bw=512
mtu=1300
activate_edge_workarounds=0
edge_ping_time=200

View file

@ -19,6 +19,8 @@ automatically_accept=0
[net]
firewall_policy=0
download_bw=512
upload_bw=512
[app]
rotation_preference=auto

View file

@ -40,6 +40,28 @@
<key>Key</key>
<string>preview_preference</string>
</dict>
<dict>
<key>DefaultValue</key>
<integer>1</integer>
<key>Key</key>
<string>video_preferred_size_preference</string>
<key>Title</key>
<string>Preferred video size</string>
<key>Titles</key>
<array>
<string>HD (960x720)</string>
<string>VGA (640x480)</string>
<string>QVGA (320x240)</string>
</array>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Values</key>
<array>
<integer>0</integer>
<integer>1</integer>
<integer>2</integer>
</array>
</dict>
<dict>
<key>Title</key>
<string>Codecs</string>

View file

@ -10,6 +10,9 @@
/* Show preview */
"Show preview" = "Show preview";
/* Preferred video size */
"Preferred video size" = "Preferred video size";
/* Codecs */
"Codecs" = "Codecs";

View file

@ -10,6 +10,9 @@
/* Show preview */
"Show preview" = "Activer la prévisualisation";
/* Preferred video size */
"Preferred video size" = "Taille de vidéo préférée";
/* Codecs */
"Codecs" = "Codecs";

View file

@ -10,6 +10,9 @@
/* Show preview */
"Show preview" = "Предварительный просмотр";
/* Preferred video size */
"Preferred video size" = "Preferred video size";
/* Codecs */
"Codecs" = "Кодеки";

View file

@ -10,6 +10,9 @@
/* Show preview */
"Show preview" = "Show preview";
/* Preferred video size */
"Preferred video size" = "Preferred video size";
/* Codecs */
"Codecs" = "Codecs";