Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-24 22:48:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2594 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2017-04-23 17:25:32 -04:00 committed by GitHub
parent 82b86449cb c34ff57e1c
commit a0dc26b881
12 changed files with 62 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View file

@ -807,7 +807,7 @@ namespace MediaBrowser.Api.Playback.Hls
if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
{
return "-codec:a:0 copy";
return "-codec:a:0 copy -copypriorss:a:0 0";
}
var args = "-codec:a:0 " + codec;

1
MediaBrowser.Api/StartupWizardService.cs
View file

@ -101,6 +101,7 @@ namespace MediaBrowser.Api
config.EnableLocalizedGuids = true;
config.EnableSimpleArtistDetection = true;
config.EnableNormalizedItemByNameIds = true;
config.DisableLiveTvChannelUserDataName = true;
}
public void Post(UpdateStartupConfiguration request)

2
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View file

@ -205,7 +205,7 @@ namespace MediaBrowser.Controller.Entities.Movies
if (base.IsVisible(user))
{
return GetChildren(user, true).Any();
return base.GetChildren(user, true).Any();
}
return false;

6
MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
View file

@ -16,7 +16,11 @@ namespace MediaBrowser.Controller.LiveTv
{
var list = base.GetUserDataKeys();
list.Insert(0, GetClientTypeName() + "-" + Name);
if (!ConfigurationManager.Configuration.DisableLiveTvChannelUserDataName)
{
list.Insert(0, GetClientTypeName() + "-" + Name);
}
return list;
}

2
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file

@ -732,7 +732,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase))
{
param += " -x264opts:0 subme=0:rc_lookahead=10:me_range=4:me=dia:no_chroma_me:8x8dct=0:partitions=none";
param += " -x264opts:0 subme=0:me_range=4:rc_lookahead=10:me=dia:no_chroma_me:8x8dct=0:partitions=none";
}
if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase) &&

2
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View file

@ -68,6 +68,8 @@ namespace MediaBrowser.Model.Configuration
/// <value><c>true</c> if [enable case sensitive item ids]; otherwise, <c>false</c>.</value>
public bool EnableCaseSensitiveItemIds { get; set; }
public bool DisableLiveTvChannelUserDataName { get; set; }
/// <summary>
/// Gets or sets the metadata path.
/// </summary>

0
MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs → MediaBrowser.Server.Mono/ImageEncoderHelper.cs
View file

1
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View file

@ -117,6 +117,7 @@
<Compile Include="..\SharedVersion.cs">
<Link>Properties\SharedVersion.cs</Link>
</Compile>
<Compile Include="ImageEncoderHelper.cs" />
<Compile Include="MonoAppHost.cs" />
<Compile Include="Native\MonoFileSystem.cs" />
<Compile Include="Native\PowerManagement.cs" />

13
MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
View file

@ -73,25 +73,12 @@
<Compile Include="Cryptography\X509Extension.cs" />
<Compile Include="Cryptography\X509Extensions.cs" />
<Compile Include="Cryptography\X520Attributes.cs" />
<Compile Include="ImageEncoderHelper.cs" />
<Compile Include="IO\MemoryStreamProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SystemEvents.cs" />
<Compile Include="UpdateLevelHelper.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Emby.Drawing.ImageMagick\Emby.Drawing.ImageMagick.csproj">
<Project>{6cfee013-6e7c-432b-ac37-cabf0880c69a}</Project>
<Name>Emby.Drawing.ImageMagick</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Drawing.Net\Emby.Drawing.Net.csproj">
<Project>{c97a239e-a96c-4d64-a844-ccf8cc30aecb}</Project>
<Name>Emby.Drawing.Net</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj">
<Project>{08fff49b-f175-4807-a2b5-73b0ebd9f716}</Project>
<Name>Emby.Drawing</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj">
<Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project>
<Name>Emby.Server.Implementations</Name>

48
MediaBrowser.ServerApplication/ImageEncoderHelper.cs Normal file
View file

@ -0,0 +1,48 @@
using System;
using Emby.Drawing;
using Emby.Drawing.Net;
using Emby.Drawing.ImageMagick;
using Emby.Server.Core;
using Emby.Server.Implementations;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Server.Startup.Common
{
public class ImageEncoderHelper
{
public static IImageEncoder GetImageEncoder(ILogger logger,
ILogManager logManager,
IFileSystem fileSystem,
StartupOptions startupOptions,
Func<IHttpClient> httpClient,
IApplicationPaths appPaths)
{
if (!startupOptions.ContainsOption("-enablegdi"))
{
try
{
return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
}
catch
{
logger.Error("Error loading ImageMagick. Will revert to GDI.");
}
}
try
{
return new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI"));
}
catch
{
logger.Error("Error loading GDI. Will revert to NullImageEncoder.");
}
return new NullImageEncoder();
}
}
}

1
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View file

@ -135,6 +135,7 @@
<Compile Include="BackgroundServiceInstaller.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ImageEncoderHelper.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>

2
SharedVersion.cs
View file

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.13.2")]
[assembly: AssemblyVersion("3.2.13.3")]