Skip to content

Commit e66b982

Browse files
sipsorcerysipsorcery
committed
Merge branch 'master' into gh-pages
2 parents a2724cb + ee35c09 commit e66b982

File tree

11 files changed

+19
-31
lines changed

11 files changed

+19
-31
lines changed

‎examples/WebRTCExamples/WebRTCAspNetMvc/WebRTCAspNet.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
99
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
1010
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1111
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
12-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
12+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎examples/WebRTCExamples/WebRTCGetStarted/WebRTCGetStarted.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1515
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1616
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
17-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
17+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
1818
<PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
1919
<PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.13" />
2020
</ItemGroup>

‎examples/WebRTCExamples/WebRTCGetStartedDataChannel/WebRTCGetStartedDataChannel.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1111
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
1212
<PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
13-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
13+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
1414
</ItemGroup></Project>

‎examples/WebRTCExamples/WebRTCMp4Source/WebRTCMp4Source.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
3030
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3131
<PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
32-
<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="1.4.0" />
33-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
32+
<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="1.4.2" />
33+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
3434
</ItemGroup>
3535

3636
</Project>

‎examples/WebRTCExamples/WebRTCReceiveAudio/WebRTCReceiveAudio.csproj‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@
1515
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
1616
<PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
1717
<PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
18-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
19-
</ItemGroup>
20-
21-
<ItemGroup>
22-
<None Update="certs\localhost.pfx">
23-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24-
</None>
25-
<None Update="media\testpattern.jpeg">
26-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
</None>
18+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
2819
</ItemGroup>
2920

3021
</Project>

‎examples/WebRTCExamples/WebRTCReceiveAudio/certs/localhost.pfx‎

-3.95 KB
Binary file not shown.

‎examples/WebRTCExamples/WebRTCSendAudio/Program.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
using Serilog.Extensions.Logging;
2727
using SIPSorcery.Net;
2828
using SIPSorcery.Media;
29-
using SIPSorceryMedia.Windows;
3029
using WebSocketSharp.Server;
3130

3231
namespace demo
@@ -72,9 +71,7 @@ private static Task<RTCPeerConnection> CreatePeerConnection()
7271
};
7372
var pc = new RTCPeerConnection(config);
7473

75-
//AudioExtrasSource audioSource = new AudioExtrasSource(new AudioEncoder(), new AudioSourceOptions { AudioSource = AudioSourcesEnum.SineWave });
76-
//audioSource.OnAudioSourceEncodedSample += pc.SendAudio;
77-
WindowsAudioEndPoint audioSource = new WindowsAudioEndPoint(new AudioEncoder());
74+
AudioExtrasSource audioSource = new AudioExtrasSource(new AudioEncoder(), new AudioSourceOptions { AudioSource = AudioSourcesEnum.SineWave });
7875
audioSource.OnAudioSourceEncodedSample += pc.SendAudio;
7976

8077
MediaStreamTrack audioTrack = new MediaStreamTrack(audioSource.GetAudioSourceFormats(), MediaStreamStatusEnum.SendOnly);

‎examples/WebRTCExamples/WebRTCSendAudio/WebRTCSendAudio.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1414
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1515
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
1616
<PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
17-
<PackageReference Include="SIPSorceryMedia.Windows" Version="0.0.31-pre" />
18-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
17+
<PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
18+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
1919
</ItemGroup>
2020

2121
</Project>

‎examples/WebRTCExamples/WebRTCTestPatternRest/WebRTCTestPatternRest.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
88

@@ -12,7 +12,7 @@
1212
<PackageReference Include="SIPSorcery" Version="6.2.0" />
1313
<PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.12-pre" />
1414
<PackageReference Include="EmbedIO" Version="3.4.3" />
15-
<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="1.4.1" />
15+
<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="1.4.2" />
1616
</ItemGroup>
1717

1818
</Project>

‎examples/WebRTCExamples/WebRTCTestPatternServer/WebRTCTestPatternServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<PackageReference Include="CommandLineParser" Version="2.8.0" />
1111
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1212
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
13-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
13+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
1414
<PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.12-pre" />
15-
<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="1.4.1" />
15+
<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="1.4.2" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

0 commit comments

Comments
 (0)