michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

remove copyts from hls

Browse Source
This commit is contained in:
Luke Pulverenti 2015-04-03 11:50:50 -04:00
parent 439e7efecb
commit 4655a60d29
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -698,7 +698,7 @@ namespace MediaBrowser.Api.Playback.Hls
{ {
var outputTsArg = Path.Combine(Path.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath)) + "%d.ts"; var outputTsArg = Path.Combine(Path.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath)) + "%d.ts";
return string.Format("{0} {1} -map_metadata -1 -threads {2} {3} {4} -copyts -flags -global_header -sc_threshold 0 {5} -f segment -segment_time {6} -segment_start_number {7} -segment_list \"{8}\" -y \"{9}\"", return string.Format("{0} {1} -map_metadata -1 -threads {2} {3} {4} -flags -global_header -sc_threshold 0 {5} -f segment -segment_time {6} -segment_start_number {7} -segment_list \"{8}\" -y \"{9}\"",
inputModifier, inputModifier,
GetInputArgument(state), GetInputArgument(state),
threads, threads,
@ -712,7 +712,7 @@ namespace MediaBrowser.Api.Playback.Hls
).Trim(); ).Trim();
} }
return string.Format("{0} {1} -map_metadata -1 -threads {2} {3} {4} -copyts -flags -global_header -sc_threshold 0 {5} -hls_time {6} -start_number {7} -hls_list_size {8} -y \"{9}\"", return string.Format("{0} {1} -map_metadata -1 -threads {2} {3} {4} -flags -global_header -sc_threshold 0 {5} -hls_time {6} -start_number {7} -hls_list_size {8} -y \"{9}\"",
inputModifier, inputModifier,
GetInputArgument(state), GetInputArgument(state),
threads, threads,

1
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -61,6 +61,7 @@ namespace MediaBrowser.Model.Configuration
/// </summary> /// </summary>
public UserConfiguration() public UserConfiguration()
{ {
HidePlayedInLatest = true;
PlayDefaultAudioTrack = true; PlayDefaultAudioTrack = true;
LatestItemsExcludes = new string[] { }; LatestItemsExcludes = new string[] { };

41
MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
View File

@ -169,29 +169,32 @@ namespace MediaBrowser.Server.Implementations.Channels
foreach (var item in result.Items) foreach (var item in result.Items)
{ {
var channelItem = (IChannelMediaItem)item; var channelItem = item as IChannelMediaItem;
var channelFeatures = _manager.GetChannelFeatures(channelItem.ChannelId); if (channelItem != null)
if (channelFeatures.SupportsContentDownloading)
{ {
if (options.DownloadingChannels.Contains(channelItem.ChannelId)) var channelFeatures = _manager.GetChannelFeatures(channelItem.ChannelId);
if (channelFeatures.SupportsContentDownloading)
{ {
try if (options.DownloadingChannels.Contains(channelItem.ChannelId))
{ {
await DownloadChannelItem(channelItem, options, cancellationToken, path); try
} {
catch (OperationCanceledException) await DownloadChannelItem(channelItem, options, cancellationToken, path);
{ }
break; catch (OperationCanceledException)
} {
catch (ChannelDownloadException) break;
{ }
// Logged at lower levels catch (ChannelDownloadException)
} {
catch (Exception ex) // Logged at lower levels
{ }
_logger.ErrorException("Error downloading channel content for {0}", ex, item.Name); catch (Exception ex)
{
_logger.ErrorException("Error downloading channel content for {0}", ex, item.Name);
}
} }
} }
} }