From a0d9835192b457e9e84b467b32f260c24cf2d1a4 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Tue, 28 Apr 2020 22:05:06 +0200 Subject: [PATCH] Fix streamate stream source parsing --- .../src/main/java/ctbrec/sites/streamate/StreamateModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java b/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java index d35f81d3..30a46261 100644 --- a/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java +++ b/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java @@ -93,6 +93,7 @@ public class StreamateModel extends AbstractModel { try (Response response = site.getHttpClient().execute(req)) { if (response.isSuccessful()) { JSONObject json = new JSONObject(response.body().string()); + //LOG.debug(json.toString(2)); JSONObject formats = json.getJSONObject("formats"); JSONObject hls = formats.getJSONObject("mp4-hls"); @@ -110,11 +111,10 @@ public class StreamateModel extends AbstractModel { } // add raw source stream - if (hls.has(ORIGIN)) { + if (hls.has(ORIGIN) && !hls.isNull(ORIGIN)) { JSONObject origin = hls.getJSONObject(ORIGIN); StreamSource src = new StreamSource(); src.mediaPlaylistUrl = origin.getString("location"); - origin = hls.getJSONObject(ORIGIN); src.width = origin.optInt("videoWidth"); src.height = origin.optInt("videoHeight"); src.bandwidth = (origin.optInt("videoKbps") + origin.optInt("audioKbps")) * 1024;