michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1988 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-07-27 13:18:30 -04:00 committed by GitHub
commit 359be978ba
8 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@ -257,8 +257,7 @@ namespace MediaBrowser.Api.Playback.Hls
return await GetSegmentResult(state, playlistPath, segmentPath, requestedIndex, job, cancellationToken).ConfigureAwait(false); return await GetSegmentResult(state, playlistPath, segmentPath, requestedIndex, job, cancellationToken).ConfigureAwait(false);
} }
// 256k private const int BufferSize = 81920;
private const int BufferSize = 262144;
private long GetStartPositionTicks(StreamState state, int requestedIndex) private long GetStartPositionTicks(StreamState state, int requestedIndex)
{ {

2
MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
View File

@ -16,7 +16,7 @@ namespace MediaBrowser.Api.Playback.Progressive
private readonly ILogger _logger; private readonly ILogger _logger;
// 256k // 256k
private const int BufferSize = 262144; private const int BufferSize = 81920;
private long _bytesWritten = 0; private long _bytesWritten = 0;

4
MediaBrowser.Common/IO/StreamDefaults.cs
View File

@ -9,11 +9,11 @@ namespace MediaBrowser.Common.IO
/// <summary> /// <summary>
/// The default copy to buffer size /// The default copy to buffer size
/// </summary> /// </summary>
public const int DefaultCopyToBufferSize = 262144; public const int DefaultCopyToBufferSize = 81920;
/// <summary> /// <summary>
/// The default file stream buffer size /// The default file stream buffer size
/// </summary> /// </summary>
public const int DefaultFileStreamBufferSize = 262144; public const int DefaultFileStreamBufferSize = 81920;
} }
} }

3
MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
View File

@ -28,8 +28,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
public Action OnComplete { get; set; } public Action OnComplete { get; set; }
private readonly ILogger _logger; private readonly ILogger _logger;
// 256k private const int BufferSize = 81920;
private const int BufferSize = 262144;
/// <summary> /// <summary>
/// The _options /// The _options

3
MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
View File

@ -75,8 +75,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{ {
} }
// 256k private const int BufferSize = 81920;
private const int BufferSize = 262144;
/// <summary> /// <summary>
/// Writes to. /// Writes to.

4
Nuget/MediaBrowser.Common.Internal.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common.Internal</id> <id>MediaBrowser.Common.Internal</id>
<version>3.0.653</version> <version>3.0.654</version>
<title>MediaBrowser.Common.Internal</title> <title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors> <authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description> <description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Emby 2013</copyright> <copyright>Copyright © Emby 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.653" /> <dependency id="MediaBrowser.Common" version="3.0.654" />
<dependency id="NLog" version="4.3.5" /> <dependency id="NLog" version="4.3.5" />
<dependency id="SimpleInjector" version="3.2.0" /> <dependency id="SimpleInjector" version="3.2.0" />
</dependencies> </dependencies>

2
Nuget/MediaBrowser.Common.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common</id> <id>MediaBrowser.Common</id>
<version>3.0.653</version> <version>3.0.654</version>
<title>MediaBrowser.Common</title> <title>MediaBrowser.Common</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Server.Core</id> <id>MediaBrowser.Server.Core</id>
<version>3.0.653</version> <version>3.0.654</version>
<title>Media Browser.Server.Core</title> <title>Media Browser.Server.Core</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Emby Server.</description> <description>Contains core components required to build plugins for Emby Server.</description>
<copyright>Copyright © Emby 2013</copyright> <copyright>Copyright © Emby 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.653" /> <dependency id="MediaBrowser.Common" version="3.0.654" />
<dependency id="Interfaces.IO" version="1.0.0.5" /> <dependency id="Interfaces.IO" version="1.0.0.5" />
</dependencies> </dependencies>
</metadata> </metadata>