alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-24 11:05:08 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update live tv database

Browse Source
This commit is contained in:
Luke Pulverenti
2015-06-01 10:49:23 -04:00
parent 68e64feafd
commit f2abd8ba39
20 changed files with 587 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/ApiEntryPoint.cs
View File

@@ -340,7 +340,7 @@ namespace MediaBrowser.Api
// We can really reduce the timeout for apps that are using the newer api
if (!string.IsNullOrWhiteSpace(job.PlaySessionId))
{
timerDuration = 60000;
timerDuration = 120000;
}
}

11
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@@ -879,7 +879,7 @@ namespace MediaBrowser.Api.Playback.Hls
if (!EnableSplitTranscoding(state))
{
args += " -copyts";
//args += " -copyts";
}
return args;
@@ -910,11 +910,11 @@ namespace MediaBrowser.Api.Playback.Hls
//toTimeParam = " -to " + MediaEncoder.GetTimeParameter(endTime);
toTimeParam = " -t " + MediaEncoder.GetTimeParameter(TimeSpan.FromSeconds(durationSeconds).Ticks);
}
}
if (state.IsOutputVideo && !string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase) && (state.Request.StartTimeTicks ?? 0) > 0)
{
timestampOffsetParam = " -output_ts_offset " + MediaEncoder.GetTimeParameter(state.Request.StartTimeTicks ?? 0).ToString(CultureInfo.InvariantCulture);
}
if (state.IsOutputVideo && !string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase) && (state.Request.StartTimeTicks ?? 0) > 0)
{
timestampOffsetParam = " -output_ts_offset " + MediaEncoder.GetTimeParameter(state.Request.StartTimeTicks ?? 0).ToString(CultureInfo.InvariantCulture);
}
var mapArgs = state.IsOutputVideo ? GetMapArgs(state) : string.Empty;
@@ -959,6 +959,7 @@ namespace MediaBrowser.Api.Playback.Hls
private bool EnableSplitTranscoding(StreamState state)
{
return false;
if (string.Equals(Request.QueryString["EnableSplitTranscoding"], "false", StringComparison.OrdinalIgnoreCase))
{
return false;

13
MediaBrowser.Api/Playback/TranscodingThrottler.cs
View File

@@ -42,7 +42,14 @@ namespace MediaBrowser.Api.Playback
var options = GetOptions();
if (options.EnableThrottling && IsThrottleAllowed(_job, options.ThrottleThresholdInSeconds))
var threshold = options.ThrottleThresholdInSeconds;
if (!options.EnableThrottling)
{
threshold *= 2;
}
if (IsThrottleAllowed(_job, threshold))
{
PauseTranscoding();
}
@@ -56,7 +63,7 @@ namespace MediaBrowser.Api.Playback
{
if (!_isPaused)
{
_logger.Debug("Sending pause command to ffmpeg");
//_logger.Debug("Sending pause command to ffmpeg");
try
{
@@ -74,7 +81,7 @@ namespace MediaBrowser.Api.Playback
{
if (_isPaused)
{
_logger.Debug("Sending unpause command to ffmpeg");
//_logger.Debug("Sending unpause command to ffmpeg");
try
{