mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-03 19:17:24 -05:00 
			
		
		
		
	restore features
This commit is contained in:
		
							parent
							
								
									f94353250f
								
							
						
					
					
						commit
						b35051463b
					
				@ -155,8 +155,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 | 
				
			|||||||
            var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
 | 
					            var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
 | 
				
			||||||
            var inputModifiers = "-fflags +genpts -async 1 -vsync -1";
 | 
					            var inputModifiers = "-fflags +genpts -async 1 -vsync -1";
 | 
				
			||||||
            var mapArgs = string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase) ? "-map 0" : "-sn";
 | 
					            var mapArgs = string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase) ? "-map 0" : "-sn";
 | 
				
			||||||
            // temporary
 | 
					 | 
				
			||||||
            mapArgs = "-sn";
 | 
					 | 
				
			||||||
            var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
 | 
					            var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            long startTimeTicks = 0;
 | 
					            long startTimeTicks = 0;
 | 
				
			||||||
 | 
				
			|||||||
@ -1486,33 +1486,33 @@ namespace MediaBrowser.MediaEncoding.Encoder
 | 
				
			|||||||
                    //inputModifier += " -noaccurate_seek";
 | 
					                    //inputModifier += " -noaccurate_seek";
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                //if (!string.IsNullOrWhiteSpace(state.InputContainer))
 | 
					                if (!string.IsNullOrWhiteSpace(state.InputContainer))
 | 
				
			||||||
                //{
 | 
					                {
 | 
				
			||||||
                //    var inputFormat = GetInputFormat(state.InputContainer);
 | 
					                    var inputFormat = GetInputFormat(state.InputContainer);
 | 
				
			||||||
                //    if (!string.IsNullOrWhiteSpace(inputFormat))
 | 
					                    if (!string.IsNullOrWhiteSpace(inputFormat))
 | 
				
			||||||
                //    {
 | 
					                    {
 | 
				
			||||||
                //        inputModifier += " -f " + inputFormat;
 | 
					                        inputModifier += " -f " + inputFormat;
 | 
				
			||||||
                //    }
 | 
					                    }
 | 
				
			||||||
                //}
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                //if (state.RunTimeTicks.HasValue)
 | 
					                if (state.RunTimeTicks.HasValue)
 | 
				
			||||||
                //{
 | 
					                {
 | 
				
			||||||
                //    foreach (var stream in state.MediaSource.MediaStreams)
 | 
					                    foreach (var stream in state.MediaSource.MediaStreams)
 | 
				
			||||||
                //    {
 | 
					                    {
 | 
				
			||||||
                //        if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle)
 | 
					                        if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle)
 | 
				
			||||||
                //        {
 | 
					                        {
 | 
				
			||||||
                //            if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1)
 | 
					                            if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1)
 | 
				
			||||||
                //            {
 | 
					                            {
 | 
				
			||||||
                //                var decoder = GetDecoderFromCodec(stream.Codec);
 | 
					                                var decoder = GetDecoderFromCodec(stream.Codec);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                //                if (!string.IsNullOrWhiteSpace(decoder))
 | 
					                                if (!string.IsNullOrWhiteSpace(decoder))
 | 
				
			||||||
                //                {
 | 
					                                {
 | 
				
			||||||
                //                    inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
 | 
					                                    inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
 | 
				
			||||||
                //                }
 | 
					                                }
 | 
				
			||||||
                //            }
 | 
					                            }
 | 
				
			||||||
                //        }
 | 
					                        }
 | 
				
			||||||
                //    }
 | 
					                    }
 | 
				
			||||||
                //}
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            return inputModifier;
 | 
					            return inputModifier;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user