StreamingHelpers.cs (jellyfin-10.8.9) | : | StreamingHelpers.cs (jellyfin-10.8.10) | ||
---|---|---|---|---|
skipping to change at line 185 | skipping to change at line 185 | |||
containerInternal = streamingRequest.Container; | containerInternal = streamingRequest.Container; | |||
} | } | |||
if (string.IsNullOrEmpty(containerInternal)) | if (string.IsNullOrEmpty(containerInternal)) | |||
{ | { | |||
containerInternal = streamingRequest.Static ? | containerInternal = streamingRequest.Static ? | |||
StreamBuilder.NormalizeMediaSourceFormatIntoSingleContainer( state.InputContainer, null, DlnaProfileType.Audio) | StreamBuilder.NormalizeMediaSourceFormatIntoSingleContainer( state.InputContainer, null, DlnaProfileType.Audio) | |||
: GetOutputFileExtension(state, mediaSource); | : GetOutputFileExtension(state, mediaSource); | |||
} | } | |||
state.OutputContainer = (containerInternal ?? string.Empty).TrimStar | var outputAudioCodec = streamingRequest.AudioCodec; | |||
t('.'); | if (EncodingHelper.LosslessAudioCodecs.Contains(outputAudioCodec)) | |||
{ | ||||
state.OutputAudioBitrate = encodingHelper.GetAudioBitrateParam(strea | state.OutputAudioBitrate = state.AudioStream.BitRate ?? 0; | |||
mingRequest.AudioBitRate, streamingRequest.AudioCodec, state.AudioStream); | } | |||
else | ||||
state.OutputAudioCodec = streamingRequest.AudioCodec; | { | |||
state.OutputAudioBitrate = encodingHelper.GetAudioBitrateParam(s | ||||
treamingRequest.AudioBitRate, streamingRequest.AudioCodec, state.AudioStream, st | ||||
ate.OutputAudioChannels) ?? 0; | ||||
} | ||||
state.OutputAudioCodec = outputAudioCodec; | ||||
state.OutputContainer = (containerInternal ?? string.Empty).TrimStar | ||||
t('.'); | ||||
state.OutputAudioChannels = encodingHelper.GetNumAudioChannelsParam( state, state.AudioStream, state.OutputAudioCodec); | state.OutputAudioChannels = encodingHelper.GetNumAudioChannelsParam( state, state.AudioStream, state.OutputAudioCodec); | |||
if (state.VideoRequest != null) | if (state.VideoRequest != null) | |||
{ | { | |||
state.OutputVideoCodec = state.Request.VideoCodec; | state.OutputVideoCodec = state.Request.VideoCodec; | |||
state.OutputVideoBitrate = encodingHelper.GetVideoBitrateParamVa lue(state.VideoRequest, state.VideoStream, state.OutputVideoCodec); | state.OutputVideoBitrate = encodingHelper.GetVideoBitrateParamVa lue(state.VideoRequest, state.VideoStream, state.OutputVideoCodec); | |||
encodingHelper.TryStreamCopy(state); | encodingHelper.TryStreamCopy(state); | |||
if (!EncodingHelper.IsCopyCodec(state.OutputVideoCodec) && state .OutputVideoBitrate.HasValue) | if (!EncodingHelper.IsCopyCodec(state.OutputVideoCodec) && state .OutputVideoBitrate.HasValue) | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 14 lines changed or added |