From 24cb3ecf998ff2343b8272d14b86701e8b3b0416 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Mon, 30 Dec 2019 16:15:47 +0100
Subject: [PATCH] Use HLS streaming for MFC models again

---
 CHANGELOG.md                                  |  2 +-
 .../ctbrec/sites/mfc/MyFreeCamsClient.java    | 46 ++-----------------
 2 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95b5df6e..c8f52e7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 3.0.3
 ========================
-* Fix: Recordings didn't start for some MFC models
+* MFC now uses HLS again
 * Fix: In some cases a lot of recordings have been created, because they
   failed immediately after start
 * Fix: Recorded models now don't switch their positions in the thumb overview
diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
index 95467923..8033166c 100644
--- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
+++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
@@ -570,56 +570,18 @@ public class MyFreeCamsClient {
             camservString = camserv.toString();
         }
 
-        if (serverConfig.isOnObsServer(state)) {
-            // techorder -> hls
-        } else {
-            // techorder -> dash hls
-        }
-
         int userChannel = 100000000 + state.getUid();
         String phase = state.getU().getPhase() != null ? state.getU().getPhase() : "z";
+        String phasePrefix = phase.equals("z") ? "" : '_' + phase;
         String server = "video" + camservString.replaceAll("^\\D+", "");
-        boolean useHls = serverConfig.isOnObsServer(state);
         String streamUrl;
         if (serverConfig.isOnWzObsVideoServer(state) || !serverConfig.isOnObsServer(state)) {
-            // wowza server
-            // https://video350.myfreecams.com/NxServer/ngrp:mfc_108514276.f4v_desktop/manifest_w515822224_qbmM9MC40NTQ0NTYxNjUyOTYzNDA4.mpd
-            if (useHls) {
-                streamUrl = HTTPS + server + ".myfreecams.com/NxServer/ngrp:mfc_" + phase + '_' +userChannel + ".f4v_mobile/playlist.m3u8";
-            } else {
-                streamUrl = HTTPS + server + ".myfreecams.com/NxServer/ngrp:mfc_" + userChannel + ".f4v_desktop/manifest.mpd";
-            }
+            streamUrl = HTTPS + server + ".myfreecams.com/NxServer/ngrp:mfc" + phasePrefix + '_' + userChannel + ".f4v_mobile/playlist.m3u8";
         } else {
-            // nginx server
-            if (useHls) {
-                streamUrl = HTTPS + server + ".myfreecams.com:8444/x-hls/" + cxid + '/' + userChannel + '/' + ctxenc + "/mfc_" + phase + '_' + userChannel
-                        + ".m3u8";
-            } else {
-                streamUrl = HTTPS + server + ".myfreecams.com:8444/x-dsh/" + cxid + '/' + userChannel + '/' + ctxenc + "/mfc_" + phase + '_' + userChannel
-                        + ".mpd";
-            }
+            streamUrl = HTTPS + server + ".myfreecams.com:8444/x-hls/" + cxid + '/' + userChannel + '/' + ctxenc + "/mfc" + phasePrefix + '_' + userChannel
+                    + ".m3u8";
         }
         return streamUrl;
-
-        // https://video848.myfreecams.com/NxServer/ngrp:mfc_117940536.f4v_desktop/manifest_w514169512_qbmM9MC40NzQwNzU4NzQxNTA0NDUyNQ==.mpd
-
-        // if(camserv != null && ) {
-        // int userChannel = 100000000 + state.getUid();
-        // String streamUrl = "";
-        // String phase = state.getU().getPhase() != null ? state.getU().getPhase() : "z";
-        // } else if(serverConfig.isOnNgServer(state)) {
-        // String server = serverConfig.ngVideoServers.get(camserv.toString());
-        // streamUrl = "https://" + server + ".myfreecams.com:8444/x-hls/" + cxid + '/' + userChannel + '/' + ctxenc + "/mfc_" + phase + '_' + userChannel +
-        // ".m3u8";
-        // } else if(serverConfig.isOnWzObsVideoServer(state)) {
-        // String server = serverConfig.wzobsServers.get(camserv.toString());
-        // streamUrl = "https://"+ server + ".myfreecams.com/NxServer/ngrp:mfc_" + phase + '_' + userChannel + ".f4v_mobile/playlist.m3u8";
-        // } else if(serverConfig.isOnHtml5VideoServer(state)) {
-        // String server = serverConfig.h5Servers.get(camserv.toString());
-        // streamUrl = "https://"+ server + ".myfreecams.com/NxServer/ngrp:mfc_" + userChannel + ".f4v_mobile/playlist.m3u8";
-        // } else {
-        // streamUrl = "https://video" + camserv + ".myfreecams.com/NxServer/ngrp:mfc_" + userChannel + ".f4v_mobile/playlist.m3u8";
-        // }
     }
 
     public MyFreeCamsModel getModel(int uid) {