From fdd8c67162233659656d3c719a6734cbe5f87d9f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 22 Apr 2014 20:50:47 -0400 Subject: add correct media format profiles to res elements --- .../Encoder/InternalEncodingTaskFactory.cs | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs') diff --git a/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs index e6b67b0df..f52f072df 100644 --- a/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs +++ b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs @@ -262,31 +262,31 @@ namespace MediaBrowser.MediaEncoding.Encoder videoCodec = state.VideoStream.Codec; } - var mediaProfile = state.VideoRequest == null ? - profile.GetAudioMediaProfile(container, audioCodec, state.AudioStream) : - profile.GetVideoMediaProfile(container, audioCodec, videoCodec, state.AudioStream, state.VideoStream); - - if (mediaProfile != null) - { - state.MimeType = mediaProfile.MimeType; - state.OrgPn = mediaProfile.OrgPn; - } - - var transcodingProfile = state.VideoRequest == null ? - profile.GetAudioTranscodingProfile(container, audioCodec) : - profile.GetVideoTranscodingProfile(container, audioCodec, videoCodec); - - if (transcodingProfile != null) - { - //state.EstimateContentLength = transcodingProfile.EstimateContentLength; - state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode; - //state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo; - - if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.VideoProfile)) - { - state.VideoRequest.VideoProfile = transcodingProfile.VideoProfile; - } - } + //var mediaProfile = state.VideoRequest == null ? + // profile.GetAudioMediaProfile(container, audioCodec) : + // profile.GetVideoMediaProfile(container, audioCodec, videoCodec, state.AudioStream, state.VideoStream); + + //if (mediaProfile != null) + //{ + // state.MimeType = mediaProfile.MimeType; + // state.OrgPn = mediaProfile.OrgPn; + //} + + //var transcodingProfile = state.VideoRequest == null ? + // profile.GetAudioTranscodingProfile(container, audioCodec) : + // profile.GetVideoTranscodingProfile(container, audioCodec, videoCodec); + + //if (transcodingProfile != null) + //{ + // //state.EstimateContentLength = transcodingProfile.EstimateContentLength; + // state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode; + // //state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo; + + // if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.VideoProfile)) + // { + // state.VideoRequest.VideoProfile = transcodingProfile.VideoProfile; + // } + //} } private EncodingQuality GetQualitySetting() -- cgit v1.2.3