aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs16
-rw-r--r--MediaBrowser.Providers/Manager/MetadataService.cs9
2 files changed, 16 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 340073e9e..428ec7dd7 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -393,17 +393,17 @@ namespace MediaBrowser.Api.Playback.Hls
if (EnableAdaptiveBitrateStreaming(state))
{
- var requestedVideoBitrate = state.VideoRequest.VideoBitRate.Value;
+ //var requestedVideoBitrate = state.VideoRequest.VideoBitRate.Value;
- // By default, vary by just 200k
- var variation = GetBitrateVariation(totalBitrate);
+ //// By default, vary by just 200k
+ //var variation = GetBitrateVariation(totalBitrate);
- var newBitrate = totalBitrate - variation;
- AppendPlaylist(builder, playlistUrl.Replace(requestedVideoBitrate.ToString(UsCulture), (requestedVideoBitrate - variation).ToString(UsCulture)), newBitrate, subtitleGroup);
+ //var newBitrate = totalBitrate - variation;
+ //AppendPlaylist(builder, playlistUrl.Replace(requestedVideoBitrate.ToString(UsCulture), (requestedVideoBitrate - variation).ToString(UsCulture)), newBitrate, subtitleGroup);
- variation *= 2;
- newBitrate = totalBitrate - variation;
- AppendPlaylist(builder, playlistUrl.Replace(requestedVideoBitrate.ToString(UsCulture), (requestedVideoBitrate - variation).ToString(UsCulture)), newBitrate, subtitleGroup);
+ //variation *= 2;
+ //newBitrate = totalBitrate - variation;
+ //AppendPlaylist(builder, playlistUrl.Replace(requestedVideoBitrate.ToString(UsCulture), (requestedVideoBitrate - variation).ToString(UsCulture)), newBitrate, subtitleGroup);
}
if (!string.IsNullOrWhiteSpace(subtitleGroup))
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index b84d060d7..56d2915e5 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -489,7 +489,14 @@ namespace MediaBrowser.Providers.Manager
var hasIdentity = info as IHasIdentities<IItemIdentity>;
if (hasIdentity != null)
{
- await hasIdentity.FindIdentities(ProviderManager, cancellationToken).ConfigureAwait(false);
+ try
+ {
+ //await hasIdentity.FindIdentities(ProviderManager, cancellationToken).ConfigureAwait(false);
+ }
+ catch (Exception ex)
+ {
+ Logger.ErrorException("Error in identity providers", ex);
+ }
}
return info;