@@ -58,6 +58,9 @@ | |||||
<None Include="..\..\doc\video\jt1078_1_fragmented.mp4" Link="H264\jt1078_1_fragmented.mp4"> | <None Include="..\..\doc\video\jt1078_1_fragmented.mp4" Link="H264\jt1078_1_fragmented.mp4"> | ||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory> | <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||||
</None> | </None> | ||||
<None Include="..\..\doc\video\jt1078_5.txt" Link="H264\jt1078_5.txt"> | |||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory> | |||||
</None> | |||||
</ItemGroup> | </ItemGroup> | ||||
</Project> | </Project> |
@@ -14,7 +14,7 @@ | |||||
<licenseUrl>https://github.com/SmallChi/JT1078/blob/master/LICENSE</licenseUrl> | <licenseUrl>https://github.com/SmallChi/JT1078/blob/master/LICENSE</licenseUrl> | ||||
<license>https://github.com/SmallChi/JT1078/blob/master/LICENSE</license> | <license>https://github.com/SmallChi/JT1078/blob/master/LICENSE</license> | ||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> | <GeneratePackageOnBuild>true</GeneratePackageOnBuild> | ||||
<Version>1.0.0-preview3</Version> | |||||
<Version>1.0.0-preview4</Version> | |||||
<SignAssembly>false</SignAssembly> | <SignAssembly>false</SignAssembly> | ||||
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | ||||
<PackageLicenseFile>LICENSE</PackageLicenseFile> | <PackageLicenseFile>LICENSE</PackageLicenseFile> | ||||
@@ -22,7 +22,7 @@ namespace JT1078.Hls.Test | |||||
{ | { | ||||
var lines = File.ReadAllLines(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "H264", "jt1078_5.txt")); | var lines = File.ReadAllLines(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "H264", "jt1078_5.txt")); | ||||
Socket clientSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); | Socket clientSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); | ||||
clientSocket.Connect("127.0.0.1",1078); | |||||
clientSocket.Connect("127.0.0.1", 10888); | |||||
long lasttime = 0; | long lasttime = 0; | ||||
foreach (var line in lines) | foreach (var line in lines) | ||||
{ | { | ||||
@@ -31,10 +31,17 @@ namespace JT1078.Hls.Test | |||||
{ | { | ||||
lasttime = long.Parse(temp[0]); | lasttime = long.Parse(temp[0]); | ||||
} | } | ||||
else { | |||||
else | |||||
{ | |||||
var ts = long.Parse(temp[0]) - lasttime; | var ts = long.Parse(temp[0]) - lasttime; | ||||
if (ts > 3) ts = 3; | |||||
Thread.Sleep(TimeSpan.FromSeconds(ts)); | |||||
if(ts>0) | |||||
{ | |||||
Thread.Sleep(TimeSpan.FromMilliseconds(ts)); | |||||
} | |||||
else if (ts == 0) | |||||
{ | |||||
} | |||||
lasttime = long.Parse(temp[0]); | lasttime = long.Parse(temp[0]); | ||||
} | } | ||||
var data= temp[1].ToHexBytes(); | var data= temp[1].ToHexBytes(); | ||||
@@ -126,12 +126,13 @@ namespace JT1078.SignalR.Test.Services | |||||
if (flag.ContainsKey(session)) | if (flag.ContainsKey(session)) | ||||
{ | { | ||||
var len = flag[session]; | var len = flag[session]; | ||||
if (q.Count < len) | |||||
if (q.Count <= len) | |||||
{ | { | ||||
break; | break; | ||||
} | } | ||||
await _hubContext.Clients.Client(session).SendAsync("video", q[len], stoppingToken); | await _hubContext.Clients.Client(session).SendAsync("video", q[len], stoppingToken); | ||||
flag[session] = ++len; | |||||
len++; | |||||
flag[session] = len; | |||||
} | } | ||||
else | else | ||||
{ | { | ||||