mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-08 23:00:51 +02:00
updated bravia profiles
This commit is contained in:
parent
2f05af4be4
commit
6c97afef23
|
@ -47,6 +47,7 @@ namespace MediaBrowser.Dlna.Profiles
|
|||
"http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000";
|
||||
|
||||
EnableSingleAlbumArtLimit = true;
|
||||
EnableAlbumArtInDidl = true;
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
{
|
||||
|
|
|
@ -44,6 +44,7 @@ namespace MediaBrowser.Dlna.Profiles
|
|||
ManufacturerUrl = "http://www.microsoft.com/";
|
||||
SonyAggregationFlags = "10";
|
||||
EnableSingleAlbumArtLimit = true;
|
||||
EnableAlbumArtInDidl = true;
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
{
|
||||
|
|
|
@ -44,6 +44,7 @@ namespace MediaBrowser.Dlna.Profiles
|
|||
ManufacturerUrl = "http://www.microsoft.com/";
|
||||
SonyAggregationFlags = "10";
|
||||
EnableSingleAlbumArtLimit = true;
|
||||
EnableAlbumArtInDidl = true;
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
{
|
||||
|
|
|
@ -44,6 +44,7 @@ namespace MediaBrowser.Dlna.Profiles
|
|||
ManufacturerUrl = "http://www.microsoft.com/";
|
||||
SonyAggregationFlags = "10";
|
||||
EnableSingleAlbumArtLimit = true;
|
||||
EnableAlbumArtInDidl = true;
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
{
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<ModelDescription>Emby</ModelDescription>
|
||||
<ModelNumber>3.0</ModelNumber>
|
||||
<ModelUrl>http://www.microsoft.com/</ModelUrl>
|
||||
<EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
|
||||
<EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
|
||||
<EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
|
||||
<SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
|
||||
<AlbumArtPn>JPEG_TN</AlbumArtPn>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<ModelDescription>Emby</ModelDescription>
|
||||
<ModelNumber>3.0</ModelNumber>
|
||||
<ModelUrl>http://www.microsoft.com/</ModelUrl>
|
||||
<EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
|
||||
<EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
|
||||
<EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
|
||||
<SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
|
||||
<AlbumArtPn>JPEG_TN</AlbumArtPn>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<ModelDescription>Emby</ModelDescription>
|
||||
<ModelNumber>3.0</ModelNumber>
|
||||
<ModelUrl>http://www.microsoft.com/</ModelUrl>
|
||||
<EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
|
||||
<EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
|
||||
<EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
|
||||
<SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
|
||||
<AlbumArtPn>JPEG_TN</AlbumArtPn>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<ModelDescription>Emby</ModelDescription>
|
||||
<ModelNumber>3.0</ModelNumber>
|
||||
<ModelUrl>http://www.microsoft.com/</ModelUrl>
|
||||
<EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
|
||||
<EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
|
||||
<EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
|
||||
<SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
|
||||
<AlbumArtPn>JPEG_TN</AlbumArtPn>
|
||||
|
|
|
@ -199,8 +199,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
|
||||
await _ffProbeResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
|
||||
|
||||
var processWrapper = new ProcessWrapper(process, this);
|
||||
|
||||
using (var processWrapper = new ProcessWrapper(process, this))
|
||||
{
|
||||
try
|
||||
{
|
||||
StartProcess(processWrapper);
|
||||
|
@ -276,6 +276,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
{
|
||||
_ffProbeResourcePool.Release();
|
||||
}
|
||||
}
|
||||
|
||||
throw new ApplicationException(string.Format("FFProbe failed for {0}", inputPath));
|
||||
}
|
||||
|
@ -307,8 +308,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
|
||||
_logger.Debug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
|
||||
|
||||
var processWrapper = new ProcessWrapper(process, this);
|
||||
|
||||
using (var processWrapper = new ProcessWrapper(process, this))
|
||||
{
|
||||
StartProcess(processWrapper);
|
||||
|
||||
var lines = new List<int>();
|
||||
|
@ -333,6 +334,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
|
||||
return lines;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task StartReadingOutput(Stream source, List<int> lines, int timeoutMs, CancellationToken cancellationToken)
|
||||
{
|
||||
|
@ -490,7 +492,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
|
||||
await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
|
||||
|
||||
var processWrapper = new ProcessWrapper(process, this);
|
||||
using (var processWrapper = new ProcessWrapper(process, this))
|
||||
{
|
||||
bool ranToCompletion;
|
||||
|
||||
var memoryStream = new MemoryStream();
|
||||
|
@ -536,6 +539,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
memoryStream.Position = 0;
|
||||
return memoryStream;
|
||||
}
|
||||
}
|
||||
|
||||
public string GetTimeParameter(long ticks)
|
||||
{
|
||||
|
@ -603,8 +607,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
|
||||
bool ranToCompletion = false;
|
||||
|
||||
var processWrapper = new ProcessWrapper(process, this);
|
||||
|
||||
using (var processWrapper = new ProcessWrapper(process, this))
|
||||
{
|
||||
try
|
||||
{
|
||||
StartProcess(processWrapper);
|
||||
|
@ -654,6 +658,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
throw new ApplicationException(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<string> EncodeAudio(EncodingJobOptions options,
|
||||
IProgress<double> progress,
|
||||
|
@ -781,7 +786,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
}
|
||||
}
|
||||
|
||||
private class ProcessWrapper
|
||||
private class ProcessWrapper : IDisposable
|
||||
{
|
||||
public readonly Process Process;
|
||||
public bool HasExited;
|
||||
|
@ -810,6 +815,25 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
|
||||
process.Dispose();
|
||||
}
|
||||
|
||||
private bool _disposed;
|
||||
private readonly object _syncLock = new object();
|
||||
public void Dispose()
|
||||
{
|
||||
lock (_syncLock)
|
||||
{
|
||||
if (!_disposed)
|
||||
{
|
||||
if (Process != null)
|
||||
{
|
||||
Process.Exited -= Process_Exited;
|
||||
Process.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
_disposed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
using MediaBrowser.Model.MediaInfo;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MediaBrowser.Model.Dlna
|
||||
|
@ -164,7 +165,7 @@ namespace MediaBrowser.Model.Dlna
|
|||
|
||||
if (mediaProfile != null && !string.IsNullOrEmpty(mediaProfile.OrgPn))
|
||||
{
|
||||
orgPnValues.AddRange(mediaProfile.OrgPn.Split(','));
|
||||
orgPnValues.AddRange(mediaProfile.OrgPn.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -38,12 +38,9 @@ namespace MediaBrowser.Providers.Manager
|
|||
{
|
||||
var hasChanges = false;
|
||||
|
||||
var localImageProviders = providers.OfType<ILocalImageFileProvider>()
|
||||
.ToList();
|
||||
|
||||
if (localImageProviders.Count > 0 || !(item is Photo))
|
||||
if (!(item is Photo))
|
||||
{
|
||||
var images = localImageProviders
|
||||
var images = providers.OfType<ILocalImageFileProvider>()
|
||||
.SelectMany(i => i.GetImages(item, directoryService))
|
||||
.ToList();
|
||||
|
||||
|
@ -425,20 +422,15 @@ namespace MediaBrowser.Providers.Manager
|
|||
var changed = false;
|
||||
|
||||
var newImages = images.Where(i => i.Type == type).ToList();
|
||||
if (newImages.Count > 0)
|
||||
{
|
||||
var newImageFileInfos = images.Where(i => i.Type == type)
|
||||
|
||||
var newImageFileInfos = newImages
|
||||
.Select(i => i.FileInfo)
|
||||
.ToList();
|
||||
|
||||
if (newImageFileInfos.Count > 0)
|
||||
{
|
||||
if (item.AddImages(type, newImageFileInfos))
|
||||
{
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
|
|
@ -1447,5 +1447,6 @@
|
|||
"LabelServerHostHelp": "192.168.1.100 or https://myserver.com",
|
||||
"LabelServerPort": "Port:",
|
||||
"HeaderNewServer": "New Server",
|
||||
"ButtonChangeServer": "Change Server"
|
||||
"ButtonChangeServer": "Change Server",
|
||||
"HeaderConnectToServer": "Connect to Server"
|
||||
}
|
||||
|
|
|
@ -301,7 +301,7 @@ namespace MediaBrowser.WebDashboard.Api
|
|||
|
||||
var builder = new StringBuilder();
|
||||
|
||||
foreach (var file in new[]
|
||||
var apiClientFiles = new[]
|
||||
{
|
||||
"thirdparty/apiclient/logger.js",
|
||||
"thirdparty/apiclient/md5.js",
|
||||
|
@ -314,10 +314,20 @@ namespace MediaBrowser.WebDashboard.Api
|
|||
"thirdparty/apiclient/events.js",
|
||||
"thirdparty/apiclient/deferred.js",
|
||||
"thirdparty/apiclient/apiclient.js",
|
||||
"thirdparty/apiclient/connectservice.js",
|
||||
"thirdparty/apiclient/serverdiscovery.js",
|
||||
"thirdparty/apiclient/connectionmanager.js"
|
||||
})
|
||||
"thirdparty/apiclient/connectservice.js"
|
||||
}.ToList();
|
||||
|
||||
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
apiClientFiles.Add("thirdparty/apiclient/cordova/serverdiscovery.js");
|
||||
}
|
||||
else
|
||||
{
|
||||
apiClientFiles.Add("thirdparty/apiclient/serverdiscovery.js");
|
||||
}
|
||||
apiClientFiles.Add("thirdparty/apiclient/connectionmanager.js");
|
||||
|
||||
foreach (var file in apiClientFiles)
|
||||
{
|
||||
using (var fs = _fileSystem.GetFileStream(GetDashboardResourcePath(file), FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
|
||||
{
|
||||
|
|
|
@ -210,6 +210,9 @@
|
|||
<Content Include="dashboard-ui\thirdparty\apiclient\connectservice.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\thirdparty\apiclient\cordova\serverdiscovery.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\thirdparty\apiclient\deferred.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
Loading…
Reference in a new issue