diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 16:55:05 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 16:55:05 -0400 |
| commit | cb39f8e7b5f71dcf0de2681d953b016e29adbc54 (patch) | |
| tree | fd2ef9a2a8b284a8810ece7b6ead4df0da3d133d /MediaBrowser.Api/Playback/Progressive/VideoService.cs | |
| parent | d14c3b31ff5665b03fee07aab46532fcf3069c1a (diff) | |
extracted a media encoding interface to keep ffmpeg out of nuget packages
Diffstat (limited to 'MediaBrowser.Api/Playback/Progressive/VideoService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/VideoService.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index 6c9cc8903..634906afc 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -1,5 +1,6 @@ using System.IO; using MediaBrowser.Common.IO; +using MediaBrowser.Common.MediaInfo; using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using System; @@ -46,8 +47,8 @@ namespace MediaBrowser.Api.Playback.Progressive /// </summary> public class VideoService : BaseProgressiveStreamingService { - public VideoService(IServerApplicationPaths appPaths, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager) - : base(appPaths, userManager, libraryManager, isoManager) + public VideoService(IServerApplicationPaths appPaths, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder) + : base(appPaths, userManager, libraryManager, isoManager, mediaEncoder) { } @@ -76,7 +77,7 @@ namespace MediaBrowser.Api.Playback.Progressive { var video = (Video)state.Item; - var probeSize = Kernel.Instance.FFMpegManager.GetProbeSizeArgument(video.VideoType, video.IsoType); + var probeSize = GetProbeSizeArgument(state.Item); // Get the output codec name var videoCodec = GetVideoCodec(state.VideoRequest); |
