davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix recording download from server

This commit is contained in:
0xboobface 2018-11-28 23:06:41 +01:00
parent c0bd89b228
commit 1e51298f41
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java
View File

@ -19,6 +19,7 @@ import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Optional;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
@ -175,7 +176,11 @@ public class MergedHlsDownload extends AbstractHlsDownload {
// download new segments // download new segments
long downloadStart = System.currentTimeMillis(); long downloadStart = System.currentTimeMillis();
downloadNewSegments(lsp, nextSegment); if(livestreamDownload) {
downloadNewSegments(lsp, nextSegment);
} else {
downloadRecording(lsp);
}
long downloadTookMillis = System.currentTimeMillis() - downloadStart; long downloadTookMillis = System.currentTimeMillis() - downloadStart;
// download segments, which might have been skipped // download segments, which might have been skipped
@ -197,12 +202,25 @@ public class MergedHlsDownload extends AbstractHlsDownload {
break; break;
} }
} catch(Exception e) { } catch(Exception e) {
LOG.info("Unexpected error while downloading {}", model.getName(), e); if(model != null) {
LOG.info("Unexpected error while downloading {}", model.getName(), e);
} else {
LOG.info("Unexpected error while downloading", e);
}
running = false; running = false;
} }
} }
} }
private void downloadRecording(SegmentPlaylist lsp) throws IOException, InterruptedException {
for (String segment : lsp.segments) {
URL segmentUrl = new URL(segment);
SegmentDownload segmentDownload = new SegmentDownload(segmentUrl, client);
byte[] segmentData = segmentDownload.call();
writeSegment(segmentData);
}
}
private void downloadNewSegments(SegmentPlaylist lsp, int nextSegment) throws MalformedURLException, MissingSegmentException, ExecutionException, HttpException { private void downloadNewSegments(SegmentPlaylist lsp, int nextSegment) throws MalformedURLException, MissingSegmentException, ExecutionException, HttpException {
int skip = nextSegment - lsp.seq; int skip = nextSegment - lsp.seq;
if(lsp.segments.isEmpty()) { if(lsp.segments.isEmpty()) {
@ -354,7 +372,7 @@ public class MergedHlsDownload extends AbstractHlsDownload {
.setSink(sink) .setSink(sink)
.setSleepingEnabled(liveStream) .setSleepingEnabled(liveStream)
.setBufferSize(10) .setBufferSize(10)
.setName(model.getName()) .setName(Optional.ofNullable(model).map(m -> m.getName()).orElse(""))
.build(); .build();
// Start streaming // Start streaming
@ -372,7 +390,11 @@ public class MergedHlsDownload extends AbstractHlsDownload {
closeFile(fileChannel); closeFile(fileChannel);
} }
}); });
t.setName("Segment Merger Thread [" + model.getName() + "]"); if(model != null) {
t.setName("Segment Merger Thread [" + model.getName() + "]");
} else {
t.setName("Segment Merger Thread");
}
t.setDaemon(true); t.setDaemon(true);
return t; return t;
} }