lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2589 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-04-20 16:18:18 -04:00 committed by GitHub
commit 389baf67b6
7 changed files with 35 additions and 57 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(); }).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) 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 now = DateTime.UtcNow;
var allowVideoStreamCopy = mediaSource.MediaStreams.Any(i => i.Type == MediaStreamType.Video && i.AllowStreamCopy);
var info = await _mediaEncoder.GetMediaInfo(new MediaInfoRequest var info = await _mediaEncoder.GetMediaInfo(new MediaInfoRequest
{ {
InputPath = mediaSource.Path, 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); var videoStream = mediaSource.MediaStreams.FirstOrDefault(i => i.Type == MediaBrowser.Model.Entities.MediaStreamType.Video);
if (videoStream != null) if (videoStream != null)
{ {
videoStream.AllowStreamCopy = allowVideoStreamCopy;
if (!videoStream.BitRate.HasValue) if (!videoStream.BitRate.HasValue)
{ {
var width = videoStream.Width ?? 1920; 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) if (stream.Type == MediaStreamType.Video)
{ {
stream.IsInterlaced = true; 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) public bool CanStreamCopyVideo(EncodingJobInfo state, MediaStream videoStream)
{ {
if (!videoStream.AllowStreamCopy)
{
return false;
}
var request = state.BaseRequest; var request = state.BaseRequest;
if (!request.AllowVideoStreamCopy) if (!request.AllowVideoStreamCopy)
@ -897,11 +892,6 @@ namespace MediaBrowser.Controller.MediaEncoding
public bool CanStreamCopyAudio(EncodingJobInfo state, MediaStream audioStream, List<string> supportedAudioCodecs) public bool CanStreamCopyAudio(EncodingJobInfo state, MediaStream audioStream, List<string> supportedAudioCodecs)
{ {
if (!audioStream.AllowStreamCopy)
{
return false;
}
var request = state.BaseRequest; var request = state.BaseRequest;
if (!request.AllowAudioStreamCopy) if (!request.AllowAudioStreamCopy)

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

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

66
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -599,6 +599,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\Swiper\dist\js\swiper.min.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\Swiper\dist\js\swiper.min.js">
<Link>Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.min.js</Link> <Link>Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.min.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\alameda\LICENSE">
<Link>Resources\dashboard-ui\bower_components\alameda\LICENSE</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\alameda\alameda.js">
<Link>Resources\dashboard-ui\bower_components\alameda\alameda.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\cryptojslib\components\core-min.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\cryptojslib\components\core-min.js">
<Link>Resources\dashboard-ui\bower_components\cryptojslib\components\core-min.js</Link> <Link>Resources\dashboard-ui\bower_components\cryptojslib\components\core-min.js</Link>
</BundleResource> </BundleResource>
@ -1049,6 +1055,27 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\guide\tvguide.template.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\guide\tvguide.template.html">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\guide\tvguide.template.html</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\guide\tvguide.template.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\headroom\headroom.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\headroom\headroom.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\headroom\headroom.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\headroom\headroom.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.template.html">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.template.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettingsdialog.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettingsdialog.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettingsdialog.template.html">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettingsdialog.template.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\htmlaudioplayer\blank.mp3"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\htmlaudioplayer\blank.mp3">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\htmlaudioplayer\blank.mp3</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\htmlaudioplayer\blank.mp3</Link>
</BundleResource> </BundleResource>
@ -1076,12 +1103,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\imagehelper.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\imagehelper.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\imagehelper.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\imagehelper.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\indexeddbimagefetcher.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\indexeddbimagefetcher.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\style.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\style.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\style.css</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\style.css</Link>
</BundleResource> </BundleResource>
@ -1421,6 +1442,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\strings\ko.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\strings\ko.json">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ko.json</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ko.json</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\strings\lt-lt.json">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\strings\lt-lt.json</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\strings\ms.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\strings\ms.json">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ms.json</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ms.json</Link>
</BundleResource> </BundleResource>
@ -1577,30 +1601,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\fetch\fetch.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\fetch\fetch.js">
<Link>Resources\dashboard-ui\bower_components\fetch\fetch.js</Link> <Link>Resources\dashboard-ui\bower_components\fetch\fetch.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\font-roboto\roboto.html">
<Link>Resources\dashboard-ui\bower_components\font-roboto\roboto.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\LICENSE">
<Link>Resources\dashboard-ui\bower_components\headroomjs\LICENSE</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\dist\angular.headroom.js">
<Link>Resources\dashboard-ui\bower_components\headroomjs\dist\angular.headroom.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\dist\angular.headroom.min.js">
<Link>Resources\dashboard-ui\bower_components\headroomjs\dist\angular.headroom.min.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\dist\headroom.js">
<Link>Resources\dashboard-ui\bower_components\headroomjs\dist\headroom.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\dist\headroom.min.js">
<Link>Resources\dashboard-ui\bower_components\headroomjs\dist\headroom.min.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\dist\jQuery.headroom.js">
<Link>Resources\dashboard-ui\bower_components\headroomjs\dist\jQuery.headroom.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\headroomjs\dist\jQuery.headroom.min.js">
<Link>Resources\dashboard-ui\bower_components\headroomjs\dist\jQuery.headroom.min.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hlsjs\LICENSE"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hlsjs\LICENSE">
<Link>Resources\dashboard-ui\bower_components\hlsjs\LICENSE</Link> <Link>Resources\dashboard-ui\bower_components\hlsjs\LICENSE</Link>
</BundleResource> </BundleResource>
@ -2183,6 +2183,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\addpluginpage.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\addpluginpage.js">
<Link>Resources\dashboard-ui\scripts\addpluginpage.js</Link> <Link>Resources\dashboard-ui\scripts\addpluginpage.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\apploader.js">
<Link>Resources\dashboard-ui\scripts\apploader.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appservices.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appservices.js">
<Link>Resources\dashboard-ui\scripts\appservices.js</Link> <Link>Resources\dashboard-ui\scripts\appservices.js</Link>
</BundleResource> </BundleResource>
@ -2435,9 +2438,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\secondaryitems.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\secondaryitems.js">
<Link>Resources\dashboard-ui\scripts\secondaryitems.js</Link> <Link>Resources\dashboard-ui\scripts\secondaryitems.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\sections.js">
<Link>Resources\dashboard-ui\scripts\sections.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\selectserver.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\selectserver.js">
<Link>Resources\dashboard-ui\scripts\selectserver.js</Link> <Link>Resources\dashboard-ui\scripts\selectserver.js</Link>
</BundleResource> </BundleResource>

2
SharedVersion.cs
View File

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