diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-06 01:05:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 01:05:11 -0500 |
| commit | 6f1a300bdef907415160728670726735067efc7a (patch) | |
| tree | f74ffd55b84f50b36f7f99b75dc10c5c27bc5b91 /MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs | |
| parent | fab2e0c227a1ad5ba70f3f0ba88f7fa451676376 (diff) | |
| parent | f94353250f92f63fad63c9ab6d7e48c8b82dba97 (diff) | |
Merge pull request #2444 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs index 09b842630..83057dba4 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs @@ -159,6 +159,10 @@ namespace MediaBrowser.MediaEncoding.Encoder { return "matroska"; } + if (string.Equals(container, "ts", StringComparison.OrdinalIgnoreCase)) + { + return "mpegts"; + } return container; } @@ -1482,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; |