diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 3e53538124..f9060d184e 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -889,6 +889,10 @@ namespace MediaBrowser.Controller.Providers
{
video.Video3DFormat = Video3DFormat.FullSideBySide;
}
+ else if (string.Equals("MVC", val, StringComparison.OrdinalIgnoreCase))
+ {
+ video.Video3DFormat = Video3DFormat.MVC;
+ }
}
break;
}
diff --git a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
index c9a4cb5378..48c4fe2fd3 100644
--- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
@@ -736,6 +736,9 @@ namespace MediaBrowser.LocalMetadata.Savers
case Video3DFormat.HalfTopAndBottom:
builder.Append("HTAB");
break;
+ case Video3DFormat.MVC:
+ builder.Append("MVC");
+ break;
}
}
}
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 2a3a416ad3..30e50fecd6 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -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";
// ftab crop heigt in half, set the display aspect,crop out any black bars we may have made the scale width to 600
break;
+ default:
+ break;
}
}
diff --git a/MediaBrowser.Model/Entities/Video3DFormat.cs b/MediaBrowser.Model/Entities/Video3DFormat.cs
index 064b02eddb..722df42819 100644
--- a/MediaBrowser.Model/Entities/Video3DFormat.cs
+++ b/MediaBrowser.Model/Entities/Video3DFormat.cs
@@ -6,6 +6,7 @@ namespace MediaBrowser.Model.Entities
HalfSideBySide,
FullSideBySide,
FullTopAndBottom,
- HalfTopAndBottom
+ HalfTopAndBottom,
+ MVC
}
}
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index 9ebf82c021..9edd3f83f0 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -242,6 +242,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
{
video.Video3DFormat = Video3DFormat.HalfTopAndBottom;
}
+ else if (string.Equals(format3D, "mvc", StringComparison.OrdinalIgnoreCase))
+ {
+ video.Video3DFormat = Video3DFormat.MVC;
+ }
}
}
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/id.json b/MediaBrowser.Server.Implementations/Localization/Core/id.json
index 07a25f92f4..8d64b63c46 100644
--- a/MediaBrowser.Server.Implementations/Localization/Core/id.json
+++ b/MediaBrowser.Server.Implementations/Localization/Core/id.json
@@ -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}",
"UserDownloadingItemWithValues": "{0} is downloading {1}",
"FolderTypeMixed": "Mixed content",
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 40b974ee77..30243ff57c 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -1173,6 +1173,10 @@ namespace MediaBrowser.XbmcMetadata.Parsers
{
video.Video3DFormat = Video3DFormat.FullSideBySide;
}
+ else if (string.Equals("MVC", val, StringComparison.OrdinalIgnoreCase))
+ {
+ video.Video3DFormat = Video3DFormat.MVC;
+ }
}
break;
}
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index ec12088b3f..53a7926cab 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -404,6 +404,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
case Video3DFormat.HalfTopAndBottom:
writer.WriteElementString("format3d", "HTAB");
break;
+ case Video3DFormat.MVC:
+ writer.WriteElementString("format3d", "MVC");
+ break;
}
}
}