History

avfilter/vf_pseudocolor: add opacity option

Paul B Mahol committed 5 years ago

Commit 2859c301 parent ba2cebb2 files · +40 −17Browse files

Showing the changes to libavfilter (1 of 2 files). Show all

Unified · Split

libavfilter/vf_pseudocolor.c+33−13
@@ -156,6 +156,7 @@ static const Preset presets[] = · 155 unmodified lines
156156 typedef struct PseudoColorContext {
157157 const AVClass *class;
158158 int preset;
159+ float opacity;
159160 int max;
160161 int index;
161162 int nb_planes;
@@ -173,7 +174,8 @@ typedef struct PseudoColorContext { · 11 unmodified lines
173174 ptrdiff_t ilinesize,
174175 ptrdiff_t slinesize,
175176 ptrdiff_t dlinesize,
176− float *lut);
177+ float *lut,
178+ float opacity);
177179 } PseudoColorContext;
178180
179181 #define OFFSET(x) offsetof(PseudoColorContext, x)
@@ -184,7 +186,9 @@ static const AVOption pseudocolor_options[] = { · 4 unmodified lines
184186 { "c1", "set component #1 expression", OFFSET(comp_expr_str[1]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },
185187 { "c2", "set component #2 expression", OFFSET(comp_expr_str[2]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },
186188 { "c3", "set component #3 expression", OFFSET(comp_expr_str[3]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },
189+ { "index", "set component as base", OFFSET(index), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, .flags = FLAGS },
187190 { "i", "set component as base", OFFSET(index), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, .flags = FLAGS },
191+ { "preset", "set preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=-1},-1, NB_PRESETS-1, .flags = FLAGS, "preset" },
188192 { "p", "set preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=-1},-1, NB_PRESETS-1, .flags = FLAGS, "preset" },
189193 { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=-1}, .flags = FLAGS, "preset" },
190194 { "magma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_MAGMA}, .flags = FLAGS, "preset" },
@@ -195,6 +199,7 @@ static const AVOption pseudocolor_options[] = { · 4 unmodified lines
195199 { "cividis", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_CIVIDIS}, .flags = FLAGS, "preset" },
196200 { "range1", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_RANGE1}, .flags = FLAGS, "preset" },
197201 { "range2", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_RANGE2}, .flags = FLAGS, "preset" },
202+ { "opacity", "set pseudocolor opacity",OFFSET(opacity), AV_OPT_TYPE_FLOAT, {.dbl=1}, 0, 1, .flags = FLAGS },
198203 { NULL }
199204 };
200205
@@ -235,9 +240,14 @@ static int query_formats(AVFilterContext *ctx) · 34 unmodified lines
235240 return ff_set_common_formats(ctx, fmts_list);
236241 }
237242
243+static inline float lerpf(float v0, float v1, float f)
244+{
245+ return v0 + (v1 - v0) * f;
246+}
247+
238248 #define PCLIP(v, max, dst, src, x) \
239249 if (v >= 0 && v <= max) { \
240− dst[x] = v; \
250+ dst[x] = lerpf(src[x], v, opacity);\
241251 } else { \
242252 dst[x] = src[x]; \
243253 }
@@ -249,7 +259,8 @@ static void pseudocolor_filter(int max, int width, int height, · 5 unmodified lines
249259 ptrdiff_t ilinesize,
250260 ptrdiff_t slinesize,
251261 ptrdiff_t dlinesize,
252− float *lut)
262+ float *lut,
263+ float opacity)
253264 {
254265 int x, y;
255266
@@ -272,7 +283,8 @@ static void pseudocolor_filter_11(int max, int width, int height, · 16 unmodified lines
272283 ptrdiff_t ilinesize,
273284 ptrdiff_t slinesize,
274285 ptrdiff_t dlinesize,
275− float *lut)
286+ float *lut,
287+ float opacity)
276288 {
277289 int x, y;
278290
@@ -294,7 +306,8 @@ static void pseudocolor_filter_11d(int max, int width, int height, · 15 unmodified lines
294306 ptrdiff_t ilinesize,
295307 ptrdiff_t slinesize,
296308 ptrdiff_t dlinesize,
297− float *lut)
309+ float *lut,
310+ float opacity)
298311 {
299312 int x, y;
300313
@@ -316,7 +329,8 @@ static void pseudocolor_filter_10(int max, int width, int height, · 15 unmodified lines
316329 ptrdiff_t ilinesize,
317330 ptrdiff_t slinesize,
318331 ptrdiff_t dlinesize,
319− float *lut)
332+ float *lut,
333+ float opacity)
320334 {
321335 int x, y;
322336
@@ -339,7 +353,8 @@ static void pseudocolor_filter_10d(int max, int width, int height, · 16 unmodified lines
339353 ptrdiff_t ilinesize,
340354 ptrdiff_t slinesize,
341355 ptrdiff_t dlinesize,
342− float *lut)
356+ float *lut,
357+ float opacity)
343358 {
344359 int x, y;
345360
@@ -362,7 +377,8 @@ static void pseudocolor_filter_16(int max, int width, int height, · 16 unmodified lines
362377 ptrdiff_t ilinesize,
363378 ptrdiff_t slinesize,
364379 ptrdiff_t dlinesize,
365− float *lut)
380+ float *lut,
381+ float opacity)
366382 {
367383 const uint16_t *index = (const uint16_t *)iindex;
368384 const uint16_t *src = (const uint16_t *)ssrc;
@@ -388,7 +404,8 @@ static void pseudocolor_filter_16_10(int max, int width, int height, · 19 unmodified lines
388404 ptrdiff_t ilinesize,
389405 ptrdiff_t slinesize,
390406 ptrdiff_t dlinesize,
391− float *lut)
407+ float *lut,
408+ float opacity)
392409 {
393410 const uint16_t *index = (const uint16_t *)iindex;
394411 const uint16_t *src = (const uint16_t *)ssrc;
@@ -414,7 +431,8 @@ static void pseudocolor_filter_16_10d(int max, int width, int height, · 19 unmodified lines
414431 ptrdiff_t ilinesize,
415432 ptrdiff_t slinesize,
416433 ptrdiff_t dlinesize,
417− float *lut)
434+ float *lut,
435+ float opacity)
418436 {
419437 const uint16_t *index = (const uint16_t *)iindex;
420438 const uint16_t *src = (const uint16_t *)ssrc;
@@ -440,7 +458,8 @@ static void pseudocolor_filter_16_11(int max, int width, int height, · 19 unmodified lines
440458 ptrdiff_t ilinesize,
441459 ptrdiff_t slinesize,
442460 ptrdiff_t dlinesize,
443− float *lut)
461+ float *lut,
462+ float opacity)
444463 {
445464 const uint16_t *index = (const uint16_t *)iindex;
446465 const uint16_t *src = (const uint16_t *)ssrc;
@@ -469,7 +488,8 @@ static void pseudocolor_filter_16_11d(int max, int width, int height, · 22 unmodified lines
469488 ptrdiff_t ilinesize,
470489 ptrdiff_t slinesize,
471490 ptrdiff_t dlinesize,
472− float *lut)
491+ float *lut,
492+ float opacity)
473493 {
474494 const uint16_t *index = (const uint16_t *)iindex;
475495 const uint16_t *src = (const uint16_t *)ssrc;
@@ -785,7 +805,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 309 unmodified lines
785805
786806 s->filter[plane](s->max, s->width[plane], slice_end - slice_start,
787807 index, src, dst, ilinesize, slinesize,
788− dlinesize, s->lut[plane]);
808+ dlinesize, s->lut[plane], s->opacity);
789809 }
790810
791811 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t