pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

dont log progress on hls direct; fix tests

pull/2808/head
Jason Dove 6 months ago
parent
9a328352c5
commit
f0404046f5
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ErsatzTV.FFmpeg.Tests/PipelineBuilderBaseTests.cs
  2. 2
      ErsatzTV.FFmpeg/Pipeline/PipelineBuilderBase.cs

4
ErsatzTV.FFmpeg.Tests/PipelineBuilderBaseTests.cs
Unescape View File

@ -122,7 +122,7 @@ public class PipelineBuilderBaseTests
string command = PrintCommand(videoInputFile, audioInputFile, None, None, None, result); string command = PrintCommand(videoInputFile, audioInputFile, None, None, None, result);
command.ShouldBe( command.ShouldBe(
"-nostdin -hide_banner -nostats -loglevel error -fflags +genpts+discardcorrupt+igndts -ss 00:00:01 -c:v h264 -readrate 1.05 -i /tmp/whatever.mkv -filter_complex [0:1]aresample=async=1[a] -map 0:0 -map [a] -muxdelay 0 -muxpreload 0 -movflags +faststart -flags cgop -bf 0 -sc_threshold 0 -video_track_timescale 90000 -b:v 2000k -maxrate:v 2000k -bufsize:v 4000k -c:v libx265 -tag:v hvc1 -x265-params log-level=error -c:a aac -b:a 320k -maxrate:a 320k -bufsize:a 640k -ar 48k -f mpegts -mpegts_flags +initial_discontinuity pipe:1"); "-nostdin -hide_banner -nostats -loglevel error -fflags +genpts+discardcorrupt+igndts -progress - -ss 00:00:01 -c:v h264 -readrate 1.05 -i /tmp/whatever.mkv -filter_complex [0:1]aresample=async=1[a] -map 0:0 -map [a] -muxdelay 0 -muxpreload 0 -movflags +faststart -flags cgop -bf 0 -sc_threshold 0 -video_track_timescale 90000 -b:v 2000k -maxrate:v 2000k -bufsize:v 4000k -c:v libx265 -tag:v hvc1 -x265-params log-level=error -c:a aac -b:a 320k -maxrate:a 320k -bufsize:a 640k -ar 48k -f mpegts -mpegts_flags +initial_discontinuity pipe:1");
} }
[Test] [Test]
@ -225,7 +225,7 @@ public class PipelineBuilderBaseTests
string command = PrintCommand(videoInputFile, audioInputFile, None, None, None, result); string command = PrintCommand(videoInputFile, audioInputFile, None, None, None, result);
command.ShouldBe( command.ShouldBe(
"-nostdin -hide_banner -nostats -loglevel error -fflags +genpts+discardcorrupt+igndts -ss 00:00:01 -c:v h264 -readrate 1.05 -i /tmp/whatever.mkv -filter_complex [0:1]aresample=async=1[a] -map 0:0 -map [a] -muxdelay 0 -muxpreload 0 -movflags +faststart -flags cgop -bf 0 -sc_threshold 0 -video_track_timescale 90000 -b:v 2000k -maxrate:v 2000k -bufsize:v 4000k -c:v libx265 -tag:v hvc1 -x265-params log-level=error -c:a aac -ac 6 -b:a 320k -maxrate:a 320k -bufsize:a 640k -ar 48k -f mpegts -mpegts_flags +initial_discontinuity pipe:1"); "-nostdin -hide_banner -nostats -loglevel error -fflags +genpts+discardcorrupt+igndts -progress - -ss 00:00:01 -c:v h264 -readrate 1.05 -i /tmp/whatever.mkv -filter_complex [0:1]aresample=async=1[a] -map 0:0 -map [a] -muxdelay 0 -muxpreload 0 -movflags +faststart -flags cgop -bf 0 -sc_threshold 0 -video_track_timescale 90000 -b:v 2000k -maxrate:v 2000k -bufsize:v 4000k -c:v libx265 -tag:v hvc1 -x265-params log-level=error -c:a aac -ac 6 -b:a 320k -maxrate:a 320k -bufsize:a 640k -ar 48k -f mpegts -mpegts_flags +initial_discontinuity pipe:1");
} }
[Test] [Test]

2
ErsatzTV.FFmpeg/Pipeline/PipelineBuilderBase.cs
Unescape View File

@ -211,7 +211,6 @@ public abstract class PipelineBuilderBase : IPipelineBuilder
new NoStandardInputOption(), new NoStandardInputOption(),
new HideBannerOption(), new HideBannerOption(),
new NoStatsOption(), new NoStatsOption(),
new ProgressOption(),
new LoglevelErrorOption(), new LoglevelErrorOption(),
new StandardFormatFlags(), new StandardFormatFlags(),
new NoDemuxDecodeDelayOutputOption(), new NoDemuxDecodeDelayOutputOption(),
@ -221,6 +220,7 @@ public abstract class PipelineBuilderBase : IPipelineBuilder
if (desiredState.VideoFormat != VideoFormat.Copy) if (desiredState.VideoFormat != VideoFormat.Copy)
{ {
pipelineSteps.Add(new ClosedGopOutputOption()); pipelineSteps.Add(new ClosedGopOutputOption());
pipelineSteps.Add(new ProgressOption());
} }
if (desiredState.VideoFormat != VideoFormat.Copy && !desiredState.AllowBFrames) if (desiredState.VideoFormat != VideoFormat.Copy && !desiredState.AllowBFrames)

Write Preview
Loading…
Cancel
Save