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

Use HLS streaming for MFC models again

This commit is contained in:
0xboobface 2019-12-30 16:15:47 +01:00
parent 499708ffcf
commit 24cb3ecf99
2 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

46
common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
View File

@ -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) {