cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 10:29:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Techywarrior 2013-04-03 20:56:24 -07:00
commit 54ac6c2d88
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,6 +428,8 @@ namespace MediaBrowser.Api.Playback
{
return "wmav2";
}
return codec.ToString().ToLower();
}
return "copy";
@ -460,6 +462,8 @@ namespace MediaBrowser.Api.Playback
{
return "libtheora";
}
return codec.ToString().ToLower();
}
return "copy";

6
MediaBrowser.Api/Playback/Progressive/VideoService.cs
View File

@ -250,7 +250,11 @@ namespace MediaBrowser.Api.Playback.Progressive
{
args = "-preset superfast";
}
else if (videoCodec.Equals("mpeg4", StringComparison.OrdinalIgnoreCase))
{
args = "-mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2 -bf 2";
}
if (request.VideoBitRate.HasValue)
{
args += " -b:v " + request.VideoBitRate;

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

@ -70,7 +70,7 @@ namespace MediaBrowser.Api.Playback
/// Gets or sets the video codec.
/// </summary>
/// <value>The video codec.</value>
[ApiMember(Name = "VideoCodec", Description = "Optional. Specify a video codec to encode to, e.g. h264. If omitted the server will auto-select using the url's extension. Options: h264, theora, vpx, wmv.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
[ApiMember(Name = "VideoCodec", Description = "Optional. Specify a video codec to encode to, e.g. h264. If omitted the server will auto-select using the url's extension. Options: h264, mpeg4, theora, vpx, wmv.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public VideoCodecs? VideoCodec { get; set; }
/// <summary>

5
MediaBrowser.Model/DTO/StreamOptions.cs
View File

@ -168,6 +168,11 @@
/// </summary>
H264,
/// <summary>
/// The mpeg4
/// </summary>
Mpeg4,
/// <summary>
/// The theora
/// </summary>