9 files changed, 34 insertions, 17 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 285ff4ba5..9ae10d980 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -18,7 +18,8 @@ namespace MediaBrowser.Model.Configuration
         public string EncoderAppPathDisplay { get; set; }
         public string VaapiDevice { get; set; }
         public int H264Crf { get; set; }
-        public string H264Preset { get; set; }
+        public int H265Crf { get; set; }
+        public string EncoderPreset { get; set; }
         public string DeinterlaceMethod { get; set; }
         public bool EnableHardwareEncoding { get; set; }
         public bool EnableSubtitleExtraction { get; set; }
@@ -34,6 +35,7 @@ namespace MediaBrowser.Model.Configuration
             // This is a DRM device that is almost guaranteed to be there on every intel platform, plus it's the default one in ffmpeg if you don't specify anything
             VaapiDevice = "/dev/dri/renderD128";
             H264Crf = 23;
+            H265Crf = 28;
             EnableHardwareEncoding = true;
             EnableSubtitleExtraction = true;
             HardwareDecodingCodecs = new string[] { "h264", "vc1" };
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 2673597ca..d64ea35eb 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -163,6 +163,7 @@ namespace MediaBrowser.Model.Configuration
 
         public string ServerName { get; set; }
         public string WanDdns { get; set; }
+        public string BaseUrl { get; set; }
 
         public string UICulture { get; set; }
 
@@ -243,6 +244,7 @@ namespace MediaBrowser.Model.Configuration
             SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" };
             SortRemoveWords = new[] { "the", "a", "an" };
 
+            BaseUrl = "jellyfin";
             UICulture = "en-US";
 
             MetadataOptions = new[]
diff --git a/MediaBrowser.Model/Globalization/CultureDto.cs b/MediaBrowser.Model/Globalization/CultureDto.cs
index f229f2055..a213d4147 100644
--- a/MediaBrowser.Model/Globalization/CultureDto.cs
+++ b/MediaBrowser.Model/Globalization/CultureDto.cs
@@ -38,6 +38,7 @@ namespace MediaBrowser.Model.Globalization
                 {
                     return vals[0];
                 }
+
                 return null;
             }
         }
diff --git a/MediaBrowser.Model/Globalization/ILocalizationManager.cs b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
index a9ce60a2a..91d946db8 100644
--- a/MediaBrowser.Model/Globalization/ILocalizationManager.cs
+++ b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Globalization;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Globalization
@@ -13,23 +12,26 @@ namespace MediaBrowser.Model.Globalization
         /// <summary>
         /// Gets the cultures.
         /// </summary>
-        /// <returns>IEnumerable{CultureDto}.</returns>
-        CultureDto[] GetCultures();
+        /// <returns><see cref="IEnumerable{CultureDto}" />.</returns>
+        IEnumerable<CultureDto> GetCultures();
+
         /// <summary>
         /// Gets the countries.
         /// </summary>
-        /// <returns>IEnumerable{CountryInfo}.</returns>
-        Task<CountryInfo[]> GetCountries();
+        /// <returns><see cref="IEnumerable{CountryInfo}" />.</returns>
+        IEnumerable<CountryInfo> GetCountries();
+
         /// <summary>
         /// Gets the parental ratings.
         /// </summary>
-        /// <returns>IEnumerable{ParentalRating}.</returns>
+        /// <returns><see cref="IEnumerable{ParentalRating}" />.</returns>
         IEnumerable<ParentalRating> GetParentalRatings();
+
         /// <summary>
         /// Gets the rating level.
         /// </summary>
         /// <param name="rating">The rating.</param>
-        /// <returns>System.Int32.</returns>
+        /// <returns><see cref="int" /> or <c>null</c>.</returns>
         int? GetRatingLevel(string rating);
 
         /// <summary>
@@ -37,7 +39,7 @@ namespace MediaBrowser.Model.Globalization
         /// </summary>
         /// <param name="phrase">The phrase.</param>
         /// <param name="culture">The culture.</param>
-        /// <returns>System.String.</returns>
+        /// <returns><see cref="string" />.</returns>
         string GetLocalizedString(string phrase, string culture);
 
         /// <summary>
@@ -50,13 +52,22 @@ namespace MediaBrowser.Model.Globalization
         /// <summary>
         /// Gets the localization options.
         /// </summary>
-        /// <returns>IEnumerable{LocalizatonOption}.</returns>
-        LocalizationOption[] GetLocalizationOptions();
-
-        string NormalizeFormKD(string text);
+        /// <returns><see cref="IEnumerable{LocalizatonOption}" />.</returns>
+        IEnumerable<LocalizationOption> GetLocalizationOptions();
 
+        /// <summary>
+        /// Checks if the string contains a character with the specified unicode category.
+        /// </summary>
+        /// <param name="value">The string.</param>
+        /// <param name="category">The unicode category.</param>
+        /// <returns>Wether or not the string contains a character with the specified unicode category.</returns>
         bool HasUnicodeCategory(string value, UnicodeCategory category);
 
+        /// <summary>
+        /// Returns the correct <see cref="Cultureinfo" /> for the given language.
+        /// </summary>
+        /// <param name="language">The language.</param>
+        /// <returns>The correct <see cref="Cultureinfo" /> for the given language.</returns>
         CultureDto FindLanguageInfo(string language);
     }
 }
diff --git a/MediaBrowser.Model/IO/IIsoManager.cs b/MediaBrowser.Model/IO/IIsoManager.cs
index 24b6e5f05..eb0cb4bfb 100644
--- a/MediaBrowser.Model/IO/IIsoManager.cs
+++ b/MediaBrowser.Model/IO/IIsoManager.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Model.IO
 {
-    public interface IIsoManager : IDisposable
+    public interface IIsoManager
     {
         /// <summary>
         /// Mounts the specified iso path.
diff --git a/MediaBrowser.Model/IO/IIsoMounter.cs b/MediaBrowser.Model/IO/IIsoMounter.cs
index f0153a928..766a9e4e6 100644
--- a/MediaBrowser.Model/IO/IIsoMounter.cs
+++ b/MediaBrowser.Model/IO/IIsoMounter.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Model.IO
 {
-    public interface IIsoMounter : IDisposable
+    public interface IIsoMounter
     {
         /// <summary>
         /// Mounts the specified iso path.
diff --git a/MediaBrowser.Model/IO/StreamDefaults.cs b/MediaBrowser.Model/IO/StreamDefaults.cs
index bef20e74f..1dc29e06e 100644
--- a/MediaBrowser.Model/IO/StreamDefaults.cs
+++ b/MediaBrowser.Model/IO/StreamDefaults.cs
@@ -13,6 +13,6 @@ namespace MediaBrowser.Model.IO
         /// <summary>
         /// The default file stream buffer size
         /// </summary>
-        public const int DefaultFileStreamBufferSize = 81920;
+        public const int DefaultFileStreamBufferSize = 4096;
     }
 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 3de2cca2d..e9f43ea56 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -10,6 +10,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs b/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
index 39db22133..ac540782c 100644
--- a/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
+++ b/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
@@ -1,7 +1,7 @@
 namespace MediaBrowser.Model.Plugins
 {
     /// <summary>
-    /// Class BasePluginConfiguration
+    /// Class BasePluginConfiguration.
     /// </summary>
     public class BasePluginConfiguration
     {