update live stream management

pull/1154/head
Luke Pulverenti 8 years ago
parent 3b06092f69
commit 463cb3e354

@ -37,7 +37,6 @@ namespace MediaBrowser.Api.Playback
public string Params { get; set; }
public string PlaySessionId { get; set; }
public string LiveStreamId { get; set; }
public string Tag { get; set; }
public string SegmentContainer { get; set; }

@ -192,6 +192,7 @@ namespace MediaBrowser.Controller.MediaEncoding
public int? TranscodingMaxAudioChannels { get; set; }
public int? CpuCoreLimit { get; set; }
public string OutputContainer { get; set; }
public string LiveStreamId { get; set; }
/// <summary>
/// Gets or sets the video codec.

@ -350,7 +350,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationToken).ConfigureAwait(false);
}
if (state.MediaSource.RequiresOpening && string.IsNullOrWhiteSpace(state.LiveStreamId))
if (state.MediaSource.RequiresOpening && string.IsNullOrWhiteSpace(state.Options.LiveStreamId))
{
var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
{

@ -38,7 +38,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
public bool EstimateContentLength { get; set; }
public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
public long? EncodingDurationTicks { get; set; }
public string LiveStreamId { get; set; }
public string ItemType { get; set; }
@ -94,7 +93,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
private async void DisposeLiveStream()
{
if (MediaSource.RequiresClosing)
if (MediaSource.RequiresClosing && string.IsNullOrWhiteSpace(Options.LiveStreamId) && !string.IsNullOrWhiteSpace(MediaSource.LiveStreamId))
{
try
{

Loading…
Cancel
Save