Commit f012152d authored by Ghislain MARY's avatar Ghislain MARY

Add G.729 audio codec.

parent 853bfdf7
......@@ -84,6 +84,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmswp8vid", "submodules\m
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "submodules\linphone\build\vsx\libxml2\libxml2\libxml2.vcxproj", "{5DFA07B4-0BE9-46A9-BA32-FDF5A55C580B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmsbcg729", "submodules\bcg729\build\windows\bcg729\bcg729\bcg729.vcxproj", "{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}"
ProjectSection(ProjectDependencies) = postProject
{027BAD0E-9179-48C1-9733-7AA7E2C2EC70} = {027BAD0E-9179-48C1-9733-7AA7E2C2EC70}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -610,6 +615,26 @@ Global
{5DFA07B4-0BE9-46A9-BA32-FDF5A55C580B}.Release|x64.ActiveCfg = Release|Win32
{5DFA07B4-0BE9-46A9-BA32-FDF5A55C580B}.Release|x86.ActiveCfg = Release|Win32
{5DFA07B4-0BE9-46A9-BA32-FDF5A55C580B}.Release|x86.Build.0 = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|Any CPU.ActiveCfg = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|ARM.ActiveCfg = Debug|ARM
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|ARM.Build.0 = Debug|ARM
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|Win32.ActiveCfg = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|Win32.Build.0 = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|x64.ActiveCfg = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|x86.ActiveCfg = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Debug|x86.Build.0 = Debug|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|Any CPU.ActiveCfg = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|ARM.ActiveCfg = Release|ARM
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|ARM.Build.0 = Release|ARM
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|Mixed Platforms.Build.0 = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|Win32.ActiveCfg = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|Win32.Build.0 = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|x64.ActiveCfg = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|x86.ActiveCfg = Release|Win32
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -545,6 +545,7 @@ namespace Linphone.Model
private const string PCMUSettingKeyName = "CodecPCMU";
private const string PCMASettingKeyName = "CodecPCMA";
private const string G722SettingKeyName = "CodecG722";
private const string G729SettingKeyName = "CodecG729";
private const string ILBCSettingKeyName = "CodecILBC";
private const string SILK16SettingKeyName = "CodecSILK16";
private const string GSMSettingKeyName = "CodecGSM";
......@@ -562,6 +563,7 @@ namespace Linphone.Model
{ new Tuple<String, int>("pcmu", 8000), PCMUSettingKeyName },
{ new Tuple<String, int>("pcma", 8000), PCMASettingKeyName },
{ new Tuple<String, int>("g722", 8000), G722SettingKeyName },
{ new Tuple<String, int>("g729", 8000), G729SettingKeyName },
{ new Tuple<String, int>("ilbc", 8000), ILBCSettingKeyName },
{ new Tuple<String, int>("silk", 16000), SILK16SettingKeyName },
{ new Tuple<String, int>("gsm", 8000), GSMSettingKeyName },
......@@ -731,6 +733,21 @@ namespace Linphone.Model
}
}
/// <summary>
/// Is G.729 audio codec enabled or disabled ? (Boolean)
/// </summary>
public bool G729
{
get
{
return Convert.ToBoolean(Get(G729SettingKeyName));
}
set
{
Set(G729SettingKeyName, value.ToString());
}
}
/// <summary>
/// Is iLBC audio codec enabled or disabled ? (Boolean)
/// </summary>
......
......@@ -534,6 +534,15 @@ namespace Linphone.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to G729.
/// </summary>
public static string G729Codec {
get {
return ResourceManager.GetString("G729Codec", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to GSM.
/// </summary>
......
......@@ -516,4 +516,7 @@ http://www.linphone.org/m/help
<value>The application has detected a crash.
Do you want to report it to the developpers ? It will help fix it faster.</value>
</data>
<data name="G729Codec" xml:space="preserve">
<value>G729</value>
</data>
</root>
\ No newline at end of file
......@@ -34,6 +34,7 @@
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<toolkit:ToggleSwitch
......@@ -80,18 +81,24 @@
<toolkit:ToggleSwitch
Grid.Row="7"
x:Name="G729"
Header="{Binding Path=LocalizedResources.G729Codec, Source={StaticResource LocalizedStrings}}">
</toolkit:ToggleSwitch>
<toolkit:ToggleSwitch
Grid.Row="8"
x:Name="ILBC"
Header="{Binding Path=LocalizedResources.ILBCCodec, Source={StaticResource LocalizedStrings}}">
</toolkit:ToggleSwitch>
<toolkit:ToggleSwitch
Grid.Row="8"
Grid.Row="9"
x:Name="SILK16"
Header="{Binding Path=LocalizedResources.SILK16Codec, Source={StaticResource LocalizedStrings}}">
</toolkit:ToggleSwitch>
<toolkit:ToggleSwitch
Grid.Row="9"
Grid.Row="10"
x:Name="GSM"
Header="{Binding Path=LocalizedResources.GSMCodec, Source={StaticResource LocalizedStrings}}">
</toolkit:ToggleSwitch>
......
......@@ -29,7 +29,8 @@ namespace Linphone.Views
Speex8.IsChecked = _settings.Speex8;
PCMU.IsChecked = _settings.PCMU;
PCMA.IsChecked = _settings.PCMA;
G722.IsChecked = _settings.G722;
G722.IsChecked = _settings.G722;
G729.IsChecked = _settings.G729;
ILBC.IsChecked = _settings.ILBC;
SILK16.IsChecked = _settings.SILK16;
GSM.IsChecked = _settings.GSM;
......@@ -66,7 +67,8 @@ namespace Linphone.Views
_settings.Speex8 = ToBool(Speex8.IsChecked);
_settings.PCMU = ToBool(PCMU.IsChecked);
_settings.PCMA = ToBool(PCMA.IsChecked);
_settings.G722 = ToBool(G722.IsChecked);
_settings.G722 = ToBool(G722.IsChecked);
_settings.G729 = ToBool(G729.IsChecked);
_settings.ILBC = ToBool(ILBC.IsChecked);
_settings.SILK16 = ToBool(SILK16.IsChecked);
_settings.GSM = ToBool(GSM.IsChecked);
......
bcg729 @ 860c8544
Subproject commit 136c165a611a2552a3f52b0669b47a1bce0ab989
Subproject commit 860c8544e8f4074937df27577f473b1d69092fcb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment