rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced MJPEG quality setting with MJPEG bitrate

Browse source
This commit is contained in:
Joel Collins 2020-12-07 17:05:56 +00:00
parent 3e2f876627
commit 42e0dfd39c
1 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

46
openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue
View file

@ -53,18 +53,19 @@
<h4>Image quality</h4> <h4>Image quality</h4>
<div class="uk-child-width-1-2" uk-grid> <div class="uk-child-width-1-2" uk-grid>
<div v-if="mjpeg_quality !== undefined"> <div v-if="mjpeg_bitrate !== undefined">
<label class="uk-form-label" for="form-stacked-text" <label class="uk-form-label" for="form-stacked-text"
>Web stream quality (%)</label >Web stream bitrate</label
> >
<div class="uk-form-controls"> <select v-model="mjpeg_bitrate" class="uk-select uk-form-small">
<input <option
v-model="mjpeg_quality" v-for="option in bitrateOptions"
class="uk-input uk-form-small" :key="option.value"
type="number" :value="option.value"
step="1" >
/> {{ option.text }}
</div> </option>
</select>
</div> </div>
<div v-if="jpeg_quality !== undefined"> <div v-if="jpeg_quality !== undefined">
@ -81,6 +82,16 @@
</div> </div>
</div> </div>
</div> </div>
<span
v-if="
mjpeg_bitrate !== undefined &&
mjpeg_bitrate < 17000000 &&
mjpeg_bitrate != -1
"
class="uk-text-danger uk-margin-top-small"
>This stream bitrate may impact fast autofocus performance</span
>
</div> </div>
<button <button
@ -123,8 +134,15 @@ export default {
analog_gain: undefined, analog_gain: undefined,
digital_gain: undefined digital_gain: undefined
}, },
mjpeg_quality: undefined, mjpeg_bitrate: undefined,
jpeg_quality: undefined jpeg_quality: undefined,
bitrateOptions: [
{ text: "Maximum", value: -1 },
{ text: "High", value: 25000000 },
{ text: "Normal", value: 17000000 },
{ text: "Low", value: 5000000 },
{ text: "Very low", value: 2500000 }
]
}; };
}, },
@ -145,7 +163,7 @@ export default {
.then(response => { .then(response => {
const cameraSettings = response.data.camera; const cameraSettings = response.data.camera;
// Get base camera settings // Get base camera settings
this.mjpeg_quality = cameraSettings.mjpeg_quality; this.mjpeg_bitrate = cameraSettings.mjpeg_bitrate;
this.jpeg_quality = cameraSettings.jpeg_quality; this.jpeg_quality = cameraSettings.jpeg_quality;
// Get Pi Camera settings if they exist // Get Pi Camera settings if they exist
if (cameraSettings.picamera) { if (cameraSettings.picamera) {
@ -164,7 +182,7 @@ export default {
// make the numbers be strings... TypeScript would solve this... // make the numbers be strings... TypeScript would solve this...
var payload = { var payload = {
camera: { camera: {
mjpeg_quality: parseInt(this.mjpeg_quality), mjpeg_bitrate: parseInt(this.mjpeg_bitrate),
jpeg_quality: parseInt(this.jpeg_quality), jpeg_quality: parseInt(this.jpeg_quality),
picamera: { picamera: {
shutter_speed: parseFloat(this.picamera.shutter_speed), shutter_speed: parseFloat(this.picamera.shutter_speed),