cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-19 11:59:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2930 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-10-01 20:14:10 -04:00 committed by GitHub
commit 796f374359
9 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/Dto/DtoService.cs
View File

@ -1642,6 +1642,7 @@ namespace Emby.Server.Implementations.Dto
return null;
}
return null;
_logger.Info("Getting image size for item type {0}", item.GetType().Name);
try

14
Emby.Server.Implementations/Session/SessionManager.cs
View File

@ -1406,11 +1406,19 @@ namespace Emby.Server.Implementations.Session
.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
}
if (user != null && !string.IsNullOrWhiteSpace(request.DeviceId))
if (user != null)
{
if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId))
if (!user.IsParentalScheduleAllowed())
{
throw new SecurityException("User is not allowed access from this device.");
throw new SecurityException("User is not allowed access at this time.");
}
if (!string.IsNullOrWhiteSpace(request.DeviceId))
{
if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId))
{
throw new SecurityException("User is not allowed access from this device.");
}
}
}

12
MediaBrowser.Controller/Entities/BasePluginFolder.cs
View File

@ -43,12 +43,12 @@ namespace MediaBrowser.Controller.Entities
}
}
public override double? GetDefaultPrimaryImageAspectRatio()
{
double value = 16;
value /= 9;
//public override double? GetDefaultPrimaryImageAspectRatio()
//{
// double value = 16;
// value /= 9;
return value;
}
// return value;
//}
}
}

12
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@ -31,13 +31,13 @@ namespace MediaBrowser.Controller.Entities
PhysicalFolderIds = EmptyGuidArray;
}
public override double? GetDefaultPrimaryImageAspectRatio()
{
double value = 16;
value /= 9;
//public override double? GetDefaultPrimaryImageAspectRatio()
//{
// double value = 16;
// value /= 9;
return value;
}
// return value;
//}
[IgnoreDataMember]
public override bool SupportsPlayedStatus

12
MediaBrowser.Controller/Entities/UserView.cs
View File

@ -58,13 +58,13 @@ namespace MediaBrowser.Controller.Entities
}
}
public override double? GetDefaultPrimaryImageAspectRatio()
{
double value = 16;
value /= 9;
//public override double? GetDefaultPrimaryImageAspectRatio()
//{
// double value = 16;
// value /= 9;
return value;
}
// return value;
//}
public override int GetChildCount(User user)
{

8
MediaBrowser.Controller/Entities/Video.cs
View File

@ -78,6 +78,14 @@ namespace MediaBrowser.Controller.Entities
}
}
public override double? GetDefaultPrimaryImageAspectRatio()
{
double value = 16;
value /= 9;
return value;
}
public override string CreatePresentationUniqueKey()
{
if (!string.IsNullOrWhiteSpace(PrimaryVersionId))

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

@ -530,7 +530,8 @@ namespace MediaBrowser.Controller.MediaEncoding
{
var seconds = Math.Round(TimeSpan.FromTicks(state.StartTimeTicks ?? 0).TotalSeconds);
var setPtsParam = state.CopyTimestamps
// hls always copies timestamps
var setPtsParam = state.CopyTimestamps || state.TranscodingType != TranscodingJobType.Progressive
? string.Empty
: string.Format(",setpts=PTS -{0}/TB", seconds.ToString(_usCulture));
@ -1083,7 +1084,8 @@ namespace MediaBrowser.Controller.MediaEncoding
}
}
if (state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode && !state.CopyTimestamps)
var isCopyingTimestamps = state.CopyTimestamps || state.TranscodingType != TranscodingJobType.Progressive;
if (state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode && !isCopyingTimestamps)
{
var seconds = TimeSpan.FromTicks(state.StartTimeTicks ?? 0).TotalSeconds;

11
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View File

@ -163,6 +163,14 @@ namespace MediaBrowser.Controller.MediaEncoding
public bool DeInterlace(string videoCodec, bool forceDeinterlaceIfSourceIsInterlaced)
{
var videoStream = VideoStream;
var isInputInterlaced = videoStream != null && videoStream.IsInterlaced;
if (!isInputInterlaced)
{
return false;
}
// Support general param
if (BaseRequest.DeInterlace)
{
@ -179,8 +187,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (forceDeinterlaceIfSourceIsInterlaced)
{
var videoStream = VideoStream;
if (videoStream != null && videoStream.IsInterlaced)
if (isInputInterlaced)
{
return true;
}

2
SharedVersion.cs
View File

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