From 061cc7edd4697ddcf368052cde87dd1b91c9adb5 Mon Sep 17 00:00:00 2001 From: "R. Aidan Campbell" Date: Sun, 21 Feb 2016 17:39:14 -0500 Subject: [PATCH] now with default bitrate settings. This closes #12 --- static/js/index.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/static/js/index.js b/static/js/index.js index 01c7944..92b58e9 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -137,10 +137,12 @@ function storeData(key, data, callbackFunction) { } function saveResolution() { + updateDefaultBitrate(); storeData('resolution', $('#selectResolution')[0].value, null); } function saveFramerate() { + updateDefaultBitrate(); storeData('frameRate', $('#selectFramerate')[0].value, null); } @@ -152,6 +154,27 @@ function saveBitrate() { storeData('bitrate', $('#bitrateSlider')[0].value, null); } +function updateDefaultBitrate() { + var res = $('#selectResolution')[0].value; + var frameRate = $('#selectFramerate')[0].value; + + if (res.lastIndexOf("1920:1080", 0) === 0) { + if (frameRate.lastIndexOf("30", 0) === 0) { // 1080p, 30fps + $('#bitrateSlider')[0].MaterialSlider.change('10'); + } else { // 1080p, 60fps + $('#bitrateSlider')[0].MaterialSlider.change('15'); + } + } else if (res.lastIndexOf("1280:720") === 0) { + if (frameRate.lastIndexOf("30", 0) === 0) { // 720, 30fps + $('#bitrateSlider')[0].MaterialSlider.change('5'); + } else { // 720, 60fps + $('#bitrateSlider')[0].MaterialSlider.change('10'); + } + } + updateBitrateField(); + saveBitrate(); +} + function onWindowLoad(){ // don't show the game selection div document.getElementById('gameSelection').style.display = 'none';