aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-09 10:23:01 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-09 10:23:01 -0400
commit41fb933e5d7795e74c041e18971ce4ac568c9632 (patch)
treede59045e85944fb1da3a7436af336a1eb0d56fde
parent50f4dcc8eaea1d6deb51012e3f34c9005c83d464 (diff)
fixes #256 - Webm threads
-rw-r--r--MediaBrowser.Api/Playback/Progressive/VideoService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index 3ad8b9371..117b6033f 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -108,7 +108,9 @@ namespace MediaBrowser.Api.Playback.Progressive
format = " -f mp4 -movflags frag_keyframe+empty_moov";
}
- return string.Format("{0} {1} {2} -i {3}{4}{5} {6} {7} -threads 0 {8}{9} \"{10}\"",
+ var threads = string.Equals(videoCodec, "libvpx", StringComparison.OrdinalIgnoreCase) ? 2 : 0;
+
+ return string.Format("{0} {1} {2} -i {3}{4}{5} {6} {7} -threads {8} {9}{10} \"{11}\"",
probeSize,
GetUserAgentParam(state.Item),
GetFastSeekCommandLineParameter(state.Request),
@@ -117,6 +119,7 @@ namespace MediaBrowser.Api.Playback.Progressive
keyFrame,
GetMapArgs(state),
GetVideoArguments(state, videoCodec, performSubtitleConversions),
+ threads,
GetAudioArguments(state),
format,
outputPath