Skip to content

WebRTC enhancements and fixes post-NuGet package upgrade #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
W3AXL merged 1 commit into from
Jan 30, 2026
Merged

WebRTC enhancements and fixes post-NuGet package upgrade #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fnecore
Open in desktop
Submodule fnecore updated 1 files
+15 −6 FnePeer.cs
2 changes: 1 addition & 1 deletion rc2-core
Open in desktop
Submodule rc2-core updated 5 files
+41 −25 RC2Server.cs
+7 −2 Radio.cs
+303 −0 WebRTC.Audio.cs
+431 −281 WebRTC.cs
+5 −4 rc2-core.csproj
10 changes: 9 additions & 1 deletion rc2-dvm/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,17 @@ public static void Runtime()

// Setup Logging
LoggerConfiguration logConfig = new LoggerConfiguration();
logConfig.MinimumLevel.Debug();
logConfig.MinimumLevel.Verbose();
const string logTemplate = "{Level:u1}: {Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Message}{NewLine}{Exception}";

// File Logging Config
LogEventLevel fileLevel = LogEventLevel.Information;
switch (config.Log.FileLevel)
{
case 0:
fileLevel = LogEventLevel.Verbose;
FneLogLevel = FneLogLevel.DEBUG;
break;
case 1:
fileLevel = LogEventLevel.Debug;
FneLogLevel = FneLogLevel.DEBUG;
Expand Down Expand Up @@ -208,6 +212,10 @@ public static void Runtime()
LogEventLevel dispLevel = LogEventLevel.Information;
switch (config.Log.DisplayLevel)
{
case 0:
dispLevel = LogEventLevel.Verbose;
FneLogLevel = FneLogLevel.DEBUG;
break;
case 1:
dispLevel = LogEventLevel.Debug;
FneLogLevel = FneLogLevel.DEBUG;
Expand Down
5 changes: 5 additions & 0 deletions rc2-dvm/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
"commandName": "Project",
"commandLineArgs": "-c config-nx.yml",
"workingDirectory": "H:\\Git\\rc2-dvm\\rc2-dvm"
},
"rc2-dvm nx verbose": {
"commandName": "Project",
"commandLineArgs": "-c config-nx-verbose.yml",
"workingDirectory": "H:\\Git\\rc2-dvm\\rc2-dvm"
}
}
}
2 changes: 1 addition & 1 deletion rc2-dvm/VirtualChannel.P25.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private void P25EncodeAudioFrame(short[] pcm16, uint srcId, uint dstId)
// Ensure samples are right length
if (pcm16.Length != FneSystemBase.MBE_SAMPLES_LENGTH)
{
throw new ArgumentException("Input samples not proper length for MBE encoding!");
throw new ArgumentException($"Input samples not proper length for MBE encoding! Got {pcm16.Length} but need {FneSystemBase.MBE_SAMPLES_LENGTH}");
}

if (p25N > 17)
Expand Down
5 changes: 3 additions & 2 deletions rc2-dvm/config.example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
# Logging Configuration
#
# Logging Levels:
# 1 - Debug
# 0 - Verbose (Tons of log prints, only use when troubleshooting)
# 1 - Debug (Still a lot of log prints, but less so than verbose)
# 2 - Message
# 3 - Informational
# 4 - Warning
Expand All @@ -23,7 +24,7 @@ log:
# Full path for the directory to store the activity log files.
activityFilePath: .
# Log filename prefix.
fileRoot: dvm-rc2
fileRoot: rc2-dvm

#
# Network Configuration
Expand Down
5 changes: 3 additions & 2 deletions rc2-dvm/rc2-dvm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<DefineConstants>$(ExtraConstants)</DefineConstants>
<PublishTrimmed>True</PublishTrimmed>
<JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
Expand All @@ -38,11 +39,11 @@
<PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="NAudio.WinMM" Version="2.2.1" />
<PackageReference Include="NWaves" Version="0.9.6" />
<PackageReference Include="Serilog" Version="4.3.1-dev-02404" />
<PackageReference Include="Serilog" Version="4.3.1-dev-02406" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="8.0.0-dev-02318" />
<PackageReference Include="SIPSorcery" Version="10.0.4-pre" />
<PackageReference Include="SIPSorcery" Version="8.0.7" />
<PackageReference Include="System.CommandLine" Version="2.0.2" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />
</ItemGroup>
Expand Down
Loading