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

fixed api shutdown and more hls progress

Browse Source
This commit is contained in:
LukePulverenti 2013-02-27 18:33:40 -05:00
parent 94b6168e27
commit 8d32971354
15 changed files with 300 additions and 1382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Api/MediaBrowser.Api.csproj
View File

@ -84,6 +84,9 @@
<Compile Include="Library\LibraryStructureService.cs" />
<Compile Include="LocalizationService.cs" />
<Compile Include="PackageService.cs" />
<Compile Include="Playback\Hls\AudioHlsService.cs" />
<Compile Include="Playback\Hls\BaseHlsService.cs" />
<Compile Include="Playback\Hls\VideoHlsService.cs" />
<Compile Include="Playback\Progressive\AudioService.cs" />
<Compile Include="Playback\Progressive\BaseProgressiveStreamingService.cs" />
<Compile Include="Playback\BaseStreamingService.cs" />
@ -95,8 +98,6 @@
<Compile Include="ScheduledTasks\ScheduledTaskService.cs" />
<Compile Include="ScheduledTasks\ScheduledTasksWebSocketListener.cs" />
<Compile Include="SystemService.cs" />
<Compile Include="Streaming\BaseHlsPlaylistHandler.cs" />
<Compile Include="Streaming\BaseStreamingHandler.cs" />
<Compile Include="UserLibrary\BaseItemsByNameService.cs" />
<Compile Include="UserLibrary\GenresService.cs" />
<Compile Include="UserLibrary\ItemsService.cs" />
@ -105,9 +106,6 @@
<Compile Include="UserLibrary\UserLibraryService.cs" />
<Compile Include="UserLibrary\YearsService.cs" />
<Compile Include="UserService.cs" />
<Compile Include="Streaming\HlsAudioPlaylistHandler.cs" />
<Compile Include="Streaming\HlsSegmentHandler.cs" />
<Compile Include="Streaming\HlsVideoPlaylistHandler.cs" />
<Compile Include="Plugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WeatherService.cs" />
@ -139,9 +137,7 @@
<EmbeddedResource Include="Javascript\ApiClient.js" />
<Content Include="options.xml" />
</ItemGroup>
<ItemGroup>
<Folder Include="Playback\Hls\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\MediaBrowser.ServerApplication\CorePlugins\" /y</PostBuildEvent>

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -144,7 +144,7 @@ namespace MediaBrowser.Api.Playback
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected string GetMapArgs(StreamState state)
protected virtual string GetMapArgs(StreamState state)
{
var args = string.Empty;

94
MediaBrowser.Api/Playback/Hls/AudioHlsService.cs Normal file
View File

@ -0,0 +1,94 @@
using MediaBrowser.Controller;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
using System;
namespace MediaBrowser.Api.Playback.Hls
{
/// <summary>
/// Class AudioHlsService
/// </summary>
public class AudioHlsService : BaseHlsService
{
/// <summary>
/// Initializes a new instance of the <see cref="AudioHlsService" /> class.
/// </summary>
/// <param name="appPaths">The app paths.</param>
/// <param name="userManager">The user manager.</param>
public AudioHlsService(IServerApplicationPaths appPaths, IUserManager userManager) : base(appPaths, userManager)
{
}
/// <summary>
/// Gets the audio arguments.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected override string GetAudioArguments(StreamState state)
{
var codec = GetAudioCodec(state.Request);
var args = "-codec:a " + codec;
var channels = GetNumAudioChannelsParam(state.Request, state.AudioStream);
if (channels.HasValue)
{
args += " -ac " + channels.Value;
}
if (state.Request.AudioSampleRate.HasValue)
{
args += " -ar " + state.Request.AudioSampleRate.Value;
}
if (state.Request.AudioBitRate.HasValue)
{
args += " -ab " + state.Request.AudioBitRate.Value;
}
return args;
}
/// <summary>
/// Gets the video arguments.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected override string GetVideoArguments(StreamState state)
{
// No video
return string.Empty;
}
/// <summary>
/// Gets the segment file extension.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
/// <exception cref="System.InvalidOperationException">Only aac and mp3 audio codecs are supported.</exception>
protected override string GetSegmentFileExtension(StreamState state)
{
if (state.Request.AudioCodec == AudioCodecs.Aac)
{
return ".aac";
}
if (state.Request.AudioCodec == AudioCodecs.Mp3)
{
return ".mp3";
}
throw new InvalidOperationException("Only aac and mp3 audio codecs are supported.");
}
/// <summary>
/// Gets the map args.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected override string GetMapArgs(StreamState state)
{
return string.Format("-map 0:{0}", state.AudioStream.Index);
}
}
}

118
MediaBrowser.Api/Streaming/BaseHlsPlaylistHandler.cs → MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
View File

@ -1,36 +1,45 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Library;
using System;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace MediaBrowser.Api.Streaming
namespace MediaBrowser.Api.Playback.Hls
{
/// <summary>
/// Class BaseHlsPlaylistHandler
/// </summary>
/// <typeparam name="TBaseItemType">The type of the T base item type.</typeparam>
public abstract class BaseHlsPlaylistHandler<TBaseItemType> : BaseStreamingHandler<TBaseItemType>
where TBaseItemType : BaseItem, IHasMediaStreams, new()
public abstract class BaseHlsService : BaseStreamingService
{
/// <summary>
/// The segment file prefix
/// </summary>
public const string SegmentFilePrefix = "segment-";
protected BaseHlsService(IServerApplicationPaths appPaths, IUserManager userManager)
: base(appPaths, userManager)
{
}
/// <summary>
/// Gets the audio arguments.
/// </summary>
/// <returns>System.String.</returns>
protected abstract string GetAudioArguments();
protected abstract string GetAudioArguments(StreamState state);
/// <summary>
/// Gets the video arguments.
/// </summary>
/// <returns>System.String.</returns>
protected abstract string GetVideoArguments();
protected abstract string GetVideoArguments(StreamState state);
/// <summary>
/// Gets the segment file extension.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected abstract string GetSegmentFileExtension(StreamState state);
/// <summary>
/// Gets the type of the transcoding job.
/// </summary>
@ -41,41 +50,30 @@ namespace MediaBrowser.Api.Streaming
}
/// <summary>
/// This isn't needed because we're going to override the whole flow using ProcessRequest
/// Processes the request.
/// </summary>
/// <param name="stream">The stream.</param>
/// <param name="responseInfo">The response info.</param>
/// <param name="contentLength">Length of the content.</param>
/// <returns>Task.</returns>
/// <exception cref="NotImplementedException"></exception>
protected override Task WriteResponseToOutputStream(Stream stream, ResponseInfo responseInfo, long? contentLength)
/// <param name="state">The state.</param>
/// <returns>System.Object.</returns>
protected object ProcessRequest(StreamState state)
{
throw new NotImplementedException();
return ProcessRequestAsync(state).Result;
}
/// <summary>
/// Gets the segment file extension.
/// Processes the request async.
/// </summary>
/// <value>The segment file extension.</value>
protected abstract string SegmentFileExtension { get; }
/// <summary>
/// Processes the request.
/// </summary>
/// <param name="ctx">The CTX.</param>
/// <returns>Task.</returns>
public override async Task ProcessRequest(HttpListenerContext ctx)
/// <param name="state">The state.</param>
/// <returns>Task{System.Object}.</returns>
public async Task<object> ProcessRequestAsync(StreamState state)
{
HttpListenerContext = ctx;
var playlist = OutputFilePath;
var playlist = GetOutputFilePath(state);
var isPlaylistNewlyCreated = false;
// If the playlist doesn't already exist, startup ffmpeg
if (!File.Exists(playlist))
{
isPlaylistNewlyCreated = true;
await StartFFMpeg(playlist).ConfigureAwait(false);
await StartFFMpeg(state, playlist).ConfigureAwait(false);
}
else
{
@ -91,8 +89,8 @@ namespace MediaBrowser.Api.Streaming
try
{
// Dump the stream off to the static file handler to serve statically
await new StaticFileHandler(Kernel) { ContentType = MimeTypes.GetMimeType("playlist.m3u8"), SourceStream = stream }.ProcessRequest(ctx);
Response.ContentType = MimeTypes.GetMimeType("playlist.m3u8");
return new StreamWriter(stream);
}
finally
{
@ -162,30 +160,32 @@ namespace MediaBrowser.Api.Streaming
}
return count;
}
/// <summary>
/// Gets all command line arguments to pass to ffmpeg
/// Gets the command line arguments.
/// </summary>
/// <param name="outputPath">The playlist output path</param>
/// <param name="isoMount">The iso mount.</param>
/// <param name="outputPath">The output path.</param>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected override string GetCommandLineArguments(string outputPath, IIsoMount isoMount)
protected override string GetCommandLineArguments(string outputPath, StreamState state)
{
var segmentOutputPath = Path.GetDirectoryName(outputPath);
var segmentOutputName = HlsSegmentHandler.SegmentFilePrefix + Path.GetFileNameWithoutExtension(outputPath);
var segmentOutputName = SegmentFilePrefix + Path.GetFileNameWithoutExtension(outputPath);
segmentOutputPath = Path.Combine(segmentOutputPath, segmentOutputName + "%03d." + SegmentFileExtension.TrimStart('.'));
segmentOutputPath = Path.Combine(segmentOutputPath, segmentOutputName + "%03d." + GetSegmentFileExtension(state).TrimStart('.'));
var probeSize = Kernel.FFMpegManager.GetProbeSizeArgument(LibraryItem);
var kernel = (Kernel)Kernel;
var probeSize = kernel.FFMpegManager.GetProbeSizeArgument(state.Item);
return string.Format("{0} {1} -i {2}{3} -threads 0 {4} {5} {6} -f ssegment -segment_list_flags +live -segment_time 9 -segment_list \"{7}\" \"{8}\"",
probeSize,
FastSeekCommandLineParameter,
GetInputArgument(isoMount),
SlowSeekCommandLineParameter,
MapArgs,
GetVideoArguments(),
GetAudioArguments(),
GetFastSeekCommandLineParameter(state.Request),
GetInputArgument(state.Item, state.IsoMount),
GetSlowSeekCommandLineParameter(state.Request),
GetMapArgs(state),
GetVideoArguments(state),
GetAudioArguments(state),
outputPath,
segmentOutputPath
).Trim();
@ -194,11 +194,11 @@ namespace MediaBrowser.Api.Streaming
/// <summary>
/// Deletes the partial stream files.
/// </summary>
/// <param name="playlistFilePath">The playlist file path.</param>
protected override void DeletePartialStreamFiles(string playlistFilePath)
/// <param name="outputFilePath">The output file path.</param>
protected override void DeletePartialStreamFiles(string outputFilePath)
{
var directory = Path.GetDirectoryName(playlistFilePath);
var name = Path.GetFileNameWithoutExtension(playlistFilePath);
var directory = Path.GetDirectoryName(outputFilePath);
var name = Path.GetFileNameWithoutExtension(outputFilePath);
var filesToDelete = Directory.EnumerateFiles(directory, "*", SearchOption.TopDirectoryOnly)
.Where(f => f.IndexOf(name, StringComparison.OrdinalIgnoreCase) != -1)
@ -208,12 +208,12 @@ namespace MediaBrowser.Api.Streaming
{
try
{
//Logger.Info("Deleting HLS file {0}", file);
Logger.Info("Deleting HLS file {0}", file);
File.Delete(file);
}
catch (IOException ex)
{
//Logger.ErrorException("Error deleting HLS file {0}", ex, file);
Logger.ErrorException("Error deleting HLS file {0}", ex, file);
}
}
}

129
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs Normal file
View File

@ -0,0 +1,129 @@
using MediaBrowser.Controller;
using MediaBrowser.Controller.Library;
using System;
namespace MediaBrowser.Api.Playback.Hls
{
public class VideoHlsService : BaseHlsService
{
/// <summary>
/// Initializes a new instance of the <see cref="VideoHlsService" /> class.
/// </summary>
/// <param name="appPaths">The app paths.</param>
/// <param name="userManager">The user manager.</param>
public VideoHlsService(IServerApplicationPaths appPaths, IUserManager userManager)
: base(appPaths, userManager)
{
}
/// <summary>
/// Gets the audio arguments.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected override string GetAudioArguments(StreamState state)
{
if (!state.Request.AudioCodec.HasValue)
{
return "-codec:a:0 copy";
}
var codec = GetAudioCodec(state.Request);
var args = "-codec:a:0 " + codec;
if (state.AudioStream != null)
{
var channels = GetNumAudioChannelsParam(state.Request, state.AudioStream);
if (channels.HasValue)
{
args += " -ac " + channels.Value;
}
if (state.Request.AudioSampleRate.HasValue)
{
args += " -ar " + state.Request.AudioSampleRate.Value;
}
if (state.Request.AudioBitRate.HasValue)
{
args += " -ab " + state.Request.AudioBitRate.Value;
}
return args;
}
return args;
}
/// <summary>
/// Gets the video arguments.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected override string GetVideoArguments(StreamState state)
{
var codec = GetVideoCodec(state.Request);
// Right now all we support is either h264 or copy
if (!codec.Equals("copy", StringComparison.OrdinalIgnoreCase) && !codec.Equals("libx264", StringComparison.OrdinalIgnoreCase))
{
codec = "libx264";
}
// See if we can save come cpu cycles by avoiding encoding
if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
{
return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb" : "-codec:v:0 copy";
}
var args = "-codec:v:0 " + codec + " -preset superfast";
if (state.Request.VideoBitRate.HasValue)
{
args += string.Format(" -b:v {0}", state.Request.VideoBitRate.Value);
}
// Add resolution params, if specified
if (state.Request.Width.HasValue || state.Request.Height.HasValue || state.Request.MaxHeight.HasValue || state.Request.MaxWidth.HasValue)
{
args += GetOutputSizeParam(state, codec);
}
// Get the output framerate based on the FrameRate param
double framerate = state.Request.Framerate ?? 0;
// We have to supply a framerate for hls, so if it's null, account for that here
if (framerate.Equals(0))
{
framerate = state.VideoStream.AverageFrameRate ?? 0;
}
if (framerate.Equals(0))
{
framerate = state.VideoStream.RealFrameRate ?? 0;
}
if (framerate.Equals(0))
{
framerate = 23.976;
}
args += string.Format(" -r {0}", framerate);
// Needed to ensure segments stay under 10 seconds
args += string.Format(" -g {0}", framerate);
return args;
}
/// <summary>
/// Gets the segment file extension.
/// </summary>
/// <param name="state">The state.</param>
/// <returns>System.String.</returns>
protected override string GetSegmentFileExtension(StreamState state)
{
return ".ts";
}
}
}

989
MediaBrowser.Api/Streaming/BaseStreamingHandler.cs
View File

@ -1,989 +0,0 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace MediaBrowser.Api.Streaming
{
/// <summary>
/// Represents a common base class for both progressive and hls streaming
/// </summary>
/// <typeparam name="TBaseItemType">The type of the T base item type.</typeparam>
public abstract class BaseStreamingHandler<TBaseItemType> : BaseHandler<Kernel>
where TBaseItemType : BaseItem, IHasMediaStreams, new()
{
/// <summary>
/// Gets the command line arguments.
/// </summary>
/// <param name="outputPath">The output path.</param>
/// <param name="isoMount">The iso mount.</param>
/// <returns>System.String.</returns>
protected abstract string GetCommandLineArguments(string outputPath, IIsoMount isoMount);
/// <summary>
/// Gets or sets the log file stream.
/// </summary>
/// <value>The log file stream.</value>
protected Stream LogFileStream { get; set; }
/// <summary>
/// Gets the type of the transcoding job.
/// </summary>
/// <value>The type of the transcoding job.</value>
protected abstract TranscodingJobType TranscodingJobType { get; }
/// <summary>
/// Gets the output file extension.
/// </summary>
/// <value>The output file extension.</value>
protected string OutputFileExtension
{
get
{
return Path.GetExtension(HttpListenerContext.Request.Url.LocalPath);
}
}
/// <summary>
/// Gets the output file path.
/// </summary>
/// <value>The output file path.</value>
protected string OutputFilePath
{
get
{
return Path.Combine(Kernel.ApplicationPaths.FFMpegStreamCachePath, GetCommandLineArguments("dummy\\dummy", null).GetMD5() + OutputFileExtension.ToLower());
}
}
/// <summary>
/// Gets the audio codec to endoce to.
/// </summary>
/// <value>The audio encoding format.</value>
protected virtual AudioCodecs? AudioCodec
{
get
{
if (string.IsNullOrEmpty(QueryString["audioCodec"]))
{
return null;
}
return (AudioCodecs)Enum.Parse(typeof(AudioCodecs), QueryString["audioCodec"], true);
}
}
/// <summary>
/// Gets the video encoding codec.
/// </summary>
/// <value>The video codec.</value>
protected VideoCodecs? VideoCodec
{
get
{
if (string.IsNullOrEmpty(QueryString["videoCodec"]))
{
return null;
}
return (VideoCodecs)Enum.Parse(typeof(VideoCodecs), QueryString["videoCodec"], true);
}
}
/// <summary>
/// Gets the time, in ticks, in which playback should start
/// </summary>
/// <value>The start time ticks.</value>
protected long? StartTimeTicks
{
get
{
string val = QueryString["StartTimeTicks"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return long.Parse(val);
}
}
/// <summary>
/// The fast seek offset seconds
/// </summary>
private const int FastSeekOffsetSeconds = 1;
/// <summary>
/// Gets the fast seek command line parameter.
/// </summary>
/// <value>The fast seek command line parameter.</value>
protected string FastSeekCommandLineParameter
{
get
{
var time = StartTimeTicks;
if (time.HasValue)
{
var seconds = TimeSpan.FromTicks(time.Value).TotalSeconds - FastSeekOffsetSeconds;
if (seconds > 0)
{
return string.Format("-ss {0}", seconds);
}
}
return string.Empty;
}
}
/// <summary>
/// Gets the slow seek command line parameter.
/// </summary>
/// <value>The slow seek command line parameter.</value>
protected string SlowSeekCommandLineParameter
{
get
{
var time = StartTimeTicks;
if (time.HasValue)
{
if (TimeSpan.FromTicks(time.Value).TotalSeconds - FastSeekOffsetSeconds > 0)
{
return string.Format(" -ss {0}", FastSeekOffsetSeconds);
}
}
return string.Empty;
}
}
/// <summary>
/// Gets the map args.
/// </summary>
/// <value>The map args.</value>
protected virtual string MapArgs
{
get
{
var args = string.Empty;
if (VideoStream != null)
{
args += string.Format("-map 0:{0}", VideoStream.Index);
}
else
{
args += "-map -0:v";
}
if (AudioStream != null)
{
args += string.Format(" -map 0:{0}", AudioStream.Index);
}
else
{
args += " -map -0:a";
}
if (SubtitleStream == null)
{
args += " -map -0:s";
}
return args;
}
}
/// <summary>
/// The _library item
/// </summary>
private TBaseItemType _libraryItem;
/// <summary>
/// Gets the library item that will be played, if any
/// </summary>
/// <value>The library item.</value>
protected TBaseItemType LibraryItem
{
get { return _libraryItem; }
}
/// <summary>
/// Gets or sets the iso mount.
/// </summary>
/// <value>The iso mount.</value>
private IIsoMount IsoMount { get; set; }
/// <summary>
/// The _audio stream
/// </summary>
private MediaStream _audioStream;
/// <summary>
/// Gets the audio stream.
/// </summary>
/// <value>The audio stream.</value>
protected MediaStream AudioStream
{
get { return _audioStream ?? (_audioStream = GetMediaStream(AudioStreamIndex, MediaStreamType.Audio)); }
}
/// <summary>
/// The _video stream
/// </summary>
private MediaStream _videoStream;
/// <summary>
/// Gets the video stream.
/// </summary>
/// <value>The video stream.</value>
protected MediaStream VideoStream
{
get
{
// No video streams here
// Need to make this check to make sure we don't pickup embedded image streams (which are listed in the file as type video)
if (LibraryItem is Audio)
{
return null;
}
return _videoStream ?? (_videoStream = GetMediaStream(VideoStreamIndex, MediaStreamType.Video));
}
}
/// <summary>
/// The subtitle stream
/// </summary>
private MediaStream _subtitleStream;
/// <summary>
/// Gets the subtitle stream.
/// </summary>
/// <value>The subtitle stream.</value>
protected MediaStream SubtitleStream
{
get
{
// No subtitle streams here
if (LibraryItem is Audio)
{
return null;
}
return _subtitleStream ?? (_subtitleStream = GetMediaStream(SubtitleStreamIndex, MediaStreamType.Subtitle, false));
}
}
/// <summary>
/// Determines which stream will be used for playback
/// </summary>
/// <param name="desiredIndex">Index of the desired.</param>
/// <param name="type">The type.</param>
/// <param name="returnFirstIfNoIndex">if set to <c>true</c> [return first if no index].</param>
/// <returns>MediaStream.</returns>
private MediaStream GetMediaStream(int? desiredIndex, MediaStreamType type, bool returnFirstIfNoIndex = true)
{
var streams = LibraryItem.MediaStreams.Where(s => s.Type == type).ToList();
if (desiredIndex.HasValue)
{
var stream = streams.FirstOrDefault(s => s.Index == desiredIndex.Value);
if (stream != null)
{
return stream;
}
}
// Just return the first one
return returnFirstIfNoIndex ? streams.FirstOrDefault() : null;
}
/// <summary>
/// Gets the response info.
/// </summary>
/// <returns>Task{ResponseInfo}.</returns>
protected override Task<ResponseInfo> GetResponseInfo()
{
var info = new ResponseInfo
{
ContentType = MimeTypes.GetMimeType(OutputFilePath),
CompressResponse = false
};
return Task.FromResult(info);
}
/// <summary>
/// Gets the client's desired audio bitrate
/// </summary>
/// <value>The audio bit rate.</value>
protected int? AudioBitRate
{
get
{
var val = QueryString["AudioBitRate"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the client's desired video bitrate
/// </summary>
/// <value>The video bit rate.</value>
protected int? VideoBitRate
{
get
{
var val = QueryString["VideoBitRate"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the desired audio stream index
/// </summary>
/// <value>The index of the audio stream.</value>
private int? AudioStreamIndex
{
get
{
var val = QueryString["AudioStreamIndex"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the desired video stream index
/// </summary>
/// <value>The index of the video stream.</value>
private int? VideoStreamIndex
{
get
{
var val = QueryString["VideoStreamIndex"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the desired subtitle stream index
/// </summary>
/// <value>The index of the subtitle stream.</value>
private int? SubtitleStreamIndex
{
get
{
var val = QueryString["SubtitleStreamIndex"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the audio channels.
/// </summary>
/// <value>The audio channels.</value>
public int? AudioChannels
{
get
{
var val = QueryString["audiochannels"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the audio sample rate.
/// </summary>
/// <value>The audio sample rate.</value>
public int? AudioSampleRate
{
get
{
var val = QueryString["audiosamplerate"];
if (string.IsNullOrEmpty(val))
{
return 44100;
}
return int.Parse(val);
}
}
/// <summary>
/// If we're going to put a fixed size on the command line, this will calculate it
/// </summary>
/// <param name="outputVideoCodec">The output video codec.</param>
/// <returns>System.String.</returns>
protected string GetOutputSizeParam(string outputVideoCodec)
{
// http://sonnati.wordpress.com/2012/10/19/ffmpeg-the-swiss-army-knife-of-internet-streaming-part-vi/
var assSubtitleParam = string.Empty;
if (SubtitleStream != null)
{
if (SubtitleStream.Codec.IndexOf("srt", StringComparison.OrdinalIgnoreCase) != -1 || SubtitleStream.Codec.IndexOf("subrip", StringComparison.OrdinalIgnoreCase) != -1)
{
assSubtitleParam = GetTextSubtitleParam(SubtitleStream);
}
}
// If fixed dimensions were supplied
if (Width.HasValue && Height.HasValue)
{
return string.Format(" -vf \"scale={0}:{1}{2}\"", Width.Value, Height.Value, assSubtitleParam);
}
var isH264Output = outputVideoCodec.Equals("libx264", StringComparison.OrdinalIgnoreCase);
// If a fixed width was requested
if (Width.HasValue)
{
return isH264Output ?
string.Format(" -vf \"scale={0}:trunc(ow/a/2)*2{1}\"", Width.Value, assSubtitleParam) :
string.Format(" -vf \"scale={0}:-1{1}\"", Width.Value, assSubtitleParam);
}
// If a max width was requested
if (MaxWidth.HasValue && !MaxHeight.HasValue)
{
return isH264Output ?
string.Format(" -vf \"scale=min(iw\\,{0}):trunc(ow/a/2)*2{1}\"", MaxWidth.Value, assSubtitleParam) :
string.Format(" -vf \"scale=min(iw\\,{0}):-1{1}\"", MaxWidth.Value, assSubtitleParam);
}
// Need to perform calculations manually
// Try to account for bad media info
var currentHeight = VideoStream.Height ?? MaxHeight ?? Height ?? 0;
var currentWidth = VideoStream.Width ?? MaxWidth ?? Width ?? 0;
var outputSize = DrawingUtils.Resize(currentWidth, currentHeight, Width, Height, MaxWidth, MaxHeight);
// If we're encoding with libx264, it can't handle odd numbered widths or heights, so we'll have to fix that
if (isH264Output)
{
return string.Format(" -vf \"scale=trunc({0}/2)*2:trunc({1}/2)*2{2}\"", outputSize.Width, outputSize.Height, assSubtitleParam);
}
// Otherwise use -vf scale since ffmpeg will ensure internally that the aspect ratio is preserved
return string.Format(" -vf \"scale={0}:-1{1}\"", Convert.ToInt32(outputSize.Width), assSubtitleParam);
}
/// <summary>
/// Gets the text subtitle param.
/// </summary>
/// <param name="subtitleStream">The subtitle stream.</param>
/// <returns>System.String.</returns>
protected string GetTextSubtitleParam(MediaStream subtitleStream)
{
var path = subtitleStream.IsExternal ? GetConvertedAssPath(subtitleStream) : GetExtractedAssPath(subtitleStream);
if (string.IsNullOrEmpty(path))
{
return string.Empty;
}
var param = string.Format(",ass={0}", path);
var time = StartTimeTicks;
if (time.HasValue)
{
var seconds = Convert.ToInt32(TimeSpan.FromTicks(time.Value).TotalSeconds);
param += string.Format(",setpts=PTS-{0}/TB", seconds);
}
return param;
}
/// <summary>
/// Gets the extracted ass path.
/// </summary>
/// <param name="subtitleStream">The subtitle stream.</param>
/// <returns>System.String.</returns>
private string GetExtractedAssPath(MediaStream subtitleStream)
{
var video = LibraryItem as Video;
var path = Kernel.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, ".ass");
if (!File.Exists(path))
{
var success = Kernel.FFMpegManager.ExtractTextSubtitle(video, subtitleStream.Index, path, CancellationToken.None).Result;
if (!success)
{
return null;
}
}
return path;
}
/// <summary>
/// Gets the converted ass path.
/// </summary>
/// <param name="subtitleStream">The subtitle stream.</param>
/// <returns>System.String.</returns>
private string GetConvertedAssPath(MediaStream subtitleStream)
{
var video = LibraryItem as Video;
var path = Kernel.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, ".ass");
if (!File.Exists(path))
{
var success = Kernel.FFMpegManager.ConvertTextSubtitle(subtitleStream, path, CancellationToken.None).Result;
if (!success)
{
return null;
}
}
return path;
}
/// <summary>
/// Gets the internal graphical subtitle param.
/// </summary>
/// <param name="subtitleStream">The subtitle stream.</param>
/// <param name="videoCodec">The video codec.</param>
/// <returns>System.String.</returns>
protected string GetInternalGraphicalSubtitleParam(MediaStream subtitleStream, string videoCodec)
{
var outputSizeParam = string.Empty;
// Add resolution params, if specified
if (Width.HasValue || Height.HasValue || MaxHeight.HasValue || MaxWidth.HasValue)
{
outputSizeParam = GetOutputSizeParam(videoCodec).TrimEnd('"');
outputSizeParam = "," + outputSizeParam.Substring(outputSizeParam.IndexOf("scale", StringComparison.OrdinalIgnoreCase));
}
return string.Format(" -filter_complex \"[0:{0}]format=yuva444p,lut=u=128:v=128:y=gammaval(.3)[sub] ; [0:0] [sub] overlay{1}\"", subtitleStream.Index, outputSizeParam);
}
/// <summary>
/// Gets the fixed output video height, in pixels
/// </summary>
/// <value>The height.</value>
protected int? Height
{
get
{
string val = QueryString["height"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the fixed output video width, in pixels
/// </summary>
/// <value>The width.</value>
protected int? Width
{
get
{
string val = QueryString["width"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the maximum output video height, in pixels
/// </summary>
/// <value>The height of the max.</value>
protected int? MaxHeight
{
get
{
string val = QueryString["maxheight"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the maximum output video width, in pixels
/// </summary>
/// <value>The width of the max.</value>
protected int? MaxWidth
{
get
{
string val = QueryString["maxwidth"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return int.Parse(val);
}
}
/// <summary>
/// Gets the output video framerate
/// </summary>
/// <value>The max frame rate.</value>
protected float? FrameRate
{
get
{
string val = QueryString["framerate"];
if (string.IsNullOrEmpty(val))
{
return null;
}
return float.Parse(val);
}
}
/// <summary>
/// Gets the number of audio channels to specify on the command line
/// </summary>
/// <returns>System.Nullable{System.Int32}.</returns>
protected int? GetSampleRateParam()
{
// If the user requested a max value
if (AudioSampleRate.HasValue)
{
return AudioSampleRate.Value;
}
return null;
}
/// <summary>
/// Gets the number of audio channels to specify on the command line
/// </summary>
/// <param name="audioCodec">The audio codec.</param>
/// <returns>System.Nullable{System.Int32}.</returns>
protected int? GetNumAudioChannelsParam(string audioCodec)
{
if (AudioStream.Channels > 2)
{
if (audioCodec.Equals("libvo_aacenc"))
{
// libvo_aacenc currently only supports two channel output
return 2;
}
if (audioCodec.Equals("wmav2"))
{
// wmav2 currently only supports two channel output
return 2;
}
}
return GetNumAudioChannelsParam();
}
/// <summary>
/// Gets the number of audio channels to specify on the command line
/// </summary>
/// <returns>System.Nullable{System.Int32}.</returns>
protected int? GetNumAudioChannelsParam()
{
// If the user requested a max number of channels
if (AudioChannels.HasValue)
{
return AudioChannels.Value;
}
return null;
}
/// <summary>
/// Determines whether the specified stream is H264.
/// </summary>
/// <param name="stream">The stream.</param>
/// <returns><c>true</c> if the specified stream is H264; otherwise, <c>false</c>.</returns>
protected bool IsH264(MediaStream stream)
{
return stream.Codec.IndexOf("264", StringComparison.OrdinalIgnoreCase) != -1 ||
stream.Codec.IndexOf("avc", StringComparison.OrdinalIgnoreCase) != -1;
}
/// <summary>
/// Gets the name of the output audio codec
/// </summary>
/// <returns>System.String.</returns>
protected string GetAudioCodec()
{
if (AudioCodec.HasValue)
{
if (AudioCodec == AudioCodecs.Aac)
{
return "libvo_aacenc";
}
if (AudioCodec == AudioCodecs.Mp3)
{
return "libmp3lame";
}
if (AudioCodec == AudioCodecs.Vorbis)
{
return "libvorbis";
}
if (AudioCodec == AudioCodecs.Wma)
{
return "wmav2";
}
}
return "copy";
}
/// <summary>
/// Gets the name of the output video codec
/// </summary>
/// <returns>System.String.</returns>
protected string GetVideoCodec()
{
if (VideoCodec.HasValue)
{
if (VideoCodec == VideoCodecs.H264)
{
return "libx264";
}
if (VideoCodec == VideoCodecs.Vpx)
{
return "libvpx";
}
if (VideoCodec == VideoCodecs.Wmv)
{
return "wmv2";
}
if (VideoCodec == VideoCodecs.Theora)
{
return "libtheora";
}
}
return "copy";
}
/// <summary>
/// Gets the input argument.
/// </summary>
/// <param name="isoMount">The iso mount.</param>
/// <returns>System.String.</returns>
protected string GetInputArgument(IIsoMount isoMount)
{
return isoMount == null ?
Kernel.FFMpegManager.GetInputArgument(LibraryItem) :
Kernel.FFMpegManager.GetInputArgument(LibraryItem as Video, IsoMount);
}
/// <summary>
/// Starts the FFMPEG.
/// </summary>
/// <param name="outputPath">The output path.</param>
/// <returns>Task.</returns>
protected async Task StartFFMpeg(string outputPath)
{
var video = LibraryItem as Video;
//if (video != null && video.VideoType == VideoType.Iso &&
// video.IsoType.HasValue && Kernel.IsoManager.CanMount(video.Path))
//{
// IsoMount = await Kernel.IsoManager.Mount(video.Path, CancellationToken.None).ConfigureAwait(false);
//}
var process = new Process
{
StartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
UseShellExecute = false,
// Must consume both stdout and stderr or deadlocks may occur
RedirectStandardOutput = true,
RedirectStandardError = true,
FileName = Kernel.FFMpegManager.FFMpegPath,
WorkingDirectory = Path.GetDirectoryName(Kernel.FFMpegManager.FFMpegPath),
Arguments = GetCommandLineArguments(outputPath, IsoMount),
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
},
EnableRaisingEvents = true
};
Plugin.Instance.OnTranscodeBeginning(outputPath, TranscodingJobType, process);
//Logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
var logFilePath = Path.Combine(Kernel.ApplicationPaths.LogDirectoryPath, "ffmpeg-" + Guid.NewGuid() + ".txt");
// FFMpeg writes debug/error info to stderr. This is useful when debugging so let's put it in the log directory.
LogFileStream = new FileStream(logFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous);
process.Exited += OnFFMpegProcessExited;
try
{
process.Start();
}
catch (Win32Exception ex)
{
//Logger.ErrorException("Error starting ffmpeg", ex);
Plugin.Instance.OnTranscodeFailedToStart(outputPath, TranscodingJobType);
process.Exited -= OnFFMpegProcessExited;
LogFileStream.Dispose();
throw;
}
// MUST read both stdout and stderr asynchronously or a deadlock may occurr
process.BeginOutputReadLine();
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
process.StandardError.BaseStream.CopyToAsync(LogFileStream);
// Wait for the file to exist before proceeeding
while (!File.Exists(outputPath))
{
await Task.Delay(100).ConfigureAwait(false);
}
}
/// <summary>
/// Processes the exited.
/// </summary>
/// <param name="sender">The sender.</param>
/// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
protected void OnFFMpegProcessExited(object sender, EventArgs e)
{
if (IsoMount != null)
{
IsoMount.Dispose();
IsoMount = null;
}
var outputFilePath = OutputFilePath;
LogFileStream.Dispose();
var process = (Process)sender;
process.Exited -= OnFFMpegProcessExited;
int? exitCode = null;
try
{
exitCode = process.ExitCode;
//Logger.Info("FFMpeg exited with code {0} for {1}", exitCode.Value, outputFilePath);
}
catch
{
//Logger.Info("FFMpeg exited with an error for {0}", outputFilePath);
}
process.Dispose();
Plugin.Instance.OnTranscodingFinished(outputFilePath, TranscodingJobType);
if (!exitCode.HasValue || exitCode.Value != 0)
{
//Logger.Info("Deleting partial stream file(s) {0}", outputFilePath);
try
{
DeletePartialStreamFiles(outputFilePath);
}
catch (IOException ex)
{
//Logger.ErrorException("Error deleting partial stream file(s) {0}", ex, outputFilePath);
}
}
else
{
//Logger.Info("FFMpeg completed and exited normally for {0}", outputFilePath);
}
}
/// <summary>
/// Deletes the partial stream files.
/// </summary>
/// <param name="outputFilePath">The output file path.</param>
protected abstract void DeletePartialStreamFiles(string outputFilePath);
}
}

100
MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs
View File

@ -1,100 +0,0 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Dto;
using System;
using System.Net;
namespace MediaBrowser.Api.Streaming
{
/// <summary>
/// Class HlsAudioPlaylistHandler
/// </summary>
public class HlsAudioPlaylistHandler : BaseHlsPlaylistHandler<Audio>
{
/// <summary>
/// Handleses the request.
/// </summary>
/// <param name="request">The request.</param>
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
public override bool HandlesRequest(HttpListenerRequest request)
{
return ApiService.IsApiUrlMatch("audio.m3u8", request);
}
/// <summary>
/// Gets the segment file extension.
/// </summary>
/// <value>The segment file extension.</value>
/// <exception cref="InvalidOperationException">Only aac and mp3 audio codecs are supported.</exception>
protected override string SegmentFileExtension
{
get
{
if (AudioCodec == AudioCodecs.Aac)
{
return ".aac";
}
if (AudioCodec == AudioCodecs.Mp3)
{
return ".mp3";
}
throw new InvalidOperationException("Only aac and mp3 audio codecs are supported.");
}
}
/// <summary>
/// Gets the video arguments.
/// </summary>
/// <returns>System.String.</returns>
protected override string GetVideoArguments()
{
// No video
return string.Empty;
}
/// <summary>
/// Gets the map args.
/// </summary>
/// <value>The map args.</value>
protected override string MapArgs
{
get
{
return string.Format("-map 0:{0}", AudioStream.Index);
}
}
/// <summary>
/// Gets the audio arguments.
/// </summary>
/// <returns>System.String.</returns>
protected override string GetAudioArguments()
{
var codec = GetAudioCodec();
var args = "-codec:a " + codec;
var channels = GetNumAudioChannelsParam();
if (channels.HasValue)
{
args += " -ac " + channels.Value;
}
var sampleRate = GetSampleRateParam();
if (sampleRate.HasValue)
{
args += " -ar " + sampleRate.Value;
}
if (AudioBitRate.HasValue)
{
args += " -ab " + AudioBitRate.Value;
}
return args;
}
}
}

85
MediaBrowser.Api/Streaming/HlsSegmentHandler.cs
View File

@ -1,85 +0,0 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using System;
using System.IO;
using System.Net;
using System.Threading.Tasks;
namespace MediaBrowser.Api.Streaming
{
/// <summary>
/// Class HlsSegmentHandler
/// </summary>
public class HlsSegmentHandler : BaseHandler<Kernel>
{
/// <summary>
/// The segment file prefix
/// </summary>
public const string SegmentFilePrefix = "segment-";
/// <summary>
/// Handleses the request.
/// </summary>
/// <param name="request">The request.</param>
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
public override bool HandlesRequest(HttpListenerRequest request)
{
const string url = "/api/" + SegmentFilePrefix;
return request.Url.LocalPath.IndexOf(url, StringComparison.OrdinalIgnoreCase) != -1;
}
/// <summary>
/// Writes the response to output stream.
/// </summary>
/// <param name="stream">The stream.</param>
/// <param name="responseInfo">The response info.</param>
/// <param name="contentLength">Length of the content.</param>
/// <returns>Task.</returns>
/// <exception cref="System.NotImplementedException"></exception>
/// <exception cref="NotImplementedException"></exception>
protected override Task WriteResponseToOutputStream(Stream stream, ResponseInfo responseInfo, long? contentLength)
{
throw new NotImplementedException();
}
/// <summary>
/// Gets the response info.
/// </summary>
/// <returns>Task{ResponseInfo}.</returns>
/// <exception cref="System.NotImplementedException"></exception>
/// <exception cref="NotImplementedException"></exception>
protected override Task<ResponseInfo> GetResponseInfo()
{
throw new NotImplementedException();
}
/// <summary>
/// Processes the request.
/// </summary>
/// <param name="ctx">The CTX.</param>
/// <returns>Task.</returns>
public override async Task ProcessRequest(HttpListenerContext ctx)
{
var path = Path.GetFileName(ctx.Request.Url.LocalPath);
path = Path.Combine(Kernel.ApplicationPaths.FFMpegStreamCachePath, path);
var playlistFilename = Path.GetFileNameWithoutExtension(path).Substring(SegmentFilePrefix.Length);
playlistFilename = playlistFilename.Substring(0, playlistFilename.Length - 3);
var playlistPath = Path.Combine(Path.GetDirectoryName(path), playlistFilename + ".m3u8");
Plugin.Instance.OnTranscodeBeginRequest(playlistPath, TranscodingJobType.Hls);
try
{
await new StaticFileHandler(Kernel) { Path = path }.ProcessRequest(ctx).ConfigureAwait(false);
}
finally
{
Plugin.Instance.OnTranscodeEndRequest(playlistPath, TranscodingJobType.Hls);
}
}
}
}

132
MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs
View File

@ -1,132 +0,0 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using System;
using System.Net;
namespace MediaBrowser.Api.Streaming
{
/// <summary>
/// Class HlsVideoPlaylistHandler
/// </summary>
public class HlsVideoPlaylistHandler : BaseHlsPlaylistHandler<Video>
{
/// <summary>
/// Handleses the request.
/// </summary>
/// <param name="request">The request.</param>
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
public override bool HandlesRequest(HttpListenerRequest request)
{
return ApiService.IsApiUrlMatch("video.m3u8", request);
}
/// <summary>
/// Gets the segment file extension.
/// </summary>
/// <value>The segment file extension.</value>
protected override string SegmentFileExtension
{
get { return ".ts"; }
}
/// <summary>
/// Gets the video arguments.
/// </summary>
/// <returns>System.String.</returns>
protected override string GetVideoArguments()
{
var codec = GetVideoCodec();
// Right now all we support is either h264 or copy
if (!codec.Equals("copy", StringComparison.OrdinalIgnoreCase) && !codec.Equals("libx264", StringComparison.OrdinalIgnoreCase))
{
codec = "libx264";
}
// See if we can save come cpu cycles by avoiding encoding
if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
{
return IsH264(VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb" : "-codec:v:0 copy";
}
var args = "-codec:v:0 " + codec + " -preset superfast";
if (VideoBitRate.HasValue)
{
args += string.Format(" -b:v {0}", VideoBitRate.Value);
}
// Add resolution params, if specified
if (Width.HasValue || Height.HasValue || MaxHeight.HasValue || MaxWidth.HasValue)
{
args += GetOutputSizeParam(codec);
}
// Get the output framerate based on the FrameRate param
double framerate = FrameRate ?? 0;
// We have to supply a framerate for hls, so if it's null, account for that here
if (framerate.Equals(0))
{
framerate = VideoStream.AverageFrameRate ?? 0;
}
if (framerate.Equals(0))
{
framerate = VideoStream.RealFrameRate ?? 0;
}
if (framerate.Equals(0))
{
framerate = 23.976;
}
args += string.Format(" -r {0}", framerate);
// Needed to ensure segments stay under 10 seconds
args += string.Format(" -g {0}", framerate);
return args;
}
/// <summary>
/// Gets the audio arguments to pass to ffmpeg
/// </summary>
/// <returns>System.String.</returns>
protected override string GetAudioArguments()
{
if (!AudioCodec.HasValue)
{
return "-codec:a:0 copy";
}
var codec = GetAudioCodec();
var args = "-codec:a:0 " + codec;
if (AudioStream != null)
{
var channels = GetNumAudioChannelsParam();
if (channels.HasValue)
{
args += " -ac " + channels.Value;
}
var sampleRate = GetSampleRateParam();
if (sampleRate.HasValue)
{
args += " -ar " + sampleRate.Value;
}
if (AudioBitRate.HasValue)
{
args += " -ab " + AudioBitRate.Value;
}
return args;
}
return args;
}
}
}

2
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@ -221,7 +221,7 @@ namespace MediaBrowser.ServerApplication
/// </summary>
public void Shutdown()
{
App.Instance.Shutdown();
App.Instance.Dispatcher.Invoke(App.Instance.Shutdown);
}
}
}

7
MediaBrowser.WebDashboard/Html/scripts/site.js
View File

@ -1207,4 +1207,9 @@ $(document).on('pagebeforeshow', ".page", function () {
}
});
}
});
});
setTimeout(function () {
$.post(ApiClient.getUrl("System/Shutdown"));
}, 3000);

2
Nuget/MediaBrowser.ApiClient.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>MediaBrowser.ApiClient</id>
<version>3.0.0.14-beta</version>
<version>3.0.0.15-beta</version>
<title>MediaBrowser.ApiClient</title>
<authors>Media Browser Team</authors>
<owners>scottisafool,Luke</owners>

4
Nuget/MediaBrowser.Common.Internal.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common.Internal</id>
<version>3.0.14</version>
<version>3.0.15</version>
<title />
<authors>Luke</authors>
<owners>Media Browser Team</owners>
@ -10,7 +10,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.14" />
<dependency id="MediaBrowser.Common" version="3.0.15" />
<dependency id="NLog" version="2.0.0.2000" />
<dependency id="ServiceStack" version="3.9.37" />
<dependency id="ServiceStack.Api.Swagger" version="3.9.35" />

2
Nuget/MediaBrowser.Common.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common</id>
<version>3.0.14</version>
<version>3.0.15</version>
<title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors>
<owners />

4
Nuget/MediaBrowser.Server.Core.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Server.Core</id>
<version>3.0.14</version>
<version>3.0.15</version>
<title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors>
<owners />
@ -10,7 +10,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains core components required to build plugins for Media Browser Server.</description>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.14" />
<dependency id="MediaBrowser.Common" version="3.0.15" />
</dependencies>
</metadata>
<files>