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

Merge pull request #1442 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-02-11 14:16:47 -05:00
commit 58b51b6763
8 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
View File

@ -889,6 +889,10 @@ namespace MediaBrowser.Controller.Providers
{ {
video.Video3DFormat = Video3DFormat.FullSideBySide; video.Video3DFormat = Video3DFormat.FullSideBySide;
} }
else if (string.Equals("MVC", val, StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.MVC;
}
} }
break; break;
} }

3
MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
View File

@ -736,6 +736,9 @@ namespace MediaBrowser.LocalMetadata.Savers
case Video3DFormat.HalfTopAndBottom: case Video3DFormat.HalfTopAndBottom:
builder.Append("<Format3D>HTAB</Format3D>"); builder.Append("<Format3D>HTAB</Format3D>");
break; break;
case Video3DFormat.MVC:
builder.Append("<Format3D>MVC</Format3D>");
break;
} }
} }
} }

2
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -557,6 +557,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
vf = "crop=iw:ih/2:0:0,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1,scale=600:trunc(600/dar/2)*2"; vf = "crop=iw:ih/2:0:0,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1,scale=600:trunc(600/dar/2)*2";
// ftab crop heigt in half, set the display aspect,crop out any black bars we may have made the scale width to 600 // ftab crop heigt in half, set the display aspect,crop out any black bars we may have made the scale width to 600
break; break;
default:
break;
} }
} }

3
MediaBrowser.Model/Entities/Video3DFormat.cs
View File

@ -6,6 +6,7 @@ namespace MediaBrowser.Model.Entities
HalfSideBySide, HalfSideBySide,
FullSideBySide, FullSideBySide,
FullTopAndBottom, FullTopAndBottom,
HalfTopAndBottom HalfTopAndBottom,
MVC
} }
} }

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

@ -242,6 +242,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
{ {
video.Video3DFormat = Video3DFormat.HalfTopAndBottom; video.Video3DFormat = Video3DFormat.HalfTopAndBottom;
} }
else if (string.Equals(format3D, "mvc", StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.MVC;
}
} }
} }

2
MediaBrowser.Server.Implementations/Localization/Core/id.json
View File

@ -1,5 +1,5 @@
{ {
"DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.", "DbUpgradeMessage": "Silahkan menunggu sementara database Emby Server anda diupgrade. {0}% selesai.",
"AppDeviceValues": "App: {0}, Device: {1}", "AppDeviceValues": "App: {0}, Device: {1}",
"UserDownloadingItemWithValues": "{0} is downloading {1}", "UserDownloadingItemWithValues": "{0} is downloading {1}",
"FolderTypeMixed": "Mixed content", "FolderTypeMixed": "Mixed content",

4
MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
View File

@ -1173,6 +1173,10 @@ namespace MediaBrowser.XbmcMetadata.Parsers
{ {
video.Video3DFormat = Video3DFormat.FullSideBySide; video.Video3DFormat = Video3DFormat.FullSideBySide;
} }
else if (string.Equals("MVC", val, StringComparison.OrdinalIgnoreCase))
{
video.Video3DFormat = Video3DFormat.MVC;
}
} }
break; break;
} }

3
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
View File

@ -404,6 +404,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
case Video3DFormat.HalfTopAndBottom: case Video3DFormat.HalfTopAndBottom:
writer.WriteElementString("format3d", "HTAB"); writer.WriteElementString("format3d", "HTAB");
break; break;
case Video3DFormat.MVC:
writer.WriteElementString("format3d", "MVC");
break;
} }
} }
} }