From 372d40598d37a29ffa9de8627114fa12c477fc83 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 1 Apr 2017 15:49:36 -0400
Subject: remove qsv hevc decoding for now

---
 MediaBrowser.Controller/Entities/Folder.cs              | 11 -----------
 MediaBrowser.Controller/Entities/IHasMetascore.cs       | 15 ---------------
 MediaBrowser.Controller/Entities/Movies/Movie.cs        |  2 +-
 MediaBrowser.Controller/MediaBrowser.Controller.csproj  |  1 -
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 14 +++++++-------
 5 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Entities/IHasMetascore.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index a323a2439..be41d896d 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -761,11 +761,6 @@ namespace MediaBrowser.Controller.Entities
                     Logger.Debug("Query requires post-filtering due to ItemSortBy.GameSystem");
                     return true;
                 }
-                if (query.SortBy.Contains(ItemSortBy.Metascore, StringComparer.OrdinalIgnoreCase))
-                {
-                    Logger.Debug("Query requires post-filtering due to ItemSortBy.Metascore");
-                    return true;
-                }
                 if (query.SortBy.Contains(ItemSortBy.Players, StringComparer.OrdinalIgnoreCase))
                 {
                     Logger.Debug("Query requires post-filtering due to ItemSortBy.Players");
@@ -778,12 +773,6 @@ namespace MediaBrowser.Controller.Entities
                 }
             }
 
-            if (query.ItemIds.Length > 0)
-            {
-                Logger.Debug("Query requires post-filtering due to ItemIds");
-                return true;
-            }
-
             if (query.IsInBoxSet.HasValue)
             {
                 Logger.Debug("Query requires post-filtering due to IsInBoxSet");
diff --git a/MediaBrowser.Controller/Entities/IHasMetascore.cs b/MediaBrowser.Controller/Entities/IHasMetascore.cs
deleted file mode 100644
index a3445bbba..000000000
--- a/MediaBrowser.Controller/Entities/IHasMetascore.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-namespace MediaBrowser.Controller.Entities
-{
-    /// <summary>
-    /// Interface IHasMetascore
-    /// </summary>
-    public interface IHasMetascore
-    {
-        /// <summary>
-        /// Gets or sets the metascore.
-        /// </summary>
-        /// <value>The metascore.</value>
-        float? Metascore { get; set; }
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index dfa9ac416..ce671a2dc 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities.Movies
     /// <summary>
     /// Class Movie
     /// </summary>
-    public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasAwards, IHasMetascore, IHasLookupInfo<MovieInfo>, ISupportsBoxSetGrouping
+    public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasAwards, IHasLookupInfo<MovieInfo>, ISupportsBoxSetGrouping
     {
         public List<Guid> SpecialFeatureIds { get; set; }
 
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 88153868f..1f10fab73 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -114,7 +114,6 @@
     <Compile Include="Entities\IHasImages.cs" />
     <Compile Include="Entities\KeywordExtensions.cs" />
     <Compile Include="Entities\IHasMediaSources.cs" />
-    <Compile Include="Entities\IHasMetascore.cs" />
     <Compile Include="Entities\IHasProgramAttributes.cs" />
     <Compile Include="Entities\IHasScreenshots.cs" />
     <Compile Include="Entities\IHasSeries.cs" />
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 996009524..36f0f67bd 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1741,13 +1741,13 @@ namespace MediaBrowser.Controller.MediaEncoding
                                 return "-c:v h264_qsv ";
                             }
                             break;
-                        case "hevc":
-                        case "h265":
-                            if (_mediaEncoder.SupportsDecoder("hevc_qsv"))
-                            {
-                                return "-c:v hevc_qsv ";
-                            }
-                            break;
+                        //case "hevc":
+                        //case "h265":
+                        //    if (_mediaEncoder.SupportsDecoder("hevc_qsv"))
+                        //    {
+                        //        return "-c:v hevc_qsv ";
+                        //    }
+                        //    break;
                         case "mpeg2video":
                             if (_mediaEncoder.SupportsDecoder("mpeg2_qsv"))
                             {
-- 
cgit v1.2.3