unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

video streaming

Browse Source
This commit is contained in:
LukePulverenti
2013-02-26 23:44:41 -05:00
parent 511328edf9
commit ff6325efc5
10 changed files with 106 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MediaBrowser.Api/Playback/Progressive/AudioService.cs
+6 -6
View File
@@ -7,12 +7,12 @@ namespace MediaBrowser.Api.Playback.Progressive
/// <summary>
/// Class GetAudioStream
/// </summary>
[Route("/Audio/{Id}.mp3", "GET")]
[Route("/Audio/{Id}.wma", "GET")]
[Route("/Audio/{Id}.aac", "GET")]
[Route("/Audio/{Id}.flac", "GET")]
[Route("/Audio/{Id}.ogg", "GET")]
[Route("/Audio/{Id}", "GET")]
[Route("/Audio/{Id}/stream.mp3", "GET")]
[Route("/Audio/{Id}/stream.wma", "GET")]
[Route("/Audio/{Id}/stream.aac", "GET")]
[Route("/Audio/{Id}/stream.flac", "GET")]
[Route("/Audio/{Id}/stream.ogg", "GET")]
[Route("/Audio/{Id}/stream", "GET")]
public class GetAudioStream : StreamRequest
{
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+4 -1
View File
@@ -1,4 +1,5 @@
using MediaBrowser.Controller;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Dto;
@@ -123,6 +124,8 @@ namespace MediaBrowser.Api.Playback.Progressive
// Use the command line args with a dummy playlist path
var outputPath = GetOutputFilePath(state);
Response.ContentType = MimeTypes.GetMimeType(outputPath);
if (!File.Exists(outputPath))
{
await StartFFMpeg(state, outputPath).ConfigureAwait(false);
MediaBrowser.Api/Playback/Progressive/VideoService.cs
+30 -1
View File
@@ -1,10 +1,29 @@
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Logging;
using System;
using ServiceStack.ServiceHost;
namespace MediaBrowser.Api.Playback.Progressive
{
/// <summary>
/// Class GetAudioStream
/// </summary>
[Route("/Videos/{Id}/stream.ts", "GET")]
[Route("/Videos/{Id}/stream.webm", "GET")]
[Route("/Videos/{Id}/stream.asf", "GET")]
[Route("/Videos/{Id}/stream.wmv", "GET")]
[Route("/Videos/{Id}/stream.ogv", "GET")]
[Route("/Videos/{Id}/stream.mp4", "GET")]
[Route("/Videos/{Id}/stream.m4v", "GET")]
[Route("/Videos/{Id}/stream.mkv", "GET")]
[Route("/Videos/{Id}/stream.mpeg", "GET")]
[Route("/Videos/{Id}/stream.avi", "GET")]
[Route("/Videos/{Id}/stream", "GET")]
public class GetVideoStream : StreamRequest
{
}
/// <summary>
/// Class VideoService
/// </summary>
@@ -19,6 +38,16 @@ namespace MediaBrowser.Api.Playback.Progressive
{
}
/// <summary>
/// Gets the specified request.
/// </summary>
/// <param name="request">The request.</param>
/// <returns>System.Object.</returns>
public object Get(GetVideoStream request)
{
return ProcessRequest(request);
}
/// <summary>
/// Gets the command line arguments.
/// </summary>