Bumped nuget version to v4.0.77-pre.

ahmedfe · Sep 20, 2020 · 33f34e0 · 33f34e0
1 parent 9f73fdb
commit 33f34e0
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 8 deletions.
diff --git a/examples/WebRTCExamples/WebRTCDaemon/WebRTCDaemon.csproj b/examples/WebRTCExamples/WebRTCDaemon/WebRTCDaemon.csproj
@@ -28,8 +28,13 @@
  <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
- <PackageReference Include="SIPSorcery" Version="4.0.76-pre" />
- <PackageReference Include="SIPSorceryMedia.FFmpeg" Version="0.0.2-pre" />
+ <!--<PackageReference Include="SIPSorcery" Version="4.0.76-pre" />-->
+ <!--<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="0.0.2-pre" />-->
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\SIPSorceryMedia.FFmpeg\src\SIPSorceryMedia.FFmpeg.csproj" />
+ <ProjectReference Include="..\..\..\src\SIPSorcery.csproj" />
  </ItemGroup>
 
 </Project>
diff --git a/examples/WebRTCExamples/WebRTCDaemon/WebRTCWorker.cs b/examples/WebRTCExamples/WebRTCDaemon/WebRTCWorker.cs
@@ -16,6 +16,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
@@ -139,6 +140,8 @@ private RTCPeerConnection CreatePeerConnection(string url)
  audioSource = _musicSource;
  }
 
+ pc.OnVideoFormatsNegotiated += (sdpFormat) => videoSource.SetVideoSourceFormat(SDPMediaFormatInfo.GetVideoCodecForSdpFormat(sdpFormat.First().FormatCodec));
+ pc.OnAudioFormatsNegotiated += (sdpFormat) => audioSource.SetAudioSourceFormat(SDPMediaFormatInfo.GetAudioCodecForSdpFormat(sdpFormat.First().FormatCodec));
  videoSource.OnVideoSourceEncodedSample += pc.SendVideo;
  audioSource.OnAudioSourceEncodedSample += pc.SendAudio;
 

diff --git a/examples/WebRTCExamples/WebRTCExamples.sln b/examples/WebRTCExamples/WebRTCExamples.sln
@@ -29,6 +29,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRTCMp4Source", "WebRTCMp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebRTCDaemon", "WebRTCDaemon\WebRTCDaemon.csproj", "{BE1E895C-9F1A-499B-A578-3A5DD6523276}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIPSorceryMedia.FFmpeg", "..\..\..\SIPSorceryMedia.FFmpeg\src\SIPSorceryMedia.FFmpeg.csproj", "{06E2AD32-CBF8-49DC-A3D1-388E506763FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIPSorcery", "..\..\src\SIPSorcery.csproj", "{DC85DF1C-C8C3-4213-A5EC-AE217E05639C}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -195,6 +199,30 @@ Global
  {BE1E895C-9F1A-499B-A578-3A5DD6523276}.Release|x64.Build.0 = Release|Any CPU
  {BE1E895C-9F1A-499B-A578-3A5DD6523276}.Release|x86.ActiveCfg = Release|Any CPU
  {BE1E895C-9F1A-499B-A578-3A5DD6523276}.Release|x86.Build.0 = Release|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Debug|x64.Build.0 = Debug|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Debug|x86.Build.0 = Debug|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Release|x64.ActiveCfg = Release|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Release|x64.Build.0 = Release|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Release|x86.ActiveCfg = Release|Any CPU
+ {06E2AD32-CBF8-49DC-A3D1-388E506763FC}.Release|x86.Build.0 = Release|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Debug|x64.Build.0 = Debug|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Debug|x86.Build.0 = Debug|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Release|x64.ActiveCfg = Release|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Release|x64.Build.0 = Release|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Release|x86.ActiveCfg = Release|Any CPU
+ {DC85DF1C-C8C3-4213-A5EC-AE217E05639C}.Release|x86.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/examples/WebRTCExamples/WebRTCMp4Source/WebRTCMp4Source.csproj b/examples/WebRTCExamples/WebRTCMp4Source/WebRTCMp4Source.csproj
@@ -16,11 +16,15 @@
  <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
  <PackageReference Include="SIPSorcery" Version="4.0.76-pre" />
  <PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
- <PackageReference Include="SIPSorceryMedia.FFmpeg" Version="0.0.2-pre" />
+ <!--<PackageReference Include="SIPSorceryMedia.FFmpeg" Version="0.0.2-pre" />-->
  <PackageReference Include="SIPSorceryMedia.Windows" Version="0.0.18-pre" />
  <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
  </ItemGroup>
 
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\SIPSorceryMedia.FFmpeg\src\SIPSorceryMedia.FFmpeg.csproj" />
+ </ItemGroup>
+
  <ItemGroup>
  <None Update="media\big_buck_bunny.mp4">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/src/SIPSorcery.csproj b/src/SIPSorcery.csproj
@@ -24,7 +24,7 @@
  <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
  <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
  <PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
- <PackageReference Include="SIPSorceryMedia.Abstractions" Version="0.0.11-pre" />
+ <PackageReference Include="SIPSorceryMedia.Abstractions" Version="0.0.12-pre" />
  <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
  <PackageReference Include="System.ValueTuple" Version="4.5.0" />
  <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
@@ -60,7 +60,8 @@
  <RepositoryType>git</RepositoryType>
  <RepositoryBranch>master</RepositoryBranch>
  <PackageTags>SIP WebRTC VoIP RTP SDP STUN ICE SIPSorcery</PackageTags>
- <PackageReleaseNotes>- v4.0.76-pre: Updated to latest media abstractions package.
+ <PackageReleaseNotes>- v4.0.77-pre: Updated to latest media abstractions package.
+- v4.0.76-pre: Updated to latest media abstractions package.
 - v4.0.75-pre: Added fix for creating self signed X509 certificates on non-Windows platforms. Required for WebRTC DTLS negotiation.
 - v4.0.74-pre: (Re)Added net461 target and removed netcoreapp3.1 target (the latter is compatible with netstandard2.0). Removed redundant monitoring classes.
 - v4.0.71-pre: Added helper class for webrtc signaling over web sockets.
@@ -103,9 +104,9 @@
 - Version &gt; 4.0.0 - Major refactor of SIP transport layer to support IPAddress.Any and IPAddress.IPv6Any.
  </PackageReleaseNotes>
  <NeutralLanguage>en-GB</NeutralLanguage>
- <Version>4.0.76-pre</Version>
- <AssemblyVersion>4.0.76.0</AssemblyVersion>
- <FileVersion>4.0.76.0</FileVersion>
+ <Version>4.0.77-pre</Version>
+ <AssemblyVersion>4.0.77.0</AssemblyVersion>
+ <FileVersion>4.0.77.0</FileVersion>
  </PropertyGroup>
 
 </Project>