4 files changed, 27 insertions, 26 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index bb55b893a2..b950625673 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -185,9 +185,9 @@ namespace MediaBrowser.Api.Playback
         {
             var args = string.Empty;
 
-            if (state.IsRemote || !state.HasMediaStreams)
+            if (!state.HasMediaStreams)
             {
-                return string.Empty;
+                return state.IsInputVideo ? "-map -0:s" : string.Empty;
             }
 
             if (state.VideoStream != null)
@@ -1341,6 +1341,12 @@ namespace MediaBrowser.Api.Playback
                 RequestedUrl = url
             };
 
+            if (!string.IsNullOrWhiteSpace(request.AudioCodec))
+            {
+                state.SupportedAudioCodecs = request.AudioCodec.Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+                state.Request.AudioCodec = state.SupportedAudioCodecs.FirstOrDefault();
+            }
+
             var item = string.IsNullOrEmpty(request.MediaSourceId) ?
                 DtoService.GetItemByDtoId(request.Id) :
                 DtoService.GetItemByDtoId(request.MediaSourceId);
@@ -1492,10 +1498,10 @@ namespace MediaBrowser.Api.Playback
                     videoRequest.VideoCodec = "copy";
                 }
 
-                //if (state.AudioStream != null && CanStreamCopyAudio(request, state.AudioStream))
-                //{
-                //    request.AudioCodec = "copy";
-                //}
+                if (state.AudioStream != null && CanStreamCopyAudio(request, state.AudioStream, state.SupportedAudioCodecs))
+                {
+                    request.AudioCodec = "copy";
+                }
             }
 
             return state;
@@ -1584,13 +1590,13 @@ namespace MediaBrowser.Api.Playback
                 }
             }
 
-            return SupportsAutomaticVideoStreamCopy;
+            return request.EnableAutoStreamCopy;
         }
 
-        private bool CanStreamCopyAudio(StreamRequest request, MediaStream audioStream)
+        private bool CanStreamCopyAudio(StreamRequest request, MediaStream audioStream, List<string> supportedAudioCodecs)
         {
             // Source and target codecs must match
-            if (string.IsNullOrEmpty(request.AudioCodec) || !string.Equals(request.AudioCodec, audioStream.Codec, StringComparison.OrdinalIgnoreCase))
+            if (string.IsNullOrEmpty(audioStream.Codec) || !supportedAudioCodecs.Contains(audioStream.Codec, StringComparer.OrdinalIgnoreCase))
             {
                 return false;
             }
@@ -1623,15 +1629,7 @@ namespace MediaBrowser.Api.Playback
                 }
             }
 
-            return SupportsAutomaticVideoStreamCopy;
-        }
-
-        protected virtual bool SupportsAutomaticVideoStreamCopy
-        {
-            get
-            {
-                return false;
-            }
+            return true;
         }
 
         private void ApplyDeviceProfileSettings(StreamState state)
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index bedf742c2c..1bca4cae9a 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -98,14 +98,6 @@ namespace MediaBrowser.Api.Playback.Hls
             ApiEntryPoint.Instance.OnTranscodeEndRequest(playlist, TranscodingJobType.Hls);
         }
 
-        protected override bool SupportsAutomaticVideoStreamCopy
-        {
-            get
-            {
-                return true;
-            }
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs
index add517b5da..d5355783e8 100644
--- a/MediaBrowser.Api/Playback/StreamRequest.cs
+++ b/MediaBrowser.Api/Playback/StreamRequest.cs
@@ -171,5 +171,13 @@ namespace MediaBrowser.Api.Playback
                 return Width.HasValue || Height.HasValue;
             }
         }
+
+        [ApiMember(Name = "EnableAutoStreamCopy", Description = "Whether or not to allow automatic stream copy if requested values match the original source. Defaults to true.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+        public bool EnableAutoStreamCopy { get; set; }
+
+        public VideoStreamRequest()
+        {
+            EnableAutoStreamCopy = true;
+        }
     }
 }
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index ce7d79917a..e41f296638 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -67,10 +67,13 @@ namespace MediaBrowser.Api.Playback
         public string AudioSync = "1";
         public string VideoSync = "vfr";
 
+        public List<string> SupportedAudioCodecs { get; set; }
+
         public StreamState(ILiveTvManager liveTvManager, ILogger logger)
         {
             _liveTvManager = liveTvManager;
             _logger = logger;
+            SupportedAudioCodecs = new List<string>();
         }
 
         public string InputAudioSync { get; set; }