From f9d777b0397a01f0c2b825019105b20c22b30ade Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Tue, 21 Dec 2021 22:08:38 +0100 Subject: [PATCH] Add updates of lastSegmentDownload to MergedFfmpegHlsDownload --- .../java/ctbrec/recorder/download/hls/AbstractHlsDownload.java | 2 +- .../ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java index a48dd9de..536605f5 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java @@ -69,7 +69,7 @@ public abstract class AbstractHlsDownload extends AbstractDownload { private Instant beforeLastPlaylistRequest= Instant.EPOCH; private int consecutivePlaylistTimeouts = 0; private int consecutivePlaylistErrors = 0; - private Instant lastSegmentDownload = Instant.MIN; + protected Instant lastSegmentDownload = Instant.MIN; private final List segmentErrorTimestamps = new LinkedList<>(); private int selectedResolution = UNKNOWN; diff --git a/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java index 1aa3c314..eec87bc3 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java @@ -86,6 +86,7 @@ public class MergedFfmpegHlsDownload extends AbstractHlsDownload { SegmentDownload segmentDownload = future.get(); ByteArrayOutputStream downloadData = (ByteArrayOutputStream) segmentDownload.getOutputStream(); downloadData.writeTo(ffmpegStdIn); + lastSegmentDownload = Instant.now(); } else { // first download in queue not finished, let's continue with other stuff break; @@ -213,7 +214,7 @@ public class MergedFfmpegHlsDownload extends AbstractHlsDownload { } @Override - protected OutputStream getSegmentOutputStream(Segment segment) throws IOException { + protected OutputStream getSegmentOutputStream(Segment segment) { return new ByteArrayOutputStream(); } }