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

refresh connect authorizations

Browse Source
This commit is contained in:
Luke Pulverenti 2014-10-12 13:31:41 -04:00
parent 84b62f22cf
commit cce120d8d3
8 changed files with 327 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -580,6 +580,10 @@ namespace MediaBrowser.Api
/// <summary>
/// The HLS
/// </summary>
Hls
Hls,
/// <summary>
/// The dash
/// </summary>
Dash
}
}

1
MediaBrowser.Api/MediaBrowser.Api.csproj
View File

@ -75,6 +75,7 @@
<Compile Include="Dlna\DlnaServerService.cs" />
<Compile Include="Dlna\DlnaService.cs" />
<Compile Include="Library\ChapterService.cs" />
<Compile Include="Playback\Hls\MpegDashService.cs" />
<Compile Include="PlaylistService.cs" />
<Compile Include="Subtitles\SubtitleService.cs" />
<Compile Include="Movies\CollectionService.cs" />

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

@ -695,13 +695,5 @@ namespace MediaBrowser.Api.Playback.Hls
{
return ".ts";
}
protected override TranscodingJobType TranscodingJobType
{
get
{
return TranscodingJobType.Hls;
}
}
}
}

271
MediaBrowser.Api/Playback/Hls/MpegDashService.cs Normal file
View File

@ -0,0 +1,271 @@
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Dlna;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Model.IO;
using ServiceStack;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace MediaBrowser.Api.Playback.Hls
{
/// <summary>
/// Options is needed for chromecast. Threw Head in there since it's related
/// </summary>
[Route("/Videos/{Id}/master.mpd", "GET", Summary = "Gets a video stream using Mpeg dash.")]
[Route("/Videos/{Id}/master.mpd", "HEAD", Summary = "Gets a video stream using Mpeg dash.")]
public class GetMasterManifest : VideoStreamRequest
{
public bool EnableAdaptiveBitrateStreaming { get; set; }
public GetMasterManifest()
{
EnableAdaptiveBitrateStreaming = true;
}
}
[Route("/Videos/{Id}/dash/{SegmentId}.ts", "GET")]
public class GetDashSegment : VideoStreamRequest
{
/// <summary>
/// Gets or sets the segment id.
/// </summary>
/// <value>The segment id.</value>
public string SegmentId { get; set; }
}
public class MpegDashService : BaseHlsService
{
protected INetworkManager NetworkManager { get; private set; }
public MpegDashService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, ILiveTvManager liveTvManager, IDlnaManager dlnaManager, IChannelManager channelManager, ISubtitleEncoder subtitleEncoder, INetworkManager networkManager)
: base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, liveTvManager, dlnaManager, channelManager, subtitleEncoder)
{
NetworkManager = networkManager;
}
public object Get(GetMasterManifest request)
{
var result = GetAsync(request, "GET").Result;
return result;
}
public object Head(GetMasterManifest request)
{
var result = GetAsync(request, "HEAD").Result;
return result;
}
private async Task<object> GetAsync(GetMasterManifest request, string method)
{
if (string.Equals(request.AudioCodec, "copy", StringComparison.OrdinalIgnoreCase))
{
throw new ArgumentException("Audio codec copy is not allowed here.");
}
if (string.Equals(request.VideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
{
throw new ArgumentException("Video codec copy is not allowed here.");
}
if (string.IsNullOrEmpty(request.MediaSourceId))
{
throw new ArgumentException("MediaSourceId is required");
}
var state = await GetState(request, CancellationToken.None).ConfigureAwait(false);
var playlistText = string.Empty;
if (string.Equals(method, "GET", StringComparison.OrdinalIgnoreCase))
{
playlistText = GetManifestText(state);
}
return ResultFactory.GetResult(playlistText, Common.Net.MimeTypes.GetMimeType("playlist.mpd"), new Dictionary<string, string>());
}
private string GetManifestText(StreamState state)
{
var audioBitrate = state.OutputAudioBitrate ?? 0;
var videoBitrate = state.OutputVideoBitrate ?? 0;
var builder = new StringBuilder();
var duration = "PT0H02M11.00S";
builder.AppendFormat(
"<MPD type=\"static\" minBufferTime=\"PT2S\" mediaPresentationDuration=\"{0}\" profiles=\"urn:mpeg:dash:profile:mp2t-simple:2011\" xmlns=\"urn:mpeg:DASH:schema:MPD:2011\" maxSegmentDuration=\"PT{1}S\">",
duration,
state.SegmentLength.ToString(CultureInfo.InvariantCulture));
builder.Append("<ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">");
builder.Append("</ProgramInformation>");
builder.AppendFormat("<Period start=\"PT0S\" duration=\"{0}\">", duration);
builder.Append("<AdaptationSet segmentAlignment=\"true\">");
builder.Append("<ContentComponent id=\"1\" contentType=\"video\"/>");
builder.Append("<ContentComponent id=\"2\" contentType=\"audio\" lang=\"eng\"/>");
builder.Append(GetRepresentationOpenElement(state));
AppendSegmentList(state, builder);
builder.Append("</Representation>");
builder.Append("</AdaptationSet>");
builder.Append("</Period>");
builder.Append("</MPD>");
return builder.ToString();
}
private string GetRepresentationOpenElement(StreamState state)
{
return
"<Representation id=\"1\" mimeType=\"video/mp2t\" codecs=\"avc1.640028,mp4a.40.02\" width=\"1280\" height=\"1024\" sampleRate=\"44100\" numChannels=\"2\" lang=\"und\" startWithSAP=\"1\" bandwidth=\"317599\">";
}
public object Get(GetDashSegment request)
{
return null;
}
private void AppendSegmentList(StreamState state, StringBuilder builder)
{
var seconds = TimeSpan.FromTicks(state.RunTimeTicks ?? 0).TotalSeconds;
builder.Append("<SegmentList timescale=\"1000\" duration=\"10000\">");
var queryStringIndex = Request.RawUrl.IndexOf('?');
var queryString = queryStringIndex == -1 ? string.Empty : Request.RawUrl.Substring(queryStringIndex);
var index = 0;
while (seconds > 0)
{
builder.AppendFormat("<SegmentURL media=\"{0}.ts{1}\"/>", index.ToString(UsCulture), queryString);
seconds -= state.SegmentLength;
index++;
}
builder.Append("</SegmentList>");
}
protected override string GetAudioArguments(StreamState state)
{
var codec = state.OutputAudioCodec;
if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
{
return "-codec:a:0 copy";
}
var args = "-codec:a:0 " + codec;
var channels = state.OutputAudioChannels;
if (channels.HasValue)
{
args += " -ac " + channels.Value;
}
var bitrate = state.OutputAudioBitrate;
if (bitrate.HasValue)
{
args += " -ab " + bitrate.Value.ToString(UsCulture);
}
args += " " + GetAudioFilterParam(state, true);
return args;
}
protected override string GetVideoArguments(StreamState state)
{
var codec = state.OutputVideoCodec;
// 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:v h264_mp4toannexb" : "-codec:v:0 copy";
}
var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
state.SegmentLength.ToString(UsCulture));
var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream;
var args = "-codec:v:0 " + codec + " " + GetVideoQualityParam(state, "libx264", true) + keyFrameArg;
// Add resolution params, if specified
if (!hasGraphicalSubs)
{
args += GetOutputSizeParam(state, codec, false);
}
// This is for internal graphical subs
if (hasGraphicalSubs)
{
args += GetGraphicalSubtitleParam(state, codec);
}
return args;
}
protected override string GetCommandLineArguments(string outputPath, string transcodingJobId, StreamState state, bool isEncoding)
{
var threads = GetNumberOfThreads(state, false);
var inputModifier = GetInputModifier(state);
// If isEncoding is true we're actually starting ffmpeg
var startNumberParam = isEncoding ? GetStartNumber(state).ToString(UsCulture) : "0";
var args = string.Format("{0} -i {1} -map_metadata -1 -threads {2} {3} {4} -copyts -flags -global_header {5} -hls_time {6} -start_number {7} -hls_list_size {8} -y \"{9}\"",
inputModifier,
GetInputArgument(transcodingJobId, state),
threads,
GetMapArgs(state),
GetVideoArguments(state),
GetAudioArguments(state),
state.SegmentLength.ToString(UsCulture),
startNumberParam,
state.HlsListSize.ToString(UsCulture),
outputPath
).Trim();
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";
}
protected override TranscodingJobType TranscodingJobType
{
get
{
return TranscodingJobType.Dash;
}
}
}
}

4
MediaBrowser.Common/Net/MimeTypes.cs
View File

@ -146,6 +146,10 @@ namespace MediaBrowser.Common.Net
{
return "video/mp2t";
}
if (ext.Equals(".mpd", StringComparison.OrdinalIgnoreCase))
{
return "video/vnd.mpeg.dash.mpd";
}
// Catch-all for all video types that don't require specific mime types
if (VideoFileExtensionsDictionary.ContainsKey(ext))

4
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -1575,9 +1575,7 @@ namespace MediaBrowser.Controller.Entities
{
Path = path,
DateModified = FileSystem.GetLastWriteTimeUtc(path),
Type = imageType,
Width = chapter.ImageWidth,
Height = chapter.ImageHeight
Type = imageType
};
}

12
MediaBrowser.Model/Entities/ChapterInfo.cs
View File

@ -23,17 +23,5 @@ namespace MediaBrowser.Model.Entities
/// </summary>
/// <value>The image path.</value>
public string ImagePath { get; set; }
/// <summary>
/// Gets or sets the height of the image.
/// </summary>
/// <value>The height of the image.</value>
public int? ImageHeight { get; set; }
/// <summary>
/// Gets or sets the width of the image.
/// </summary>
/// <value>The width of the image.</value>
public int? ImageWidth { get; set; }
}
}

47
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@ -14,6 +14,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
@ -133,8 +134,7 @@ namespace MediaBrowser.Server.Implementations.Connect
}
catch (HttpException ex)
{
if (!ex.StatusCode.HasValue || ex.StatusCode.Value != HttpStatusCode.NotFound ||
ex.StatusCode.Value != HttpStatusCode.Unauthorized)
if (!ex.StatusCode.HasValue || !new[] { HttpStatusCode.NotFound, HttpStatusCode.Unauthorized }.Contains(ex.StatusCode.Value))
{
throw;
}
@ -147,6 +147,8 @@ namespace MediaBrowser.Server.Implementations.Connect
{
await CreateServerRegistration(wanApiAddress).ConfigureAwait(false);
}
await RefreshAuthorizations(CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
@ -435,5 +437,46 @@ namespace MediaBrowser.Server.Implementations.Connect
{
options.RequestHeaders.Add("X-Connect-Token", ConnectAccessKey);
}
public async Task RefreshAuthorizations(CancellationToken cancellationToken)
{
var url = GetConnectUrl("ServerAuthorizations");
var options = new HttpRequestOptions
{
Url = url,
CancellationToken = cancellationToken
};
var postData = new Dictionary<string, string>
{
{"serverId", ConnectServerId}
};
options.SetPostData(postData);
SetServerAccessToken(options);
try
{
// No need to examine the response
using (var stream = (await _httpClient.SendAsync(options, "POST").ConfigureAwait(false)).Content)
{
var list = _json.DeserializeFromStream<List<ServerUserAuthorizationResponse>>(stream);
RefreshAuthorizations(list);
}
}
catch (Exception ex)
{
_logger.ErrorException("Error refreshing server authorizations.", ex);
}
}
private void RefreshAuthorizations(List<ServerUserAuthorizationResponse> list)
{
}
}
}