Merge pull request #1666 from MediaBrowser/dev

Dev

4 files changed, 45 insertions, 28 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index d40f2a141..ab2b59d48 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -511,8 +511,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             if (!(service is EmbyTV.EmbyTV))
             {
                 // We can't trust that we'll be able to direct stream it through emby server,  no matter what the provider says
-                mediaSource.SupportsDirectStream = true;
+                mediaSource.SupportsDirectStream = false;
                 mediaSource.SupportsTranscoding = true;
+                foreach (var stream in mediaSource.MediaStreams)
+                {
+                    if (stream.Type == MediaStreamType.Video && string.IsNullOrWhiteSpace(stream.NalLengthSize))
+                    {
+                        stream.NalLengthSize = "0";
+                    }
+                }
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 4c140602d..469767c65 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -317,6 +317,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 videoCodec = "mpeg2video";
             }
 
+            string nal = null;
+            if (string.Equals(videoCodec, "h264", StringComparison.OrdinalIgnoreCase))
+            {
+                nal = "0";
+            }
+
             var url = GetApiUrl(info, true) + "/auto/v" + channelId;
 
             if (!string.IsNullOrWhiteSpace(profile) && !string.Equals(profile, "native", StringComparison.OrdinalIgnoreCase))
@@ -339,7 +345,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                                 Codec = videoCodec,
                                 Width = width,
                                 Height = height,
-                                BitRate = videoBitrate
+                                BitRate = videoBitrate,
+                                NalLengthSize = nal
 
                             },
                             new MediaStream
diff --git a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs b/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
index 211c77107..debcd054f 100644
--- a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
@@ -21,14 +21,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
             AddPixelFormatColumnCommand();
             AddBitDepthCommand();
             AddIsAnamorphicColumn();
-            AddIsCabacColumn();
             AddKeyFramesColumn();
             AddRefFramesCommand();
             AddCodecTagColumn();
             AddCommentColumn();
+            AddNalColumn();
         }
 
-        private void AddCommentColumn()
+        private void AddNalColumn()
         {
             using (var cmd = _connection.CreateCommand())
             {
@@ -42,7 +42,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         {
                             var name = reader.GetString(1);
 
-                            if (string.Equals(name, "Comment", StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(name, "NalLengthSize", StringComparison.OrdinalIgnoreCase))
                             {
                                 return;
                             }
@@ -54,12 +54,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table mediastreams");
-            builder.AppendLine("add column Comment TEXT");
+            builder.AppendLine("add column NalLengthSize TEXT");
 
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
-        private void AddCodecTagColumn()
+        private void AddCommentColumn()
         {
             using (var cmd = _connection.CreateCommand())
             {
@@ -73,7 +73,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         {
                             var name = reader.GetString(1);
 
-                            if (string.Equals(name, "CodecTag", StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(name, "Comment", StringComparison.OrdinalIgnoreCase))
                             {
                                 return;
                             }
@@ -85,12 +85,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table mediastreams");
-            builder.AppendLine("add column CodecTag TEXT");
+            builder.AppendLine("add column Comment TEXT");
 
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
-        private void AddPixelFormatColumnCommand()
+        private void AddCodecTagColumn()
         {
             using (var cmd = _connection.CreateCommand())
             {
@@ -104,7 +104,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         {
                             var name = reader.GetString(1);
 
-                            if (string.Equals(name, "PixelFormat", StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(name, "CodecTag", StringComparison.OrdinalIgnoreCase))
                             {
                                 return;
                             }
@@ -116,12 +116,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table mediastreams");
-            builder.AppendLine("add column PixelFormat TEXT");
+            builder.AppendLine("add column CodecTag TEXT");
 
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
-        private void AddBitDepthCommand()
+        private void AddPixelFormatColumnCommand()
         {
             using (var cmd = _connection.CreateCommand())
             {
@@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         {
                             var name = reader.GetString(1);
 
-                            if (string.Equals(name, "BitDepth", StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(name, "PixelFormat", StringComparison.OrdinalIgnoreCase))
                             {
                                 return;
                             }
@@ -147,12 +147,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table mediastreams");
-            builder.AppendLine("add column BitDepth INT NULL");
+            builder.AppendLine("add column PixelFormat TEXT");
 
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
-        private void AddRefFramesCommand()
+        private void AddBitDepthCommand()
         {
             using (var cmd = _connection.CreateCommand())
             {
@@ -166,7 +166,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         {
                             var name = reader.GetString(1);
 
-                            if (string.Equals(name, "RefFrames", StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(name, "BitDepth", StringComparison.OrdinalIgnoreCase))
                             {
                                 return;
                             }
@@ -178,12 +178,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table mediastreams");
-            builder.AppendLine("add column RefFrames INT NULL");
+            builder.AppendLine("add column BitDepth INT NULL");
 
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
-        private void AddIsCabacColumn()
+        private void AddRefFramesCommand()
         {
             using (var cmd = _connection.CreateCommand())
             {
@@ -197,7 +197,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         {
                             var name = reader.GetString(1);
 
-                            if (string.Equals(name, "IsCabac", StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(name, "RefFrames", StringComparison.OrdinalIgnoreCase))
                             {
                                 return;
                             }
@@ -209,7 +209,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table mediastreams");
-            builder.AppendLine("add column IsCabac BIT NULL");
+            builder.AppendLine("add column RefFrames INT NULL");
 
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 746321e70..fb655c9cb 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
 
             var createMediaStreamsTableCommand
-               = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, IsCabac BIT NULL, CodecTag TEXT NULL, Comment TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
+               = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
 
             string[] queries = {
 
@@ -389,9 +389,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
             "BitDepth",
             "IsAnamorphic",
             "RefFrames",
-            "IsCabac",
             "CodecTag",
-            "Comment"
+            "Comment",
+            "NalLengthSize"
         };
 
         /// <summary>
@@ -2889,10 +2889,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     _saveStreamCommand.GetParameter(index++).Value = stream.BitDepth;
                     _saveStreamCommand.GetParameter(index++).Value = stream.IsAnamorphic;
                     _saveStreamCommand.GetParameter(index++).Value = stream.RefFrames;
-                    _saveStreamCommand.GetParameter(index++).Value = null;
 
                     _saveStreamCommand.GetParameter(index++).Value = stream.CodecTag;
                     _saveStreamCommand.GetParameter(index++).Value = stream.Comment;
+                    _saveStreamCommand.GetParameter(index++).Value = stream.NalLengthSize;
 
                     _saveStreamCommand.Transaction = transaction;
                     _saveStreamCommand.ExecuteNonQuery();
@@ -3041,16 +3041,19 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 item.RefFrames = reader.GetInt32(24);
             }
 
-            // cabac no longer used
+            if (!reader.IsDBNull(25))
+            {
+                item.CodecTag = reader.GetString(25);
+            }
 
             if (!reader.IsDBNull(26))
             {
-                item.CodecTag = reader.GetString(26);
+                item.Comment = reader.GetString(26);
             }
 
             if (!reader.IsDBNull(27))
             {
-                item.Comment = reader.GetString(27);
+                item.NalLengthSize = reader.GetString(27);
             }
 
             return item;