aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-06 01:04:38 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-06 01:04:38 -0500
commitf94353250f92f63fad63c9ab6d7e48c8b82dba97 (patch)
tree7e515020516c3a2120f93cc59312b87fff2a08da
parent2a34c30313a300a109b76b9d29edbf916a86dbe2 (diff)
disable input modifiers for now
-rw-r--r--Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs2
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs54
2 files changed, 29 insertions, 27 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index 68126f926..1f739b3c6 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -155,6 +155,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
var inputModifiers = "-fflags +genpts -async 1 -vsync -1";
var mapArgs = string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase) ? "-map 0" : "-sn";
+ // temporary
+ mapArgs = "-sn";
var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
long startTimeTicks = 0;
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
index ed9552964..83057dba4 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
@@ -1486,33 +1486,33 @@ namespace MediaBrowser.MediaEncoding.Encoder
//inputModifier += " -noaccurate_seek";
}
- if (!string.IsNullOrWhiteSpace(state.InputContainer))
- {
- var inputFormat = GetInputFormat(state.InputContainer);
- if (!string.IsNullOrWhiteSpace(inputFormat))
- {
- inputModifier += " -f " + inputFormat;
- }
- }
-
- if (state.RunTimeTicks.HasValue)
- {
- foreach (var stream in state.MediaSource.MediaStreams)
- {
- if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle)
- {
- if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1)
- {
- var decoder = GetDecoderFromCodec(stream.Codec);
-
- if (!string.IsNullOrWhiteSpace(decoder))
- {
- inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
- }
- }
- }
- }
- }
+ //if (!string.IsNullOrWhiteSpace(state.InputContainer))
+ //{
+ // var inputFormat = GetInputFormat(state.InputContainer);
+ // if (!string.IsNullOrWhiteSpace(inputFormat))
+ // {
+ // inputModifier += " -f " + inputFormat;
+ // }
+ //}
+
+ //if (state.RunTimeTicks.HasValue)
+ //{
+ // foreach (var stream in state.MediaSource.MediaStreams)
+ // {
+ // if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle)
+ // {
+ // if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1)
+ // {
+ // var decoder = GetDecoderFromCodec(stream.Codec);
+
+ // if (!string.IsNullOrWhiteSpace(decoder))
+ // {
+ // inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
+ // }
+ // }
+ // }
+ // }
+ //}
}
return inputModifier;