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

3.2.12.11

Browse Source
This commit is contained in:
Luke Pulverenti 2017-04-20 16:17:52 -04:00
parent d0424ac6df
commit 7ea3719a2d
6 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -2577,7 +2577,7 @@ namespace Emby.Server.Implementations.Library
}).OrderBy(i => i.Path).ToList();
}
private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes" };
private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes", "interviews" };
public IEnumerable<Video> FindExtras(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService)
{

4
Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
View File

@ -30,8 +30,6 @@ namespace Emby.Server.Implementations.LiveTv
var now = DateTime.UtcNow;
var allowVideoStreamCopy = mediaSource.MediaStreams.Any(i => i.Type == MediaStreamType.Video && i.AllowStreamCopy);
var info = await _mediaEncoder.GetMediaInfo(new MediaInfoRequest
{
InputPath = mediaSource.Path,
@ -76,8 +74,6 @@ namespace Emby.Server.Implementations.LiveTv
var videoStream = mediaSource.MediaStreams.FirstOrDefault(i => i.Type == MediaBrowser.Model.Entities.MediaStreamType.Video);
if (videoStream != null)
{
videoStream.AllowStreamCopy = allowVideoStreamCopy;
if (!videoStream.BitRate.HasValue)
{
var width = videoStream.Width ?? 1920;

1
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -490,7 +490,6 @@ namespace Emby.Server.Implementations.LiveTv
if (stream.Type == MediaStreamType.Video)
{
stream.IsInterlaced = true;
stream.AllowStreamCopy = false;
}
}
}

10
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -747,11 +747,6 @@ namespace MediaBrowser.Controller.MediaEncoding
public bool CanStreamCopyVideo(EncodingJobInfo state, MediaStream videoStream)
{
if (!videoStream.AllowStreamCopy)
{
return false;
}
var request = state.BaseRequest;
if (!request.AllowVideoStreamCopy)
@ -897,11 +892,6 @@ namespace MediaBrowser.Controller.MediaEncoding
public bool CanStreamCopyAudio(EncodingJobInfo state, MediaStream audioStream, List<string> supportedAudioCodecs)
{
if (!audioStream.AllowStreamCopy)
{
return false;
}
var request = state.BaseRequest;
if (!request.AllowAudioStreamCopy)

7
MediaBrowser.Model/Entities/MediaStream.cs
View File

@ -13,11 +13,6 @@ namespace MediaBrowser.Model.Entities
[DebuggerDisplay("StreamType = {Type}")]
public class MediaStream
{
public MediaStream()
{
AllowStreamCopy = true;
}
/// <summary>
/// Gets or sets the codec.
/// </summary>
@ -158,8 +153,6 @@ namespace MediaBrowser.Model.Entities
public bool? IsAVC { get; set; }
public bool AllowStreamCopy { get; set; }
/// <summary>
/// Gets or sets the channel layout.
/// </summary>

2
SharedVersion.cs
View File

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