From 8b6b96c606c1e089d0e9c8b186a1201eba37346b Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Tue, 9 Nov 2021 19:36:10 +0100 Subject: [PATCH] Take web socket downloads into account for the bandwidth meter --- .../sites/secretfriends/SecretFriendsWebrtcDownload.java | 5 ++++- .../main/java/ctbrec/sites/showup/ShowupWebrtcDownload.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ctbrec/sites/secretfriends/SecretFriendsWebrtcDownload.java b/common/src/main/java/ctbrec/sites/secretfriends/SecretFriendsWebrtcDownload.java index 949c6dc3..a91d6ba7 100644 --- a/common/src/main/java/ctbrec/sites/secretfriends/SecretFriendsWebrtcDownload.java +++ b/common/src/main/java/ctbrec/sites/secretfriends/SecretFriendsWebrtcDownload.java @@ -3,6 +3,7 @@ package ctbrec.sites.secretfriends; import ctbrec.Config; import ctbrec.Model; import ctbrec.Recording; +import ctbrec.io.BandwidthMeter; import ctbrec.io.HttpClient; import ctbrec.recorder.download.AbstractDownload; import ctbrec.recorder.download.Download; @@ -172,7 +173,9 @@ public class SecretFriendsWebrtcDownload extends AbstractDownload { super.onMessage(webSocket, bytes); timeOfLastTransfer = Instant.now(); try { - fout.write(bytes.toByteArray()); + byte[] videoData = bytes.toByteArray(); + fout.write(videoData); + BandwidthMeter.add(videoData.length); } catch (IOException e) { if (running) { LOG.error("Couldn't write video stream to file", e); diff --git a/common/src/main/java/ctbrec/sites/showup/ShowupWebrtcDownload.java b/common/src/main/java/ctbrec/sites/showup/ShowupWebrtcDownload.java index 73bc90ea..dd94a0ba 100644 --- a/common/src/main/java/ctbrec/sites/showup/ShowupWebrtcDownload.java +++ b/common/src/main/java/ctbrec/sites/showup/ShowupWebrtcDownload.java @@ -3,6 +3,7 @@ package ctbrec.sites.showup; import ctbrec.Config; import ctbrec.Model; import ctbrec.Recording; +import ctbrec.io.BandwidthMeter; import ctbrec.io.HttpClient; import ctbrec.recorder.download.AbstractDownload; import ctbrec.recorder.download.Download; @@ -167,7 +168,9 @@ public class ShowupWebrtcDownload extends AbstractDownload { super.onMessage(webSocket, bytes); timeOfLastTransfer = Instant.now(); try { - fout.write(bytes.toByteArray()); + byte[] videoData = bytes.toByteArray(); + fout.write(videoData); + BandwidthMeter.add(videoData.length); } catch (IOException e) { if (running) { LOG.error("Couldn't write video stream to file", e);