Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-06 07:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve 3d & mbc issues

Browse Source
This commit is contained in:
Luke Pulverenti 2014-11-30 14:11:50 -05:00
parent aaac7e4208
commit df1938c158
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Api/PackageService.cs
View File

@ -16,6 +16,7 @@ namespace MediaBrowser.Api
/// Class GetPackage /// Class GetPackage
/// </summary> /// </summary>
[Route("/Packages/{Name}", "GET", Summary = "Gets a package, by name or assembly guid")] [Route("/Packages/{Name}", "GET", Summary = "Gets a package, by name or assembly guid")]
[Authenticated]
public class GetPackage : IReturn<PackageInfo> public class GetPackage : IReturn<PackageInfo>
{ {
/// <summary> /// <summary>
@ -37,6 +38,7 @@ namespace MediaBrowser.Api
/// Class GetPackages /// Class GetPackages
/// </summary> /// </summary>
[Route("/Packages", "GET", Summary = "Gets available packages")] [Route("/Packages", "GET", Summary = "Gets available packages")]
[Authenticated]
public class GetPackages : IReturn<List<PackageInfo>> public class GetPackages : IReturn<List<PackageInfo>>
{ {
/// <summary> /// <summary>
@ -60,6 +62,7 @@ namespace MediaBrowser.Api
/// Class GetPackageVersionUpdates /// Class GetPackageVersionUpdates
/// </summary> /// </summary>
[Route("/Packages/Updates", "GET", Summary = "Gets available package updates for currently installed packages")] [Route("/Packages/Updates", "GET", Summary = "Gets available package updates for currently installed packages")]
[Authenticated(Roles = "Admin")]
public class GetPackageVersionUpdates : IReturn<List<PackageVersionInfo>> public class GetPackageVersionUpdates : IReturn<List<PackageVersionInfo>>
{ {
/// <summary> /// <summary>
@ -74,6 +77,7 @@ namespace MediaBrowser.Api
/// Class InstallPackage /// Class InstallPackage
/// </summary> /// </summary>
[Route("/Packages/Installed/{Name}", "POST", Summary = "Installs a package")] [Route("/Packages/Installed/{Name}", "POST", Summary = "Installs a package")]
[Authenticated(Roles = "Admin")]
public class InstallPackage : IReturnVoid public class InstallPackage : IReturnVoid
{ {
/// <summary> /// <summary>
@ -109,6 +113,7 @@ namespace MediaBrowser.Api
/// Class CancelPackageInstallation /// Class CancelPackageInstallation
/// </summary> /// </summary>
[Route("/Packages/Installing/{Id}", "DELETE", Summary = "Cancels a package installation")] [Route("/Packages/Installing/{Id}", "DELETE", Summary = "Cancels a package installation")]
[Authenticated(Roles = "Admin")]
public class CancelPackageInstallation : IReturnVoid public class CancelPackageInstallation : IReturnVoid
{ {
/// <summary> /// <summary>
@ -122,7 +127,6 @@ namespace MediaBrowser.Api
/// <summary> /// <summary>
/// Class PackageService /// Class PackageService
/// </summary> /// </summary>
[Authenticated(Roles = "Admin")]
public class PackageService : BaseApiService public class PackageService : BaseApiService
{ {
private readonly IInstallationManager _installationManager; private readonly IInstallationManager _installationManager;
@ -139,7 +143,6 @@ namespace MediaBrowser.Api
/// </summary> /// </summary>
/// <param name="request">The request.</param> /// <param name="request">The request.</param>
/// <returns>System.Object.</returns> /// <returns>System.Object.</returns>
/// <exception cref="System.ArgumentException">Unsupported PackageType</exception>
public object Get(GetPackageVersionUpdates request) public object Get(GetPackageVersionUpdates request)
{ {
var result = new List<PackageVersionInfo>(); var result = new List<PackageVersionInfo>();
@ -240,4 +243,4 @@ namespace MediaBrowser.Api
} }
} }
} }

32
MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
View File

@ -89,6 +89,38 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
} }
} }
if (videoInfo.Is3D)
{
if (string.Equals(videoInfo.Format3D, "fsbs", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.FullSideBySide;
}
else if (string.Equals(videoInfo.Format3D, "ftab", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.FullTopAndBottom;
}
else if (string.Equals(videoInfo.Format3D, "hsbs", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.HalfSideBySide;
}
else if (string.Equals(videoInfo.Format3D, "htab", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.HalfTopAndBottom;
}
else if (string.Equals(videoInfo.Format3D, "sbs", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.HalfSideBySide;
}
else if (string.Equals(videoInfo.Format3D, "sbs3d", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.HalfSideBySide;
}
else if (string.Equals(videoInfo.Format3D, "tab", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.HalfTopAndBottom;
}
}
return video; return video;
} }
} }