Skip to content

Advanced image enhancements #1526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BryonLewis merged 4 commits into from
Oct 7, 2025
Merged

Advanced image enhancements #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6deb921
update browsers caniuse
BryonLewis Sep 18, 2025
1a7946c
swap imageEhanacements to using brightness, contrast, saturation, sha…
BryonLewis Sep 18, 2025
0f4a46d
image enhancement controls update
BryonLewis Sep 18, 2025
2543312
implementing enhancements into media annotator views
BryonLewis Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion client/dive-common/components/ControlsContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ export default defineComponent({
type: Boolean,
default: false,
},
isDefaultImage: {
type: Boolean as PropType<boolean>,
required: true,
},
},
setup(_, { emit }) {
const handler = useHandler();
Expand Down Expand Up @@ -148,7 +152,7 @@ export default defineComponent({
dense
style="position:absolute; bottom: 0px; padding: 0px; margin:0px;"
>
<Controls>
<Controls :is-default-image="isDefaultImage">
<template slot="timelineControls">
<div style="min-width: 270px">
<v-tooltip
Expand Down
14 changes: 7 additions & 7 deletions client/dive-common/components/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ export default defineComponent({

const {
imageEnhancements,
brightness,
intercept,
imageEnhancementOutputs,
isDefaultImage,
setSVGFilters,
} = useImageEnhancements();

Expand Down Expand Up @@ -852,8 +852,8 @@ export default defineComponent({
originalFps: time.originalFps,
context,
readonlyState,
brightness,
intercept,
imageEnhancementOutputs,
isDefaultImage,
/* large image methods */
getTiles,
getTileURL,
Expand Down Expand Up @@ -1131,8 +1131,8 @@ export default defineComponent({
frameRate,
originalFps,
camera,
brightness,
intercept,
imageEnhancementOutputs,
isDefaultImage,
getTiles,
getTileURL,
}"
Expand All @@ -1146,7 +1146,7 @@ export default defineComponent({
ref="controlsRef"
:collapsed.sync="controlsCollapsed"
v-bind="{
lineChartData, eventChartData, groupChartData, datasetType,
lineChartData, eventChartData, groupChartData, datasetType, isDefaultImage,
}"
/>
</div>
Expand Down
119 changes: 101 additions & 18 deletions client/src/components/ImageEnhancements.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script lang="ts">
import { defineComponent, ref } from 'vue';

import { useHandler, useImageEnhancements } from '../provides';

export default defineComponent({
Expand All @@ -9,17 +8,35 @@ export default defineComponent({
setup() {
const { setSVGFilters } = useHandler();
const imageEnhancements = useImageEnhancements();
const range = ref([
(imageEnhancements.value.blackPoint ?? 0) * 255.0,
(imageEnhancements.value.whitePoint ?? 1) * 255.0,
]);
const brightness = ref(imageEnhancements.value.brightness || 1);
const contrast = ref(imageEnhancements.value.contrast || 1);
const saturation = ref(imageEnhancements.value.saturation || 1);
const sharpen = ref(imageEnhancements.value.sharpen || 0);

const modifyValue = () => {
setSVGFilters({ blackPoint: range.value[0] / 255.0, whitePoint: range.value[1] / 255.0 });
setSVGFilters({
brightness: brightness.value,
contrast: contrast.value,
saturation: saturation.value,
sharpen: sharpen.value,
});
};

const reset = () => {
brightness.value = 1;
contrast.value = 1;
saturation.value = 1;
sharpen.value = 0;
modifyValue();
};

return {
modifyValue,
range,
reset,
brightness,
contrast,
saturation,
sharpen,
};
},
});
Expand All @@ -31,22 +48,88 @@ export default defineComponent({
Controls for adjusting images.
</span>
<v-divider class="my-3" />
<v-range-slider
v-model="range"
:min="0"
:max="255"
:step="1.0"
thumb-label="always"
label="Contrast:"
class="my-4"
@input="modifyValue"
/>
<v-row>
<v-col cols="4">
<span class="text-caption">Brightness</span>
</v-col>
<v-col>
<v-slider
v-model="brightness"
:min="0"
:max="3"
:step="0.1"
hide-details
class="pa-0 ma-0"
@input="modifyValue()"
/>
</v-col>
<v-col cols="2">
<span>{{ brightness.toFixed(1) }}</span>
</v-col>
</v-row>
<v-row>
<v-col cols="4">
<span class="text-caption">Contrast</span>
</v-col>
<v-col>
<v-slider
v-model="contrast"
:min="0"
:max="3"
:step="0.1"
hide-details
class="pa-0 ma-0"
@input="modifyValue()"
/>
</v-col>
<v-col cols="2">
<span>{{ contrast.toFixed(1) }}</span>
</v-col>
</v-row>
<v-row>
<v-col cols="4">
<span class="text-caption">Saturation</span>
</v-col>
<v-col>
<v-slider
v-model="saturation"
:min="0"
:max="3"
:step="0.1"
hide-details
class="pa-0 ma-0"
@input="modifyValue()"
/>
</v-col>
<v-col cols="2">
<span>{{ saturation.toFixed(1) }}</span>
</v-col>
</v-row>
<v-row>
<v-col cols="4">
<span class="text-caption">Sharpness</span>
</v-col>
<v-col>
<v-slider
v-model="sharpen"
:min="0"
:max="4"
:step="0.1"
hide-details
class="pa-0 ma-0"
@input="modifyValue()"
/>
</v-col>
<v-col cols="2">
<span>{{ sharpen.toFixed(1) }}</span>
</v-col>
</v-row>
<v-btn
block
depressed
color="warning"
class="my-2"
@click="range = [0, 255]; modifyValue()"
@click="reset()"
>
Reset
</v-btn>
Expand Down
100 changes: 70 additions & 30 deletions client/src/components/annotators/ImageAnnotator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import {
defineComponent, ref, onUnmounted, PropType, toRef, watch,
} from 'vue';
import { ImageEnhancementOutputs } from 'vue-media-annotator/use/useImageEnhancements';
import { SetTimeFunc } from '../../use/useTimeObserver';
import { injectCameraInitializer } from './useMediaController';

Expand Down Expand Up @@ -38,18 +39,22 @@ export default defineComponent({
type: Function as PropType<(imageDataItem: ImageDataItem, img: HTMLImageElement) => void>,
default: loadImageFunc,
},
// Range is [0, inf.)
brightness: {
type: Number as PropType<number | undefined>,
default: undefined,
},
camera: {
type: String as PropType<string>,
default: 'singleCam',
},
intercept: {
type: Number as PropType<number | undefined>,
default: undefined,
imageEnhancementOutputs: {
type: Object as PropType<ImageEnhancementOutputs>,
default: () => ({
brightness: { slope: 1, intercept: 0 },
contrast: { slope: 1, intercept: 0.5 },
saturation: { values: 1 },
sharpen: { kernelMatrix: '0 -1 0 -1 5 -1 0 -1 0', divisor: 1 },
}),
},
isDefaultImage: {
type: Boolean as PropType<boolean>,
required: true,
},
},
setup(props, { emit }) {
Expand Down Expand Up @@ -309,11 +314,20 @@ export default defineComponent({
function unimplemented() {
throw new Error('Method unimplemented!');
}
const setBrightnessFilter = (on: boolean) => {
if (local.quadFeature !== undefined) {
local.quadFeature.layer().node().css('filter', on ? 'url(#brightness)' : '');
}
};
watch(
() => props.isDefaultImage,
() => {
if (local.quadFeature !== undefined) {
if (props.isDefaultImage) {
local.quadFeature.layer().node().css('filter', '');
} else {
local.quadFeature.layer().node().css('filter', 'url(#imageEhancements)');
}
}
},
{ deep: true },
);

if (local.imgs.length) {
const imgInternal = cacheFrame(0);
imgInternal.onloadPromise.then(() => {
Expand All @@ -325,7 +339,7 @@ export default defineComponent({
});
// Set quadFeature and conditionally apply brightness filter
local.quadFeature = quadFeatureLayer.createFeature('quad');
setBrightnessFilter(props.brightness !== undefined);
local.quadFeature.layer().node().css('filter', 'url(#imageEhancements)');
data.ready = true;
seek(0);
});
Expand Down Expand Up @@ -356,7 +370,7 @@ export default defineComponent({
});
// Set quadFeature and conditionally apply brightness filter
local.quadFeature = quadFeatureLayer.createFeature('quad');
setBrightnessFilter(props.brightness !== undefined);
local.quadFeature.layer().node().css('filter', 'url(#imageEhancements)');
data.ready = true;
seek(0);
});
Expand All @@ -366,13 +380,6 @@ export default defineComponent({
watch(toRef(props, 'imageData'), () => {
init();
});
// Watch brightness for change, only set filter if value
// is switching from number -> undefined, or vice versa.
watch(toRef(props, 'brightness'), (brightness, oldBrightness) => {
if ((brightness === undefined) !== (oldBrightness === undefined)) {
setBrightnessFilter(brightness !== undefined);
}
});
return {
data,
loadingVideo,
Expand All @@ -393,24 +400,57 @@ export default defineComponent({
style="position: absolute; top: -1px; left: -1px"
>
<defs>
<filter id="brightness">
<feComponentTransfer color-interpolation-filters="sRGB">
<filter id="imageEhancements">
<feComponentTransfer id="feBrightness">
<feFuncR
type="linear"
:slope="imageEnhancementOutputs.brightness.slope"
:intercept="imageEnhancementOutputs.brightness.intercept"
/>
<feFuncG
type="linear"
:slope="imageEnhancementOutputs.brightness.slope"
:intercept="imageEnhancementOutputs.brightness.intercept"
/>
<feFuncB
type="linear"
:slope="imageEnhancementOutputs.brightness.slope"
:intercept="imageEnhancementOutputs.brightness.intercept"
/>
</feComponentTransfer>
<!-- Contrast -->
<feComponentTransfer id="feContrast">
<feFuncR
type="linear"
:slope="brightness"
:intercept="intercept"
:slope="imageEnhancementOutputs.contrast.slope"
:intercept="imageEnhancementOutputs.contrast.intercept"
/>
<feFuncG
type="linear"
:slope="brightness"
:intercept="intercept"
:slope="imageEnhancementOutputs.contrast.slope"
:intercept="imageEnhancementOutputs.contrast.intercept"
/>
<feFuncB
type="linear"
:slope="brightness"
:intercept="intercept"
:slope="imageEnhancementOutputs.contrast.slope"
:intercept="imageEnhancementOutputs.contrast.intercept"
/>
</feComponentTransfer>
<!-- Saturation -->
<feColorMatrix
id="feSaturate"
type="saturate"
:values="imageEnhancementOutputs.saturation.values.toString()"
/>
<!-- Sharpening -->
<feConvolveMatrix
id="feSharpen"
order="3"
:divisor="imageEnhancementOutputs.sharpen.divisor"
:kernelMatrix="imageEnhancementOutputs.sharpen.kernelMatrix"
edgeMode="duplicate"
/>
<feComposite in2="SourceGraphic" operator="in" />
</filter>
</defs>
</svg>
Expand Down
Loading
Loading