mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge pull request #738 from 7illusions/master
Updated PlayTo profiles and recognition
This commit is contained in:
commit
cef29c917b
5 changed files with 221 additions and 11 deletions
|
@ -33,6 +33,14 @@ namespace MediaBrowser.Controller.Dlna
|
|||
/// <value>The name of the model.</value>
|
||||
public string ModelName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the manufacturer.
|
||||
/// </summary>
|
||||
/// <value>
|
||||
/// The manufacturer.
|
||||
/// </value>
|
||||
public string Manufacturer { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the transcoding profiles.
|
||||
/// </summary>
|
||||
|
|
|
@ -22,7 +22,8 @@ namespace MediaBrowser.Controller.Dlna
|
|||
/// <param name="friendlyName">Name of the friendly.</param>
|
||||
/// <param name="modelName">Name of the model.</param>
|
||||
/// <param name="modelNumber">The model number.</param>
|
||||
/// <returns>DlnaProfile.</returns>
|
||||
DeviceProfile GetProfile(string friendlyName, string modelName, string modelNumber);
|
||||
/// <param name="manufacturer">The manufacturer.</param>
|
||||
/// <returns>DlnaProfile.</</returns>
|
||||
DeviceProfile GetProfile(string friendlyName, string modelName, string modelNumber, string manufacturer);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,6 +25,8 @@ namespace MediaBrowser.Dlna
|
|||
{
|
||||
var list = new List<DeviceProfile>();
|
||||
|
||||
#region Samsung
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
Name = "Samsung TV (B Series)",
|
||||
|
@ -38,7 +40,7 @@ namespace MediaBrowser.Dlna
|
|||
new TranscodingProfile
|
||||
{
|
||||
Container = "mp3",
|
||||
Type = DlnaProfileType.Audio
|
||||
Type = DlnaProfileType.Audio,
|
||||
},
|
||||
new TranscodingProfile
|
||||
{
|
||||
|
@ -52,7 +54,7 @@ namespace MediaBrowser.Dlna
|
|||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mp3"},
|
||||
Type = DlnaProfileType.Audio
|
||||
Type = DlnaProfileType.Audio,
|
||||
},
|
||||
new DirectPlayProfile
|
||||
{
|
||||
|
@ -72,13 +74,15 @@ namespace MediaBrowser.Dlna
|
|||
Type = DlnaProfileType.Video
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
Name = "Samsung TV (E/F-series)",
|
||||
ClientType = "DLNA",
|
||||
FriendlyName = @"(^\[TV\][A-Z]{2}\d{2}(E|F)[A-Z]?\d{3,4}.*)|^\[TV\] Samsung",
|
||||
FriendlyName = @"(^\[TV\][A-Z]{2}\d{2}(E|F)[A-Z]?\d{3,4}.*)|^\[TV\] Samsung|(^\[TV\]Samsung [A-Z]{2}\d{2}(E|F)[A-Z]?\d{3,4}.*)",
|
||||
ModelNumber = @"(1\.0)|(AllShare1\.0)",
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
|
@ -169,6 +173,10 @@ namespace MediaBrowser.Dlna
|
|||
}
|
||||
});
|
||||
|
||||
#endregion
|
||||
|
||||
#region Xbox
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
Name = "Xbox 360",
|
||||
|
@ -198,7 +206,7 @@ namespace MediaBrowser.Dlna
|
|||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"avi"},
|
||||
MimeType = "x-msvideo",
|
||||
MimeType = "avi",
|
||||
Type = DlnaProfileType.Video
|
||||
}
|
||||
}
|
||||
|
@ -240,6 +248,10 @@ namespace MediaBrowser.Dlna
|
|||
}
|
||||
});
|
||||
|
||||
#endregion
|
||||
|
||||
#region Sony
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
Name = "Sony Bravia (2012)",
|
||||
|
@ -276,6 +288,173 @@ namespace MediaBrowser.Dlna
|
|||
}
|
||||
});
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
Name = "Sony Bravia (2013)",
|
||||
ClientType = "DLNA",
|
||||
FriendlyName = @"BRAVIA (KDL-\d{2}W[689]\d{2}A.*)|(KD-\d{2}X9\d{3}A.*)",
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
{
|
||||
new TranscodingProfile
|
||||
{
|
||||
Container = "mp3",
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
new TranscodingProfile
|
||||
{
|
||||
Container = "ts",
|
||||
Type = DlnaProfileType.Video,
|
||||
MimeType = "mpeg"
|
||||
}
|
||||
},
|
||||
|
||||
DirectPlayProfiles = new[]
|
||||
{
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mp3"},
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"wma"},
|
||||
Type = DlnaProfileType.Audio,
|
||||
MimeType = "x-ms-wma"
|
||||
},
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"avi"},
|
||||
Type = DlnaProfileType.Video,
|
||||
MimeType = "avi"
|
||||
},
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mp4"},
|
||||
Type = DlnaProfileType.Video,
|
||||
MimeType = "mp4"
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
#endregion
|
||||
|
||||
#region Panasonic
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
//Panasonic Viera (2011|2012) Without AVI Support
|
||||
Name = "Panasonic Viera E/S/ST/VT (2011)",
|
||||
ClientType = "DLNA",
|
||||
FriendlyName = @"(VIERA (E|S)T?(3|5)0?.*)|(VIERA VT30.*)",
|
||||
Manufacturer = "Panasonic",
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
{
|
||||
new TranscodingProfile
|
||||
{
|
||||
Container = "mp3",
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
new TranscodingProfile
|
||||
{
|
||||
Container = "ts",
|
||||
Type = DlnaProfileType.Video
|
||||
}
|
||||
},
|
||||
|
||||
DirectPlayProfiles = new[]
|
||||
{
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mp3"},
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mkv"},
|
||||
Type = DlnaProfileType.Video
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
//Panasonic Viera (2011|2012) With AVI Support
|
||||
Name = "Panasonic Viera G/GT/DT/UT/VT (2011/2012)",
|
||||
ClientType = "DLNA",
|
||||
FriendlyName = @"(VIERA (G|D|U)T?(3|5)0?.*)|(VIERA VT50.*)",
|
||||
Manufacturer = "Panasonic",
|
||||
|
||||
TranscodingProfiles = new[]
|
||||
{
|
||||
new TranscodingProfile
|
||||
{
|
||||
Container = "mp3",
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
new TranscodingProfile
|
||||
{
|
||||
Container = "ts",
|
||||
Type = DlnaProfileType.Video
|
||||
}
|
||||
},
|
||||
|
||||
DirectPlayProfiles = new[]
|
||||
{
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mp3"},
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mkv"},
|
||||
Type = DlnaProfileType.Video
|
||||
},
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"avi"},
|
||||
Type = DlnaProfileType.Video ,
|
||||
MimeType="divx"
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
#endregion
|
||||
|
||||
//WDTV does not need any transcoding of the formats we support statically
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
Name = "Philips (2010-)",
|
||||
FriendlyName = ".*PHILIPS.*",
|
||||
ClientType = "DLNA",
|
||||
ModelName = "WD TV HD Live",
|
||||
|
||||
DirectPlayProfiles = new[]
|
||||
{
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mp3", "wma"},
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"avi"},
|
||||
Type = DlnaProfileType.Video,
|
||||
MimeType = "avi"
|
||||
},
|
||||
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mkv"},
|
||||
Type = DlnaProfileType.Video,
|
||||
MimeType = "x-matroska"
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
//WDTV does not need any transcoding of the formats we support statically
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
|
@ -322,6 +501,23 @@ namespace MediaBrowser.Dlna
|
|||
}
|
||||
});
|
||||
|
||||
list.Add(new DeviceProfile
|
||||
{
|
||||
Name = "Denon AVR",
|
||||
FriendlyName = @"Denon:\[AVR:.*",
|
||||
Manufacturer = "Denon",
|
||||
ClientType = "DLNA",
|
||||
|
||||
DirectPlayProfiles = new[]
|
||||
{
|
||||
new DirectPlayProfile
|
||||
{
|
||||
Containers = new[]{"mp3", "flac", "m4a", "wma"},
|
||||
Type = DlnaProfileType.Audio
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
foreach (var item in list)
|
||||
{
|
||||
//_xmlSerializer.SerializeToFile(item, "d:\\" + _fileSystem.GetValidFilename(item.Name));
|
||||
|
@ -365,7 +561,7 @@ namespace MediaBrowser.Dlna
|
|||
};
|
||||
}
|
||||
|
||||
public DeviceProfile GetProfile(string friendlyName, string modelName, string modelNumber)
|
||||
public DeviceProfile GetProfile(string friendlyName, string modelName, string modelNumber, string manufacturer)
|
||||
{
|
||||
foreach (var profile in GetProfiles())
|
||||
{
|
||||
|
@ -387,6 +583,12 @@ namespace MediaBrowser.Dlna
|
|||
continue;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(profile.Manufacturer))
|
||||
{
|
||||
if (!Regex.IsMatch(manufacturer, profile.Manufacturer))
|
||||
continue;
|
||||
}
|
||||
|
||||
return profile;
|
||||
|
||||
}
|
||||
|
|
|
@ -386,7 +386,7 @@ namespace MediaBrowser.Dlna.PlayTo
|
|||
|
||||
var deviceInfo = _device.Properties;
|
||||
|
||||
var playlistItem = PlaylistItem.Create(item, _dlnaManager.GetProfile(deviceInfo.Name, deviceInfo.ModelName, deviceInfo.ModelNumber));
|
||||
var playlistItem = PlaylistItem.Create(item, _dlnaManager.GetProfile(deviceInfo.Name, deviceInfo.ModelName, deviceInfo.ModelNumber, deviceInfo.Manufacturer));
|
||||
playlistItem.StartPositionTicks = startPostionTicks;
|
||||
|
||||
if (playlistItem.IsAudio)
|
||||
|
@ -485,7 +485,7 @@ namespace MediaBrowser.Dlna.PlayTo
|
|||
_updateTimer.Stop();
|
||||
_disposed = true;
|
||||
_device.Dispose();
|
||||
_logger.Log(LogSeverity.Debug, "PlayTo - Controller disposed");
|
||||
_logger.Log(LogSeverity.Debug, "Controller disposed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -243,8 +243,7 @@ namespace MediaBrowser.Dlna.PlayTo
|
|||
/// <returns>The TranscodeSettings for the device</returns>
|
||||
private void GetProfileSettings(DeviceInfo deviceProperties)
|
||||
{
|
||||
var profile = _dlnaManager.GetProfile(deviceProperties.DisplayName, deviceProperties.ModelName,
|
||||
deviceProperties.ModelNumber);
|
||||
var profile = _dlnaManager.GetProfile(deviceProperties.Name, deviceProperties.ModelName, deviceProperties.ModelNumber, deviceProperties.Manufacturer);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(profile.Name))
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue