Added frontend support for 4K

- 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

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

View File

@ -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();
}
@ -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.
@ -489,4 +496,3 @@ function onWindowLoad(){
window.onload = onWindowLoad;