open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add error handling

Browse Source
pull/1154/head
Luke Pulverenti 8 years ago
parent 6405f6c0c7
commit 35415d6a50
3 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File

1
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
Unescape View File

@ -155,6 +155,7 @@ 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";
mapArgs = "-sn";
var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
long startTimeTicks = 0;

3
Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
Unescape View File

@ -50,6 +50,8 @@ namespace Emby.Server.Implementations.LiveTv
{
var channel = _liveTvManager.GetInternalChannel(liveTvItem.ChannelId);
if (channel != null)
{
var response = await service.GetProgramImageAsync(GetItemExternalId(liveTvItem), GetItemExternalId(channel), cancellationToken).ConfigureAwait(false);
if (response != null)
@ -59,6 +61,7 @@ namespace Emby.Server.Implementations.LiveTv
imageResponse.Format = response.Format;
}
}
}
catch (NotImplementedException)
{
}

52
MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
Unescape View File

@ -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(state.InputContainer))
//{
// var inputFormat = GetInputFormat(state.InputContainer);
// if (!string.IsNullOrWhiteSpace(inputFormat))
// {
// inputModifier += " -f " + inputFormat;
// }
//}
if (!string.IsNullOrWhiteSpace(decoder))
{
inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
}
}
}
}
}
//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;

Write Preview
Loading…
Cancel
Save