diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-29 01:03:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 01:03:18 -0400 |
| commit | 21705ae425535bcaf277ff28f2a8c341dbcb2948 (patch) | |
| tree | 1e40408a0167aa2dca47ac07b16afa26e94d18d1 | |
| parent | 28108ef92ac44665177424f2f1ffc188fcbed721 (diff) | |
| parent | 2dbe162e45269df00fb44fbe5340b72758399307 (diff) | |
Merge pull request #2552 from MediaBrowser/dev
Dev
| -rw-r--r-- | Emby.Common.Implementations/Net/UdpSocket.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/Emby.Common.Implementations/Net/UdpSocket.cs b/Emby.Common.Implementations/Net/UdpSocket.cs index a97b2e668..f9181eb6a 100644 --- a/Emby.Common.Implementations/Net/UdpSocket.cs +++ b/Emby.Common.Implementations/Net/UdpSocket.cs @@ -49,7 +49,7 @@ namespace Emby.Common.Implementations.Net private void InitReceiveSocketAsyncEventArgs() { - var receiveBuffer = new byte[81920]; + var receiveBuffer = new byte[8192]; _receiveSocketAsyncEventArgs.SetBuffer(receiveBuffer, 0, receiveBuffer.Length); _receiveSocketAsyncEventArgs.Completed += _receiveSocketAsyncEventArgs_Completed; diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 368053b9d..0ea1b38b1 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -2575,7 +2575,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV list.Add(new VirtualFolderInfo { Locations = new List<string> { customPath }, - Name = "Recorded Series", + Name = "Recorded Shows", CollectionType = CollectionType.TvShows }); } diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 5eaab4110..b7b31509c 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -164,6 +164,10 @@ namespace MediaBrowser.Controller.MediaEncoding { return null; } + if (string.Equals(container, "mts", StringComparison.OrdinalIgnoreCase)) + { + return null; + } if (string.Equals(container, "vob", StringComparison.OrdinalIgnoreCase)) { return null; @@ -1709,6 +1713,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 "mpeg2video": if (_mediaEncoder.SupportsDecoder("mpeg2_qsv")) { |