eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-06 15:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

add parameter to gray by color key

Browse Source
This commit is contained in:
niels
2015-10-30 01:41:43 +01:00
parent 90f1c60cf4
commit 0babdc41be
5 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
veejay-current/veejay-server/libvje/effects/greyselect.c
View File

@@ -28,7 +28,7 @@ vj_effect *greyselect_init(int w, int h)
{
vj_effect *ve;
ve = (vj_effect *) vj_calloc(sizeof(vj_effect));
ve->num_params = 4;
ve->num_params = 5;
ve->defaults = (int *) vj_calloc(sizeof(int) * ve->num_params); /* default values */
ve->limits[0] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* min */
ve->limits[1] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* max */
@@ -36,6 +36,7 @@ vj_effect *greyselect_init(int w, int h)
ve->defaults[1] = 255; /* r */
ve->defaults[2] = 0; /* g */
ve->defaults[3] = 0; /* b */
ve->defaults[4] = 0; /* swap */
ve->limits[0][0] = 1;
ve->limits[1][0] = 9000;
@@ -47,20 +48,24 @@ vj_effect *greyselect_init(int w, int h)
ve->limits[0][3] = 0;
ve->limits[1][3] = 255;
ve->limits[0][4] = 0;
ve->limits[1][4] = 1;
ve->has_user = 0;
ve->parallel = 1;
ve->description = "Grayscale by Color Key (RGB)";
ve->extra_frame = 0;
ve->sub_format = 1;
ve->rgb_conv = 1;
ve->param_description = vje_build_param_list(ve->num_params,"Angle","Red","Green","Blue");
ve->param_description = vje_build_param_list(ve->num_params,"Angle","Red","Green","Blue", "Swap");
return ve;
}
void greyselect_apply( VJFrame *frame, int width,
int height, int i_angle, int r, int g,
int b)
int b, int swap)
{
uint8_t *fg_cb, *fg_cr;
@@ -91,24 +96,39 @@ void greyselect_apply( VJFrame *frame, int width,
tmp = 1 / kg1;
one_over_kc = 0xff * 2 * tmp - 0xff;
kfgy_scale = 0xf * (float) (_y) / kg1;
kfgy_scale = (int)(15.0f * (float) (_y) / kg1);
kg = kg1;
/* intialize pointers */
fg_cb = Cb;
fg_cr = Cr;
for (pos = (width * height); pos != 0; pos--) {
short xx, yy;
xx = (((fg_cb[pos]) * cb) + ((fg_cr[pos]) * cr)) >> 7;
yy = (((fg_cr[pos]) * cb) - ((fg_cb[pos]) * cr)) >> 7;
val = (xx * accept_angle_tg) >> 4;
if( swap == 0 ) {
for (pos = (width * height); pos != 0; pos--) {
short xx, yy;
xx = (((fg_cb[pos]) * cb) + ((fg_cr[pos]) * cr)) >> 7;
yy = (((fg_cr[pos]) * cb) - ((fg_cb[pos]) * cr)) >> 7;
val = (xx * accept_angle_tg) >> 4;
if (abs(yy) > val) {
Cb[pos]=128;
Cr[pos]=128;
if (abs(yy) > val) {
Cb[pos]=128;
Cr[pos]=128;
}
}
}
else {
for (pos = (width * height); pos != 0; pos--) {
short xx, yy;
xx = (((fg_cb[pos]) * cb) + ((fg_cr[pos]) * cr)) >> 7;
yy = (((fg_cr[pos]) * cb) - ((fg_cb[pos]) * cr)) >> 7;
val = (xx * accept_angle_tg) >> 4;
if (abs(yy) <= val) {
Cb[pos]=128;
Cr[pos]=128;
}
}
}
}
}
void greyselect_free(){}

2
veejay-current/veejay-server/libvje/effects/greyselect.h
View File

@@ -27,6 +27,6 @@
vj_effect *greyselect_init();
void greyselect_apply( VJFrame *frame, int width,
int height, int i_angle,
int red, int green, int blue);
int red, int green, int blue, int swap);
void greyselect_free();
#endif

2
veejay-current/veejay-server/libvje/effects/rgbkey.c
View File

@@ -191,7 +191,7 @@ void rgbkey_apply1(VJFrame *frame, VJFrame *frame2, int width,
if (val < (noise_level * noise_level)) {
kbg = 255;
Y[pos] = bg_y[pos];
Cb[pos] = br_cb[pos];
Cb[pos] = bg_cb[pos];
Cr[pos] = bg_cr[pos];
}
else {

2
veejay-current/veejay-server/libvje/internal.h
View File

@@ -442,7 +442,7 @@ extern void mtracer_apply(VJFrame *frame, VJFrame *frame2, int w,
extern void keyselect_apply(VJFrame *frame, VJFrame *frame2,int w,int h, int angle,int r,
int g, int b, int mode, int noise);
extern void greyselect_apply(VJFrame *frame, int w, int h, int angle, int r, int g, int b);
extern void greyselect_apply(VJFrame *frame, int w, int h, int angle, int r, int g, int b, int swap);
extern void isolate_apply(VJFrame *frame, int w, int h, int angle, int r, int g, int b,
int opacity);

2
veejay-current/veejay-server/libvje/vj-effman.c
View File

@@ -353,7 +353,7 @@ void vj_effman_apply_image_effect(
bwselect_apply(frames[0], frames[0]->width, frames[0]->height, arg[0], arg[1]);
break;
case VJ_IMAGE_EFFECT_GREYSELECT:
greyselect_apply(frames[0], frames[0]->width, frames[0]->height,arg[0],arg[1],arg[2],arg[3]);
greyselect_apply(frames[0], frames[0]->width, frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4]);
break;
case VJ_IMAGE_EFFECT_ISOLATE:
isolate_apply(frames[0],frames[0]->width,frames[0]->height,