moonlight-stream/moonlight-chrome
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-chrome.git synced 2025-08-17 00:26:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added frontend support for 4K

Browse Source 
- This does NOT give full 4K support.  The NaCl plugin still needs to support it
- Progress commit on #42
- Fixed bad default value for 720p bitrate: from 15Mbps to 5Mbps
This commit is contained in:
R. Aidan Campbell 2016-04-20 10:53:34 -04:00
parent 278824fea5
commit 97fc2d4fa8
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
index.html
View File

@ -29,6 +29,7 @@
<select id="selectResolution">
<option value="1280:720">1280x720</option>
<option value="1920:1080">1920x1080</option>
<option value="2160:3840">2160x3840</option>
</select>
</div>
<div class="mdl-select">
@ -36,9 +37,9 @@
<option value="30">30fps</option>
<option value="60">60fps</option>
</select>
<output id='bitrateField'>15 Mbps</output>
<output id='bitrateField'>5 Mbps</output>
</div>
<input id="bitrateSlider" class="mdl-slider mdl-js-slider" type="range" min="0" max="100" step="0.5" value="15">
<input id="bitrateSlider" class="mdl-slider mdl-js-slider" type="range" min="0" max="100" step="0.5" value="5">
</div>
<div id="hostSettings">

40
static/js/index.js
View File

@ -96,15 +96,15 @@ function pairTo(targetHost) {
console.log("User wants to pair, and we still have no cert. Problem = very yes.");
return;
}
if(!api) {
api = new NvHTTP(targetHost, myUniqueid);
}
if(api.paired) {
return;
}
$('#pairButton').html('Pairing...');
snackbarLog('Attempting pair to: ' + targetHost);
var randomNumber = String("0000" + (Math.random()*10000|0)).slice(-4);
@ -112,7 +112,7 @@ function pairTo(targetHost) {
$('#pairingDialogText').html('Please enter the number ' + randomNumber + ' on the GFE dialog on the computer. This dialog will be dismissed once complete');
pairingDialog.showModal();
console.log('sending pairing request to ' + targetHost + ' with random number ' + randomNumber);
api.pair(randomNumber).then(function (paired) {
if (!paired) {
if (api.currentGame != 0) {
@ -196,30 +196,30 @@ function showApps() {
console.log('Moved into showApps, but `api` did not initialize properly! Failing.');
return;
}
api.getAppList().then(function (appList) {
if ($('#selectGame').has('option').length > 0 ) {
// there was already things in the dropdown. Clear it, then add the new ones.
// Most likely, the user just hit the 'retrieve app list' button again
$('#selectGame').empty();
}
appList.forEach(function (app) {
$('#selectGame').append($('<option>', {value: app.id, text: app.title}));
});
$("#selectGame").html($("#selectGame option").sort(function (a, b) { // thanks, http://stackoverflow.com/a/7466196/3006365
return a.text.toUpperCase() == b.text.toUpperCase() ? 0 : a.text.toUpperCase() < b.text.toUpperCase() ? -1 : 1
}));
if (api.currentGame != 0)
$('#selectGame').val(api.currentGame);
gameSelectUpdated(); // default the button to 'Resume Game' if one is running.
}, function (failedAppList) {
console.log('Failed to get applist from host: ' + api.address);
});
showAppsMode();
}
@ -257,7 +257,7 @@ function startSelectedGame() {
}
var appID = $("#selectGame").val(); // app that the user wants to play
// refresh the server info, because the user might have quit the game.
api.refreshServerInfo().then(function (ret) {
if(api.currentGame != 0 && api.currentGame != appID) {
@ -276,9 +276,9 @@ function startSelectedGame() {
});
return;
}
snackbarLog('Starting app: ' + $('#selectGame option:selected').text());
var frameRate = $("#selectFramerate").val();
var streamWidth = $('#selectResolution option:selected').val().split(':')[0];
var streamHeight = $('#selectResolution option:selected').val().split(':')[1];
@ -428,7 +428,14 @@ function updateDefaultBitrate() {
} else { // 720, 60fps
$('#bitrateSlider')[0].MaterialSlider.change('10');
}
} else if (res.lastIndexOf("2160:3840", 0) === 0) {
if (frameRate.lastIndexOf("30", 0) === 0) { // 2160p, 30fps
$('#bitrateSlider')[0].MaterialSlider.change('40');
} else { // 2160p, 60fps
$('#bitrateSlider')[0].MaterialSlider.change('80');
}
}
updateBitrateField();
saveBitrate();
}
@ -437,7 +444,7 @@ function onWindowLoad(){
// don't show the game selection div
$('#gameSelection').css('display', 'none');
$("#bitrateField").addClass("bitrateField");
if(chrome.storage) {
// load stored resolution prefs
chrome.storage.sync.get('resolution', function(previousValue) {
@ -459,7 +466,7 @@ function onWindowLoad(){
});
// load stored bitrate prefs
chrome.storage.sync.get('bitrate', function(previousValue) {
$('#bitrateSlider')[0].MaterialSlider.change(previousValue.bitrate != null ? previousValue.bitrate : '15');
$('#bitrateSlider')[0].MaterialSlider.change(previousValue.bitrate != null ? previousValue.bitrate : '5');
updateBitrateField();
});
// load the HTTP cert if we have one.
@ -474,7 +481,7 @@ function onWindowLoad(){
}
});
}
findNvService(function (finder, opt_error) {
if (finder.byService_['_nvstream._tcp']) {
var ip = Object.keys(finder.byService_['_nvstream._tcp'])[0];
@ -489,4 +496,3 @@ function onWindowLoad(){
window.onload = onWindowLoad;