From fd621bbc522b39dca2f51c95d463a76ca7ca906e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 5 Oct 2017 14:07:31 -0400
Subject: support mpeg2 decoding with omx

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'MediaBrowser.Controller/MediaEncoding')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 8b612f809..004748a76 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1960,6 +1960,12 @@ namespace MediaBrowser.Controller.MediaEncoding
                                 return "-c:v h264_mmal";
                             }
                             break;
+                        case "mpeg2video":
+                            if (_mediaEncoder.SupportsDecoder("mpeg2_mmal") && encodingOptions.HardwareDecodingCodecs.Contains("mpeg2video", StringComparer.OrdinalIgnoreCase))
+                            {
+                                return "-c:v mpeg2_mmal";
+                            }
+                            break;
                     }
                 }
             }
-- 
cgit v1.2.3


From 851c62a9401919780f9413659eb13e8d2a556679 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 11 Oct 2017 02:24:22 -0400
Subject: update image magick orientation function

---
 Emby.Drawing.ImageMagick/ImageMagickEncoder.cs     |  2 +-
 .../TunerHosts/HdHomerun/HdHomerunHttpStream.cs    | 66 ++++++++--------------
 .../MediaEncoding/EncodingHelper.cs                |  2 +-
 .../Manager/ItemImageProvider.cs                   | 24 +++-----
 4 files changed, 35 insertions(+), 59 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding')

diff --git a/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs
index 04f916eb1..38e2879ea 100644
--- a/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs
+++ b/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs
@@ -149,7 +149,7 @@ namespace Emby.Drawing.ImageMagick
 
                     var originalImageSize = new ImageSize(originalImage.CurrentImage.Width, originalImage.CurrentImage.Height);
 
-                    if (!options.CropWhiteSpace && options.HasDefaultOptions(inputPath, originalImageSize))
+                    if (!options.CropWhiteSpace && options.HasDefaultOptions(inputPath, originalImageSize) && !autoOrient)
                     {
                         // Just spit out the original file if all the options are default
                         return inputPath;
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs
index 604aa74f0..5e3923972 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs
@@ -33,7 +33,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             OriginalStreamId = originalStreamId;
         }
 
-        protected override  Task OpenInternal(CancellationToken openCancellationToken)
+        protected override Task OpenInternal(CancellationToken openCancellationToken)
         {
             _liveStreamCancellationTokenSource.Token.ThrowIfCancellationRequested();
 
@@ -77,56 +77,38 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
         {
             return Task.Run(async () =>
             {
-                var isFirstAttempt = true;
-
-                while (!cancellationToken.IsCancellationRequested)
+                try
                 {
-                    try
+                    using (var response = await _httpClient.SendAsync(new HttpRequestOptions
                     {
-                        using (var response = await _httpClient.SendAsync(new HttpRequestOptions
-                        {
-                            Url = url,
-                            CancellationToken = cancellationToken,
-                            BufferContent = false,
+                        Url = url,
+                        CancellationToken = cancellationToken,
+                        BufferContent = false,
 
-                            // Increase a little bit
-                            TimeoutMs = 30000,
+                        // Increase a little bit
+                        TimeoutMs = 30000,
 
-                            EnableHttpCompression = false
+                        EnableHttpCompression = false
 
-                        }, "GET").ConfigureAwait(false))
-                        {
-                            Logger.Info("Opened HDHR stream from {0}", url);
-
-                            if (!cancellationToken.IsCancellationRequested)
-                            {
-                                Logger.Info("Beginning multicastStream.CopyUntilCancelled");
-
-                                FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
-                                using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
-                                {
-                                    StreamHelper.CopyTo(response.Content, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
-                                }
-                            }
-                        }
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        break;
-                    }
-                    catch (Exception ex)
+                    }, "GET").ConfigureAwait(false))
                     {
-                        if (isFirstAttempt)
+                        Logger.Info("Opened HDHR stream from {0}", url);
+
+                        Logger.Info("Beginning multicastStream.CopyUntilCancelled");
+
+                        FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
+                        using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
                         {
-                            Logger.ErrorException("Error opening live stream:", ex);
-                            openTaskCompletionSource.TrySetException(ex);
-                            break;
+                            StreamHelper.CopyTo(response.Content, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
                         }
-
-                        Logger.ErrorException("Error copying live stream, will reopen", ex);
                     }
-
-                    isFirstAttempt = false;
+                }
+                catch (OperationCanceledException)
+                {
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error copying live stream.", ex);
                 }
 
                 _liveStreamTaskCompletionSource.TrySetResult(true);
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 004748a76..e7c768c3b 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1638,7 +1638,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (state.InputProtocol == MediaProtocol.Rtsp)
             {
-                inputModifier += " -rtsp_transport tcp";
+                inputModifier += " -rtsp_transport tcp -rtsp_transport udp -rtsp_flags prefer_tcp";
             }
 
             if (!string.IsNullOrEmpty(state.InputAudioSync))
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index 00fd54271..4419b48cb 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -517,21 +517,11 @@ namespace MediaBrowser.Providers.Manager
                 return true;
             }
 
-            if (libraryOptions.DownloadImagesInAdvance)
-            {
-                return false;
-            }
-
             if (item.LocationType == LocationType.Remote || item.LocationType == LocationType.Virtual)
             {
                 return true;
             }
 
-            if (!item.IsSaveLocalMetadataEnabled())
-            {
-                return true;
-            }
-
             if (item is IItemByName && !(item is MusicArtist))
             {
                 var hasDualAccess = item as IHasDualAccess;
@@ -541,13 +531,17 @@ namespace MediaBrowser.Providers.Manager
                 }
             }
 
-            switch (type)
+            if (libraryOptions.DownloadImagesInAdvance)
             {
-                case ImageType.Primary:
-                    return true;
-                default:
-                    return true;
+                return false;
             }
+
+            //if (!item.IsSaveLocalMetadataEnabled())
+            //{
+            //    return true;
+            //}
+
+            return true;
         }
 
         private void SaveImageStub(IHasMetadata item, ImageType imageType, IEnumerable<string> urls)
-- 
cgit v1.2.3


From bc656edf4ff5cc60b246b6d59f7483610677ce69 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 13 Oct 2017 01:44:20 -0400
Subject: update resolved video titles

---
 .../Emby.Server.Implementations.csproj             |  2 --
 .../Library/Resolvers/Movies/MovieResolver.cs      | 28 ++++++++++++----------
 .../Notifications/CoreNotificationTypes.cs         | 12 +++++-----
 MediaBrowser.Api/ItemUpdateService.cs              | 20 ++++++++--------
 MediaBrowser.Api/LiveTv/LiveTvService.cs           | 13 +++++-----
 MediaBrowser.Controller/LiveTv/ILiveTvManager.cs   | 10 --------
 .../MediaEncoding/EncodingJobInfo.cs               |  5 ----
 MediaBrowser.Model/Dto/MediaSourceInfo.cs          |  1 -
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs         |  1 -
 9 files changed, 38 insertions(+), 54 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding')

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index b3fdead84..4f5471bc3 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -681,11 +681,9 @@
     <EmbeddedResource Include="Localization\Core\ca.json" />
     <EmbeddedResource Include="Localization\Core\cs.json" />
     <EmbeddedResource Include="Localization\Core\da.json" />
-    <EmbeddedResource Include="Localization\Core\de-DE.json" />
     <EmbeddedResource Include="Localization\Core\de.json" />
     <EmbeddedResource Include="Localization\Core\en-GB.json" />
     <EmbeddedResource Include="Localization\Core\es-AR.json" />
-    <EmbeddedResource Include="Localization\Core\es-ES.json" />
     <EmbeddedResource Include="Localization\Core\es-MX.json" />
     <EmbeddedResource Include="Localization\Core\es.json" />
     <EmbeddedResource Include="Localization\Core\fr-CA.json" />
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 82f42c745..fc5cab0a0 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -69,13 +69,13 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
             if (string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
             {
-                return ResolveVideos<MusicVideo>(parent, files, directoryService, true, collectionType);
+                return ResolveVideos<MusicVideo>(parent, files, directoryService, true, collectionType, false);
             }
 
             if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) ||
                             string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
             {
-                return ResolveVideos<Video>(parent, files, directoryService, false, collectionType);
+                return ResolveVideos<Video>(parent, files, directoryService, false, collectionType, false);
             }
 
             if (string.IsNullOrWhiteSpace(collectionType))
@@ -83,7 +83,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 // Owned items should just use the plain video type
                 if (parent == null)
                 {
-                    return ResolveVideos<Video>(parent, files, directoryService, false, collectionType);
+                    return ResolveVideos<Video>(parent, files, directoryService, false, collectionType, false);
                 }
 
                 if (parent is Series || parent.GetParents().OfType<Series>().Any())
@@ -91,18 +91,18 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     return null;
                 }
 
-                return ResolveVideos<Movie>(parent, files, directoryService, false, collectionType);
+                return ResolveVideos<Movie>(parent, files, directoryService, false, collectionType, true);
             }
 
             if (string.Equals(collectionType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase))
             {
-                return ResolveVideos<Movie>(parent, files, directoryService, true, collectionType);
+                return ResolveVideos<Movie>(parent, files, directoryService, true, collectionType, true);
             }
 
             return null;
         }
 
-        private MultiItemResolverResult ResolveVideos<T>(Folder parent, IEnumerable<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, bool suppportMultiEditions, string collectionType)
+        private MultiItemResolverResult ResolveVideos<T>(Folder parent, IEnumerable<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, bool suppportMultiEditions, string collectionType, bool parseName)
             where T : Video, new()
         {
             var files = new List<FileSystemMetadata>();
@@ -158,7 +158,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     Path = video.Files[0].Path,
                     IsInMixedFolder = isInMixedFolder,
                     ProductionYear = video.Year,
-                    Name = video.Name,
+                    Name = parseName ?
+                        video.Name :
+                        Path.GetFileName(video.Files[0].Path),
                     AdditionalParts = video.Files.Skip(1).Select(i => i.Path).ToArray(),
                     LocalAlternateVersions = video.AlternateVersions.Select(i => i.Path).ToArray()
                 };
@@ -214,12 +216,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
                 if (string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<MusicVideo>(args.Path, args.Parent, files, args.DirectoryService, collectionType, true);
+                    return FindMovie<MusicVideo>(args.Path, args.Parent, files, args.DirectoryService, collectionType, true, false);
                 }
 
                 if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<Video>(args.Path, args.Parent, files, args.DirectoryService, collectionType, false);
+                    return FindMovie<Video>(args.Path, args.Parent, files, args.DirectoryService, collectionType, false, false);
                 }
 
                 if (string.IsNullOrEmpty(collectionType))
@@ -237,13 +239,13 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     }
 
                     {
-                        return FindMovie<Movie>(args.Path, args.Parent, files, args.DirectoryService, collectionType, true);
+                        return FindMovie<Movie>(args.Path, args.Parent, files, args.DirectoryService, collectionType, true, true);
                     }
                 }
 
                 if (string.Equals(collectionType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<Movie>(args.Path, args.Parent, files, args.DirectoryService, collectionType, true);
+                    return FindMovie<Movie>(args.Path, args.Parent, files, args.DirectoryService, collectionType, true, true);
                 }
 
                 return null;
@@ -359,7 +361,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns>Movie.</returns>
-        private T FindMovie<T>(string path, Folder parent, List<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, string collectionType, bool allowFilesAsFolders)
+        private T FindMovie<T>(string path, Folder parent, List<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, string collectionType, bool allowFilesAsFolders, bool parseName)
             where T : Video, new()
         {
             var multiDiscFolders = new List<FileSystemMetadata>();
@@ -413,7 +415,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                                         !string.Equals(collectionType, CollectionType.Photos) &&
                                         !string.Equals(collectionType, CollectionType.MusicVideos);
 
-                var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType) ??
+                var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
                     new MultiItemResolverResult();
 
                 if (result.Items.Count == 1)
diff --git a/Emby.Server.Implementations/Notifications/CoreNotificationTypes.cs b/Emby.Server.Implementations/Notifications/CoreNotificationTypes.cs
index 849e02d81..b00b5d43b 100644
--- a/Emby.Server.Implementations/Notifications/CoreNotificationTypes.cs
+++ b/Emby.Server.Implementations/Notifications/CoreNotificationTypes.cs
@@ -160,7 +160,7 @@ namespace Emby.Server.Implementations.Notifications
                 Update(type);
             }
 
-            var systemName = _localization.GetLocalizedString("CategorySystem");
+            var systemName = _localization.GetLocalizedString("System");
 
             return knownTypes.OrderByDescending(i => string.Equals(i.Category, systemName, StringComparison.OrdinalIgnoreCase))
                 .ThenBy(i => i.Category)
@@ -175,23 +175,23 @@ namespace Emby.Server.Implementations.Notifications
 
             if (note.Type.IndexOf("Playback", StringComparison.OrdinalIgnoreCase) != -1)
             {
-                note.Category = _localization.GetLocalizedString("CategoryUser");
+                note.Category = _localization.GetLocalizedString("User");
             }
             else if (note.Type.IndexOf("Plugin", StringComparison.OrdinalIgnoreCase) != -1)
             {
-                note.Category = _localization.GetLocalizedString("CategoryPlugin");
+                note.Category = _localization.GetLocalizedString("Plugin");
             }
             else if (note.Type.IndexOf("CameraImageUploaded", StringComparison.OrdinalIgnoreCase) != -1)
             {
-                note.Category = _localization.GetLocalizedString("CategorySync");
+                note.Category = _localization.GetLocalizedString("Sync");
             }
             else if (note.Type.IndexOf("UserLockedOut", StringComparison.OrdinalIgnoreCase) != -1)
             {
-                note.Category = _localization.GetLocalizedString("CategoryUser");
+                note.Category = _localization.GetLocalizedString("User");
             }
             else
             {
-                note.Category = _localization.GetLocalizedString("CategorySystem");
+                note.Category = _localization.GetLocalizedString("System");
             }
         }
     }
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index 90cf2d1d1..a55741d7d 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -124,24 +124,24 @@ namespace MediaBrowser.Api
             {
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeInherit",
+                    Name = "Inherit",
                     Value = ""
                 });
             }
 
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeMovies",
+                Name = "Movies",
                 Value = "movies"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeMusic",
+                Name = "Music",
                 Value = "music"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeTvShows",
+                Name = "Shows",
                 Value = "tvshows"
             });
 
@@ -149,29 +149,29 @@ namespace MediaBrowser.Api
             {
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeBooks",
+                    Name = "Books",
                     Value = "books"
                 });
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeGames",
+                    Name = "Games",
                     Value = "games"
                 });
             }
 
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeHomeVideos",
+                Name = "HomeVideos",
                 Value = "homevideos"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeMusicVideos",
+                Name = "MusicVideos",
                 Value = "musicvideos"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypePhotos",
+                Name = "Photos",
                 Value = "photos"
             });
 
@@ -179,7 +179,7 @@ namespace MediaBrowser.Api
             {
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeMixed",
+                    Name = "MixedContent",
                     Value = ""
                 });
             }
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index f46c3e50f..1ae7323dc 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -947,9 +947,9 @@ namespace MediaBrowser.Api.LiveTv
 
         public object Get(GetChannel request)
         {
-            var user = string.IsNullOrWhiteSpace(request.UserId) ? null : _userManager.GetUserById(request.UserId);
+            var user = _userManager.GetUserById(request.UserId);
 
-            var item = _libraryManager.GetItemById(request.Id);
+            var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
 
             var dtoOptions = GetDtoOptions(_authContext, request);
 
@@ -1098,12 +1098,13 @@ namespace MediaBrowser.Api.LiveTv
 
         public async Task<object> Get(GetRecording request)
         {
-            var user = string.IsNullOrEmpty(request.UserId) ? null : _userManager.GetUserById(request.UserId);
+            var user = _userManager.GetUserById(request.UserId);
 
-            var options = new DtoOptions();
-            options.DeviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
+            var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
 
-            var result = await _liveTvManager.GetRecording(request.Id, options, CancellationToken.None, user).ConfigureAwait(false);
+            var dtoOptions = GetDtoOptions(_authContext, request);
+
+            var result = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
             return ToOptimizedSerializedResultUsingCache(result);
         }
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 56f2353f1..4934cc1ca 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -75,16 +75,6 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="listingProviders">The listing providers.</param>
         void AddParts(IEnumerable<ILiveTvService> services, IEnumerable<ITunerHost> tunerHosts, IEnumerable<IListingsProvider> listingProviders);
 
-        /// <summary>
-        /// Gets the recording.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>Task{RecordingInfoDto}.</returns>
-        Task<BaseItemDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null);
-
         /// <summary>
         /// Gets the timer.
         /// </summary>
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 506fce3ca..ad131064c 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -127,11 +127,6 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
         }
 
-        public bool EnableMpDecimate
-        {
-            get { return MediaSource.EnableMpDecimate; }
-        }
-
         public string AlbumCoverPath { get; set; }
 
         public string InputAudioSync { get; set; }
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 27920bdf3..d6301b331 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -40,7 +40,6 @@ namespace MediaBrowser.Model.Dto
         public string OpenToken { get; set; }
         public bool RequiresClosing { get; set; }
         public bool SupportsProbing { get; set; }
-        public bool EnableMpDecimate { get; set; }
         public string LiveStreamId { get; set; }
         public int? BufferMs { get; set; }
 
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index caf1bb2a8..f177233f9 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -45,7 +45,6 @@ namespace MediaBrowser.Model.LiveTv
         public bool ImportFavoritesOnly { get; set; }
         public bool AllowHWTranscoding { get; set; }
         public bool EnableStreamLooping { get; set; }
-        public bool EnableMpDecimate { get; set; }
         public bool EnableNewHdhrChannelIds { get; set; }
         public string Source { get; set; }
 
-- 
cgit v1.2.3


From 8b7936addfa2fa5cc5ae85a9f57bd6384169a357 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 13 Oct 2017 01:45:06 -0400
Subject: removed dead code

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e7c768c3b..bddafe9a6 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -794,11 +794,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return false;
             }
 
-            if (state.EnableMpDecimate)
-            {
-                return false;
-            }
-
             if (videoStream.IsInterlaced)
             {
                 if (state.DeInterlace(videoStream.Codec, false))
@@ -1515,11 +1510,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
             }
 
-            if (state.EnableMpDecimate)
-            {
-                filters.Add("mpdecimate,setpts=N/FRAME_RATE/TB");
-            }
-
             if (filters.Count > 0)
             {
                 output += string.Format(" -vf \"{0}\"", string.Join(",", filters.ToArray()));
-- 
cgit v1.2.3