aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-09-28 14:07:01 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-09-28 14:07:01 -0400
commitb4984a78fd1d07b46c25eb1c776e92205063771d (patch)
tree1587b4d28bb59973cb81b24632b011f019b5f09c
parentc07596dbb4672ab1c0959d4db717c5e51b77df10 (diff)
fix stream copy requiring a bitrate
-rw-r--r--MediaBrowser.Api/Playback/Hls/BaseHlsService.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 05441bba7..2fb7f8142 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -6,6 +6,7 @@ using MediaBrowser.Controller;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Dto;
using MediaBrowser.Model.IO;
using System;
using System.Collections.Generic;
@@ -91,11 +92,11 @@ namespace MediaBrowser.Api.Playback.Hls
/// <returns>Task{System.Object}.</returns>
public async Task<object> ProcessRequestAsync(StreamState state)
{
- if (!state.VideoRequest.VideoBitRate.HasValue)
+ if (!state.VideoRequest.VideoBitRate.HasValue && (!state.VideoRequest.VideoCodec.HasValue || state.VideoRequest.VideoCodec.Value != VideoCodecs.Copy))
{
throw new ArgumentException("A video bitrate is required");
}
- if (!state.Request.AudioBitRate.HasValue)
+ if (!state.Request.AudioBitRate.HasValue && (!state.Request.AudioCodec.HasValue || state.Request.AudioCodec.Value != AudioCodecs.Copy))
{
throw new ArgumentException("An audio bitrate is required");
}