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
156typedef struct PseudoColorContext {156typedef struct PseudoColorContext {
157 const AVClass *class;157 const AVClass *class;
158 int preset;158 int preset;
159 float opacity;
159 int max;160 int max;
160 int index;161 int index;
161 int nb_planes;162 int nb_planes;
@@ -173,7 +174,8 @@ typedef struct PseudoColorContext { · 11 unmodified lines
173 ptrdiff_t ilinesize,174 ptrdiff_t ilinesize,
174 ptrdiff_t slinesize,175 ptrdiff_t slinesize,
175 ptrdiff_t dlinesize,176 ptrdiff_t dlinesize,
176 float *lut);177 float *lut,
178 float opacity);
177} PseudoColorContext;179} PseudoColorContext;
178 180
179#define OFFSET(x) offsetof(PseudoColorContext, x)181#define OFFSET(x) offsetof(PseudoColorContext, x)
@@ -184,7 +186,9 @@ static const AVOption pseudocolor_options[] = { · 4 unmodified lines
184 { "c1", "set component #1 expression", OFFSET(comp_expr_str[1]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },186 { "c1", "set component #1 expression", OFFSET(comp_expr_str[1]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },
185 { "c2", "set component #2 expression", OFFSET(comp_expr_str[2]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },187 { "c2", "set component #2 expression", OFFSET(comp_expr_str[2]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },
186 { "c3", "set component #3 expression", OFFSET(comp_expr_str[3]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS },188 { "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 },
187 { "i", "set component as base", OFFSET(index), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, .flags = FLAGS },190 { "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" },
188 { "p", "set preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=-1},-1, NB_PRESETS-1, .flags = FLAGS, "preset" },192 { "p", "set preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=-1},-1, NB_PRESETS-1, .flags = FLAGS, "preset" },
189 { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=-1}, .flags = FLAGS, "preset" },193 { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=-1}, .flags = FLAGS, "preset" },
190 { "magma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_MAGMA}, .flags = FLAGS, "preset" },194 { "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
195 { "cividis", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_CIVIDIS}, .flags = FLAGS, "preset" },199 { "cividis", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_CIVIDIS}, .flags = FLAGS, "preset" },
196 { "range1", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_RANGE1}, .flags = FLAGS, "preset" },200 { "range1", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_RANGE1}, .flags = FLAGS, "preset" },
197 { "range2", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_RANGE2}, .flags = FLAGS, "preset" },201 { "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 },
198 { NULL }203 { NULL }
199};204};
200 205
@@ -235,9 +240,14 @@ static int query_formats(AVFilterContext *ctx) · 34 unmodified lines
235 return ff_set_common_formats(ctx, fmts_list);240 return ff_set_common_formats(ctx, fmts_list);
236}241}
237 242
243static inline float lerpf(float v0, float v1, float f)
244{
245 return v0 + (v1 - v0) * f;
246}
247
238#define PCLIP(v, max, dst, src, x) \248#define PCLIP(v, max, dst, src, x) \
239 if (v >= 0 && v <= max) { \249 if (v >= 0 && v <= max) { \
240 dst[x] = v; \250 dst[x] = lerpf(src[x], v, opacity);\
241 } else { \251 } else { \
242 dst[x] = src[x]; \252 dst[x] = src[x]; \
243 }253 }
@@ -249,7 +259,8 @@ static void pseudocolor_filter(int max, int width, int height, · 5 unmodified lines
249 ptrdiff_t ilinesize,259 ptrdiff_t ilinesize,
250 ptrdiff_t slinesize,260 ptrdiff_t slinesize,
251 ptrdiff_t dlinesize,261 ptrdiff_t dlinesize,
252 float *lut)262 float *lut,
263 float opacity)
253{264{
254 int x, y;265 int x, y;
255 266
@@ -272,7 +283,8 @@ static void pseudocolor_filter_11(int max, int width, int height, · 16 unmodified lines
272 ptrdiff_t ilinesize,283 ptrdiff_t ilinesize,
273 ptrdiff_t slinesize,284 ptrdiff_t slinesize,
274 ptrdiff_t dlinesize,285 ptrdiff_t dlinesize,
275 float *lut)286 float *lut,
287 float opacity)
276{288{
277 int x, y;289 int x, y;
278 290
@@ -294,7 +306,8 @@ static void pseudocolor_filter_11d(int max, int width, int height, · 15 unmodified lines
294 ptrdiff_t ilinesize,306 ptrdiff_t ilinesize,
295 ptrdiff_t slinesize,307 ptrdiff_t slinesize,
296 ptrdiff_t dlinesize,308 ptrdiff_t dlinesize,
297 float *lut)309 float *lut,
310 float opacity)
298{311{
299 int x, y;312 int x, y;
300 313
@@ -316,7 +329,8 @@ static void pseudocolor_filter_10(int max, int width, int height, · 15 unmodified lines
316 ptrdiff_t ilinesize,329 ptrdiff_t ilinesize,
317 ptrdiff_t slinesize,330 ptrdiff_t slinesize,
318 ptrdiff_t dlinesize,331 ptrdiff_t dlinesize,
319 float *lut)332 float *lut,
333 float opacity)
320{334{
321 int x, y;335 int x, y;
322 336
@@ -339,7 +353,8 @@ static void pseudocolor_filter_10d(int max, int width, int height, · 16 unmodified lines
339 ptrdiff_t ilinesize,353 ptrdiff_t ilinesize,
340 ptrdiff_t slinesize,354 ptrdiff_t slinesize,
341 ptrdiff_t dlinesize,355 ptrdiff_t dlinesize,
342 float *lut)356 float *lut,
357 float opacity)
343{358{
344 int x, y;359 int x, y;
345 360
@@ -362,7 +377,8 @@ static void pseudocolor_filter_16(int max, int width, int height, · 16 unmodified lines
362 ptrdiff_t ilinesize,377 ptrdiff_t ilinesize,
363 ptrdiff_t slinesize,378 ptrdiff_t slinesize,
364 ptrdiff_t dlinesize,379 ptrdiff_t dlinesize,
365 float *lut)380 float *lut,
381 float opacity)
366{382{
367 const uint16_t *index = (const uint16_t *)iindex;383 const uint16_t *index = (const uint16_t *)iindex;
368 const uint16_t *src = (const uint16_t *)ssrc;384 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
388 ptrdiff_t ilinesize,404 ptrdiff_t ilinesize,
389 ptrdiff_t slinesize,405 ptrdiff_t slinesize,
390 ptrdiff_t dlinesize,406 ptrdiff_t dlinesize,
391 float *lut)407 float *lut,
408 float opacity)
392{409{
393 const uint16_t *index = (const uint16_t *)iindex;410 const uint16_t *index = (const uint16_t *)iindex;
394 const uint16_t *src = (const uint16_t *)ssrc;411 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
414 ptrdiff_t ilinesize,431 ptrdiff_t ilinesize,
415 ptrdiff_t slinesize,432 ptrdiff_t slinesize,
416 ptrdiff_t dlinesize,433 ptrdiff_t dlinesize,
417 float *lut)434 float *lut,
435 float opacity)
418{436{
419 const uint16_t *index = (const uint16_t *)iindex;437 const uint16_t *index = (const uint16_t *)iindex;
420 const uint16_t *src = (const uint16_t *)ssrc;438 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
440 ptrdiff_t ilinesize,458 ptrdiff_t ilinesize,
441 ptrdiff_t slinesize,459 ptrdiff_t slinesize,
442 ptrdiff_t dlinesize,460 ptrdiff_t dlinesize,
443 float *lut)461 float *lut,
462 float opacity)
444{463{
445 const uint16_t *index = (const uint16_t *)iindex;464 const uint16_t *index = (const uint16_t *)iindex;
446 const uint16_t *src = (const uint16_t *)ssrc;465 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
469 ptrdiff_t ilinesize,488 ptrdiff_t ilinesize,
470 ptrdiff_t slinesize,489 ptrdiff_t slinesize,
471 ptrdiff_t dlinesize,490 ptrdiff_t dlinesize,
472 float *lut)491 float *lut,
492 float opacity)
473{493{
474 const uint16_t *index = (const uint16_t *)iindex;494 const uint16_t *index = (const uint16_t *)iindex;
475 const uint16_t *src = (const uint16_t *)ssrc;495 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
785 805
786 s->filter[plane](s->max, s->width[plane], slice_end - slice_start,806 s->filter[plane](s->max, s->width[plane], slice_end - slice_start,
787 index, src, dst, ilinesize, slinesize,807 index, src, dst, ilinesize, slinesize,
788 dlinesize, s->lut[plane]);808 dlinesize, s->lut[plane], s->opacity);
789 }809 }
790 810
791 return 0;811 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