added mpeg4 as an available output codec
This commit is contained in:
parent
8397b37827
commit
5a3b5a58a5
|
@ -428,6 +428,8 @@ namespace MediaBrowser.Api.Playback
|
||||||
{
|
{
|
||||||
return "wmav2";
|
return "wmav2";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return codec.ToString().ToLower();
|
||||||
}
|
}
|
||||||
|
|
||||||
return "copy";
|
return "copy";
|
||||||
|
@ -460,6 +462,8 @@ namespace MediaBrowser.Api.Playback
|
||||||
{
|
{
|
||||||
return "libtheora";
|
return "libtheora";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return codec.ToString().ToLower();
|
||||||
}
|
}
|
||||||
|
|
||||||
return "copy";
|
return "copy";
|
||||||
|
|
|
@ -250,6 +250,10 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||||
{
|
{
|
||||||
args = "-preset superfast";
|
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)
|
if (request.VideoBitRate.HasValue)
|
||||||
{
|
{
|
||||||
|
|
|
@ -70,7 +70,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
/// Gets or sets the video codec.
|
/// Gets or sets the video codec.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The video codec.</value>
|
/// <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; }
|
public VideoCodecs? VideoCodec { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -168,6 +168,11 @@
|
||||||
/// </summary>
|
/// </summary>
|
||||||
H264,
|
H264,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The mpeg4
|
||||||
|
/// </summary>
|
||||||
|
Mpeg4,
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The theora
|
/// The theora
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user