From c811d57bca4e837707acd8483029fb643d56ad1b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 3 Mar 2017 15:16:43 -0500
Subject: [PATCH] remove hardcoded address families

---
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs              | 2 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs         | 4 ++--
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs       | 4 ++++
 MediaBrowser.Model/Session/PlaybackProgressInfo.cs            | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 7397380e17..af3f1359fc 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             using (var manager = new HdHomerunManager(_socketFactory))
             {
                 // Legacy HdHomeruns are IPv4 only
-                var ipInfo = new IpAddressInfo(uri.Host, IpAddressFamily.InterNetwork);
+                var ipInfo = _networkManager.ParseIpAddress(uri.Host);
 
                 for (int i = 0; i < model.TunerCount; ++i)
                 {
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
index 95ceb06603..8c749b1b53 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
@@ -96,9 +96,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 {
                     using (var hdHomerunManager = new HdHomerunManager(_socketFactory))
                     {
-                        var remoteAddress = new IpAddressInfo(remoteIp, IpAddressFamily.InterNetwork);
+                        var remoteAddress = _networkManager.ParseIpAddress(remoteIp);
                         IpAddressInfo localAddress = null;
-                        using (var tcpSocket = _socketFactory.CreateSocket(IpAddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp, false))
+                        using (var tcpSocket = _socketFactory.CreateSocket(remoteAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp, false))
                         {
                             try
                             {
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 18508a3997..ef356c7cda 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -175,6 +175,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 return null;
             }
+            if (string.Equals(container, "rec", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
 
             return container;
         }
diff --git a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index 345931a623..fff4ee8e0d 100644
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -73,6 +73,10 @@ namespace MediaBrowser.Model.Session
         /// <value>The volume level.</value>
         public int? VolumeLevel { get; set; }
 
+        public int? Brightness { get; set; }
+
+        public string AspectRatio { get; set; }
+
         /// <summary>
         /// Gets or sets the play method.
         /// </summary>