Merge pull request #2647 from MediaBrowser/dev

Dev

Emby.Drawing.Skia/SkiaEncoder.cs

@@ -212,6 +212,11 @@ namespace Emby.Drawing.Skia
 
             var resultBitmap = SKBitmap.Decode(path);
 
+            if (resultBitmap == null)
+            {
+                return Decode(path, true);
+            }
+
             // If we have to resize these they often end up distorted
             if (resultBitmap.ColorType == SKColorType.Gray8)
             {

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -241,7 +241,6 @@ namespace Emby.Server.Implementations.Data
                     AddColumn(db, "TypedBaseItems", "InheritedTags", "Text", existingColumnNames);
                     AddColumn(db, "TypedBaseItems", "CleanName", "Text", existingColumnNames);
                     AddColumn(db, "TypedBaseItems", "PresentationUniqueKey", "Text", existingColumnNames);
-                    AddColumn(db, "TypedBaseItems", "SlugName", "Text", existingColumnNames);
                     AddColumn(db, "TypedBaseItems", "OriginalTitle", "Text", existingColumnNames);
                     AddColumn(db, "TypedBaseItems", "PrimaryVersionId", "Text", existingColumnNames);
                     AddColumn(db, "TypedBaseItems", "DateLastMediaAdded", "DATETIME", existingColumnNames);
@@ -573,7 +572,6 @@ namespace Emby.Server.Implementations.Data
                 "InheritedTags",
                 "CleanName",
                 "PresentationUniqueKey",
-                "SlugName",
                 "OriginalTitle",
                 "PrimaryVersionId",
                 "DateLastMediaAdded",
@@ -950,7 +948,6 @@ namespace Emby.Server.Implementations.Data
             }
 
             saveItemStatement.TryBind("@PresentationUniqueKey", item.PresentationUniqueKey);
-            saveItemStatement.TryBind("@SlugName", item.SlugName);
             saveItemStatement.TryBind("@OriginalTitle", item.OriginalTitle);
 
             var video = item as Video;
@@ -3665,10 +3662,10 @@ namespace Emby.Server.Implementations.Data
 
             if (!string.IsNullOrWhiteSpace(query.SlugName))
             {
-                whereClauses.Add("SlugName=@SlugName");
+                whereClauses.Add("CleanName=@SlugName");
                 if (statement != null)
                 {
-                    statement.TryBind("@SlugName", query.SlugName);
+                    statement.TryBind("@SlugName", GetCleanValue(query.SlugName));
                 }
             }
 

Emby.Server.Implementations/Dto/DtoService.cs

@@ -751,45 +751,41 @@ namespace Emby.Server.Implementations.Dto
         /// <returns>Task.</returns>
         private void AttachStudios(BaseItemDto dto, BaseItem item)
         {
-            var studios = item.Studios.ToList();
+            dto.Studios = item.Studios
-
+                .Where(i => !string.IsNullOrWhiteSpace(i))
-            dto.Studios = new StudioDto[studios.Count];
+                .Select(i => new NameIdPair
-
-            var dictionary = studios.Distinct(StringComparer.OrdinalIgnoreCase).Select(name =>
                 {
-                try
+                    Name = i,
-                {
+                    Id = _libraryManager.GetStudioId(i).ToString("N")
-                    return _libraryManager.GetStudio(name);
-                }
-                catch (IOException ex)
-                {
-                    _logger.ErrorException("Error getting studio {0}", ex, name);
-                    return null;
-                }
                 })
-            .Where(i => i != null)
+                .ToArray();
-            .DistinctBy(i => i.Name, StringComparer.OrdinalIgnoreCase)
-            .ToDictionary(i => i.Name, StringComparer.OrdinalIgnoreCase);
-
-            for (var i = 0; i < studios.Count; i++)
-            {
-                var studio = studios[i];
-
-                var studioDto = new StudioDto
-                {
-                    Name = studio
-                };
-
-                Studio entity;
-
-                if (dictionary.TryGetValue(studio, out entity))
-                {
-                    studioDto.Id = entity.Id.ToString("N");
-                    studioDto.PrimaryImageTag = GetImageCacheTag(entity, ImageType.Primary);
         }
 
-                dto.Studios[i] = studioDto;
+        private void AttachGenreItems(BaseItemDto dto, BaseItem item)
+        {
+            dto.GenreItems = item.Genres
+                .Where(i => !string.IsNullOrWhiteSpace(i))
+                .Select(i => new NameIdPair
+                {
+                    Name = i,
+                    Id = GetStudioId(i, item)
+                })
+                .ToArray();
         }
+
+        private string GetStudioId(string name, BaseItem owner)
+        {
+            if (owner is IHasMusicGenres)
+            {
+                return _libraryManager.GetGameGenreId(name).ToString("N");
+            }
+
+            if (owner is Game || owner is GameSystem)
+            {
+                return _libraryManager.GetGameGenreId(name).ToString("N");
+            }
+
+            return _libraryManager.GetGenreId(name).ToString("N");
         }
 
         /// <summary>
@@ -901,6 +897,7 @@ namespace Emby.Server.Implementations.Dto
             if (fields.Contains(ItemFields.Genres))
             {
                 dto.Genres = item.Genres;
+                AttachGenreItems(dto, item);
             }
 
             if (options.EnableImages)

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -895,6 +895,26 @@ namespace Emby.Server.Implementations.Library
             return CreateItemByName<Studio>(Studio.GetPath, name);
         }
 
+        public Guid GetStudioId(string name)
+        {
+            return GetItemByNameId<Studio>(Studio.GetPath, name);
+        }
+
+        public Guid GetGenreId(string name)
+        {
+            return GetItemByNameId<Genre>(Genre.GetPath, name);
+        }
+
+        public Guid GetMusicGenreId(string name)
+        {
+            return GetItemByNameId<MusicGenre>(MusicGenre.GetPath, name);
+        }
+
+        public Guid GetGameGenreId(string name)
+        {
+            return GetItemByNameId<GameGenre>(GameGenre.GetPath, name);
+        }
+
         /// <summary>
         /// Gets a Genre
         /// </summary>
@@ -974,14 +994,13 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            var path = getPathFn(name);
+            var id = GetItemByNameId<T>(getPathFn, name);
-            var forceCaseInsensitiveId = ConfigurationManager.Configuration.EnableNormalizedItemByNameIds;
-            var id = GetNewItemIdInternal(path, typeof(T), forceCaseInsensitiveId);
 
             var item = GetItemById(id) as T;
 
             if (item == null)
             {
+                var path = getPathFn(name);
                 item = new T
                 {
                     Name = name,
@@ -998,6 +1017,14 @@ namespace Emby.Server.Implementations.Library
             return item;
         }
 
+        private Guid GetItemByNameId<T>(Func<string, string> getPathFn, string name)
+              where T : BaseItem, new()
+        {
+            var path = getPathFn(name);
+            var forceCaseInsensitiveId = ConfigurationManager.Configuration.EnableNormalizedItemByNameIds;
+            return GetNewItemIdInternal(path, typeof(T), forceCaseInsensitiveId);
+        }
+
         public IEnumerable<MusicArtist> GetAlbumArtists(IEnumerable<IHasAlbumArtist> items)
         {
             var names = items

MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs

@@ -542,6 +542,12 @@ namespace MediaBrowser.Api.Playback.Hls
             var queryStringIndex = Request.RawUrl.IndexOf('?');
             var queryString = queryStringIndex == -1 ? string.Empty : Request.RawUrl.Substring(queryStringIndex);
 
+            // from universal audio service
+            if (queryString.IndexOf("SegmentContainer", StringComparison.OrdinalIgnoreCase) == -1 && !string.IsNullOrWhiteSpace(state.Request.SegmentContainer))
+            {
+                queryString += "&SegmentContainer=" + state.Request.SegmentContainer;
+            }
+
             // Main stream
             var playlistUrl = isLiveStream ? "live.m3u8" : "main.m3u8";
 
@@ -918,10 +924,7 @@ namespace MediaBrowser.Api.Playback.Hls
             var startNumberParam = isEncoding ? startNumber.ToString(UsCulture) : "0";
 
             var mapArgs = state.IsOutputVideo ? EncodingHelper.GetMapArgs(state) : string.Empty;
-            var useGenericSegmenter = true;
 
-            if (useGenericSegmenter)
-            {
             var outputTsArg = Path.Combine(FileSystem.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath)) + "%d" + GetSegmentFileExtension(state.Request);
 
             var timeDeltaParam = String.Empty;
@@ -959,19 +962,5 @@ namespace MediaBrowser.Api.Playback.Hls
                 breakOnNonKeyFramesArg
             ).Trim();
         }
-
-            return string.Format("{0} {1} -map_metadata -1 -map_chapters -1 -threads {2} {3} {4} {5} -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero -hls_time {6} -individual_header_trailer 0 -start_number {7} -hls_list_size {8} -y \"{9}\"",
-                            inputModifier,
-                            EncodingHelper.GetInputArgument(state, encodingOptions),
-                            threads,
-                            mapArgs,
-                            GetVideoArguments(state),
-                            GetAudioArguments(state),
-                            state.SegmentLength.ToString(UsCulture),
-                            startNumberParam,
-                            state.HlsListSize.ToString(UsCulture),
-                            outputPath
-                            ).Trim();
-        }
     }
 }

MediaBrowser.Api/Playback/UniversalAudioService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
 using MediaBrowser.Api.Playback.Hls;
@@ -35,8 +36,6 @@ namespace MediaBrowser.Api.Playback
         [ApiMember(Name = "DeviceId", Description = "The device id of the client requesting. Used to stop encoding processes when needed.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public string DeviceId { get; set; }
 
-        public string Token { get; set; }
-
         public string UserId { get; set; }
         public string AudioCodec { get; set; }
         public string Container { get; set; }
@@ -47,6 +46,10 @@ namespace MediaBrowser.Api.Playback
 
         [ApiMember(Name = "StartTimeTicks", Description = "Optional. Specify a starting offset, in ticks. 1 tick = 10000 ms", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
         public long? StartTimeTicks { get; set; }
+
+        public string TranscodingContainer { get; set; }
+        public string TranscodingProtocol { get; set; }
+        public int? MaxAudioSampleRate { get; set; }
     }
 
     [Route("/Audio/{Id}/universal.{Container}", "GET", Summary = "Gets an audio stream")]
@@ -125,12 +128,52 @@ namespace MediaBrowser.Api.Playback
                 {
                     Type = DlnaProfileType.Audio,
                     Context = EncodingContext.Streaming,
-                    Container = "ts",
+                    Container = request.TranscodingContainer,
-                    AudioCodec = "aac",
+                    AudioCodec = request.AudioCodec,
-                    Protocol = "hls"
+                    Protocol = request.TranscodingProtocol
                 }
             };
 
+            var codecProfiles = new List<CodecProfile>();
+            var conditions = new List<ProfileCondition>();
+
+            if (request.MaxAudioSampleRate.HasValue)
+            {
+                // codec profile
+                conditions.Add(new ProfileCondition
+                {
+                    Condition = ProfileConditionType.LessThanEqual,
+                    IsRequired = false,
+                    Property = ProfileConditionValue.AudioSampleRate,
+                    Value = request.MaxAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture)
+                });
+            }
+
+            if (request.MaxAudioChannels.HasValue)
+            {
+                // codec profile
+                conditions.Add(new ProfileCondition
+                {
+                    Condition = ProfileConditionType.LessThanEqual,
+                    IsRequired = false,
+                    Property = ProfileConditionValue.AudioChannels,
+                    Value = request.MaxAudioChannels.Value.ToString(CultureInfo.InvariantCulture)
+                });
+            }
+
+            if (conditions.Count > 0)
+            {
+                // codec profile
+                codecProfiles.Add(new CodecProfile
+                {
+                    Type = CodecType.Audio,
+                    Container = request.Container,
+                    Conditions = conditions.ToArray()
+                });
+            }
+
+            deviceProfile.CodecProfiles = codecProfiles.ToArray();
+
             return deviceProfile;
         }
 
@@ -194,7 +237,9 @@ namespace MediaBrowser.Api.Playback
                     MediaSourceId = mediaSource.Id,
                     PlaySessionId = playbackInfoResult.PlaySessionId,
                     StartTimeTicks = request.StartTimeTicks,
-                    Static = isStatic
+                    Static = isStatic,
+                    SegmentContainer = request.TranscodingContainer,
+                    AudioSampleRate = request.MaxAudioSampleRate
                 };
 
                 if (isHeadRequest)
@@ -226,7 +271,7 @@ namespace MediaBrowser.Api.Playback
                 var newRequest = new GetAudioStream
                 {
                     AudioBitRate = isStatic ? (int?)null : Convert.ToInt32(Math.Min(request.MaxStreamingBitrate ?? 192000, int.MaxValue)),
-                    //AudioCodec = request.AudioCodec,
+                    AudioCodec = request.AudioCodec,
                     Container = isStatic ? null : ("." + mediaSource.TranscodingContainer),
                     DeviceId = request.DeviceId,
                     Id = request.Id,
@@ -234,7 +279,8 @@ namespace MediaBrowser.Api.Playback
                     MediaSourceId = mediaSource.Id,
                     PlaySessionId = playbackInfoResult.PlaySessionId,
                     StartTimeTicks = request.StartTimeTicks,
-                    Static = isStatic
+                    Static = isStatic,
+                    AudioSampleRate = request.MaxAudioSampleRate
                 };
 
                 if (isHeadRequest)

MediaBrowser.Controller/Library/ILibraryManager.cs

@@ -557,6 +557,14 @@ namespace MediaBrowser.Controller.Library
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
         bool IgnoreFile(FileSystemMetadata file, BaseItem parent);
 
+        Guid GetStudioId(string name);
+
+        Guid GetGenreId(string name);
+
+        Guid GetMusicGenreId(string name);
+
+        Guid GetGameGenreId(string name);
+
         void AddVirtualFolder(string name, string collectionType, LibraryOptions options, bool refreshLibrary);
         void RemoveVirtualFolder(string name, bool refreshLibrary);
         void AddMediaPath(string virtualFolderName, MediaPathInfo path);

MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -346,7 +346,9 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the studios.
         /// </summary>
         /// <value>The studios.</value>
-        public StudioDto[] Studios { get; set; }
+        public NameIdPair[] Studios { get; set; }
+
+        public NameIdPair[] GenreItems { get; set; }
 
         /// <summary>
         /// If the item does not have a logo, this will hold the Id of the Parent that has one.

MediaBrowser.Model/Dto/StudioDto.cs

@@ -1,6 +1,4 @@
-using System.ComponentModel;
+using System.Diagnostics;
-using System.Diagnostics;
-using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -27,23 +25,5 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The primary image tag.</value>
         public string PrimaryImageTag { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance has primary image.
-        /// </summary>
-        /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
-        [IgnoreDataMember]
-        public bool HasPrimaryImage
-        {
-            get
-            {
-                return PrimaryImageTag != null;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [property changed].
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
     }
 }

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.17.5")]
+[assembly: AssemblyVersion("3.2.17.6")]