[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55924] trunk/blender/source/blender/ blenkernel/intern/seqeffects.c: Fixes for sequencer effects
Sergey Sharybin
sergey.vfx at gmail.com
Tue Apr 9 18:20:25 CEST 2013
Revision: 55924
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55924
Author: nazgul
Date: 2013-04-09 16:20:24 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
Fixes for sequencer effects
- Add and subtract effects will now affect on only RGB channels,
and alpha of first input is used as an alpha for the result.
Also solved creepyness with straight->premul->straight conversion
in byte versions of add/subtract.
- Solved issue with multiply modifier, which lead to white*white
not being white (was off by 1.0/255) due to wrong optimization
of division by 255 with shr by 8.
According to Ton this issue goes back to 2000!
This fixes #34811: Wrong result of add/subtract effects
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2013-04-09 15:30:15 UTC (rev 55923)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2013-04-09 16:20:24 UTC (rev 55924)
@@ -831,33 +831,26 @@
static void do_add_effect_byte(float facf0, float facf1, int x, int y, unsigned char *rect1, unsigned char *rect2,
unsigned char *out)
{
- int xo;
+ int xo, fac1, fac3;
unsigned char *cp1, *cp2, *rt;
- float fac1, fac3;
- float tempc[4], rt1[4], rt2[4];
xo = x;
cp1 = rect1;
cp2 = rect2;
rt = out;
- fac1 = facf0;
- fac3 = facf1;
+ fac1 = (int)(256.0f * facf0);
+ fac3 = (int)(256.0f * facf1);
while (y--) {
x = xo;
while (x--) {
- straight_uchar_to_premul_float(rt1, cp1);
- straight_uchar_to_premul_float(rt2, cp2);
+ rt[0] = min_ii(cp1[0] + ((fac1 * cp2[0]) >> 8), 255);
+ rt[1] = min_ii(cp1[1] + ((fac1 * cp2[1]) >> 8), 255);
+ rt[2] = min_ii(cp1[2] + ((fac1 * cp2[2]) >> 8), 255);
+ rt[3] = cp1[3];
- tempc[0] = rt1[0] + fac1 * rt2[0];
- tempc[1] = rt1[1] + fac1 * rt2[1];
- tempc[2] = rt1[2] + fac1 * rt2[2];
- tempc[3] = min_ff(1.0f, rt1[3] + fac1 * rt2[3]);
-
- premul_float_to_straight_uchar(rt, tempc);
-
cp1 += 4; cp2 += 4; rt += 4;
}
@@ -867,16 +860,11 @@
x = xo;
while (x--) {
- straight_uchar_to_premul_float(rt1, cp1);
- straight_uchar_to_premul_float(rt2, cp2);
+ rt[0] = min_ii(cp1[0] + ((fac3 * cp2[0]) >> 8), 255);
+ rt[1] = min_ii(cp1[1] + ((fac3 * cp2[1]) >> 8), 255);
+ rt[2] = min_ii(cp1[2] + ((fac3 * cp2[2]) >> 8), 255);
+ rt[3] = cp1[3];
- tempc[0] = rt1[0] + fac3 * rt2[0];
- tempc[1] = rt1[1] + fac3 * rt2[1];
- tempc[2] = rt1[2] + fac3 * rt2[2];
- tempc[3] = min_ff(1.0f, rt1[3] + fac3 * rt2[3]);
-
- premul_float_to_straight_uchar(rt, tempc);
-
cp1 += 4; cp2 += 4; rt += 4;
}
}
@@ -885,7 +873,7 @@
static void do_add_effect_float(float facf0, float facf1, int x, int y, float *rect1, float *rect2, float *out)
{
int xo;
- float fac1, fac3;
+ float m, fac1, fac3;
float *rt1, *rt2, *rt;
xo = x;
@@ -899,10 +887,11 @@
while (y--) {
x = xo;
while (x--) {
- rt[0] = rt1[0] + fac1 * rt2[0];
- rt[1] = rt1[1] + fac1 * rt2[1];
- rt[2] = rt1[2] + fac1 * rt2[2];
- rt[3] = min_ff(1.0f, rt1[3] + fac1 * rt2[3]);
+ m = 1.0f - (rt1[3] * (1.0f - fac1));
+ rt[0] = rt1[0] + m * rt2[0];
+ rt[1] = rt1[1] + m * rt2[1];
+ rt[2] = rt1[2] + m * rt2[2];
+ rt[3] = rt1[3];
rt1 += 4; rt2 += 4; rt += 4;
}
@@ -913,10 +902,11 @@
x = xo;
while (x--) {
- rt[0] = rt1[0] + fac1 * rt2[0];
- rt[1] = rt1[1] + fac1 * rt2[1];
- rt[2] = rt1[2] + fac1 * rt2[2];
- rt[3] = min_ff(1.0f, rt1[3] + fac3 * rt2[3]);
+ m = 1.0f - (rt1[3] * (1.0f - fac3));
+ rt[0] = rt1[0] + m * rt2[0];
+ rt[1] = rt1[1] + m * rt2[1];
+ rt[2] = rt1[2] + m * rt2[2];
+ rt[3] = rt1[3];
rt1 += 4; rt2 += 4; rt += 4;
}
@@ -946,35 +936,25 @@
static void do_sub_effect_byte(float facf0, float facf1, int x, int y, unsigned char *rect1, unsigned char *rect2, unsigned char *out)
{
- int xo;
+ int xo, fac1, fac3;
unsigned char *cp1, *cp2, *rt;
- float fac1, fac3;
- float tempc[4], rt1[4], rt2[4];
xo = x;
cp1 = rect1;
cp2 = rect2;
rt = out;
- fac1 = facf0;
- fac3 = facf1;
+ fac1 = (int) (256.0f * facf0);
+ fac3 = (int) (256.0f * facf1);
while (y--) {
x = xo;
while (x--) {
- straight_uchar_to_premul_float(rt1, cp1);
- straight_uchar_to_premul_float(rt2, cp2);
+ rt[0] = max_ii(cp1[0] - ((fac1 * cp2[0]) >> 8), 0);
+ rt[1] = max_ii(cp1[1] - ((fac1 * cp2[1]) >> 8), 0);
+ rt[2] = max_ii(cp1[2] - ((fac1 * cp2[2]) >> 8), 0);
+ rt[3] = cp1[3];
- tempc[0] = max_ff(rt1[0] - fac1 * rt2[0], 0.0f);
- tempc[1] = max_ff(rt1[1] - fac1 * rt2[1], 0.0f);
- tempc[2] = max_ff(rt1[2] - fac1 * rt2[2], 0.0f);
- tempc[3] = max_ff(rt1[3] - fac1 * rt2[3], 0.0f);
-
- if (tempc[3] < 1e-6f)
- tempc[3] = 0.0f;
-
- premul_float_to_straight_uchar(rt, tempc);
-
cp1 += 4; cp2 += 4; rt += 4;
}
@@ -984,19 +964,11 @@
x = xo;
while (x--) {
- straight_uchar_to_premul_float(rt1, cp1);
- straight_uchar_to_premul_float(rt2, cp2);
+ rt[0] = max_ii(cp1[0] - ((fac3 * cp2[0]) >> 8), 0);
+ rt[1] = max_ii(cp1[1] - ((fac3 * cp2[1]) >> 8), 0);
+ rt[2] = max_ii(cp1[2] - ((fac3 * cp2[2]) >> 8), 0);
+ rt[3] = cp1[3];
- tempc[0] = max_ff(rt1[0] - fac3 * rt2[0], 0.0f);
- tempc[1] = max_ff(rt1[1] - fac3 * rt2[1], 0.0f);
- tempc[2] = max_ff(rt1[2] - fac3 * rt2[2], 0.0f);
- tempc[3] = max_ff(rt1[3] - fac3 * rt2[3], 0.0f);
-
- if (tempc[3] < 1e-6f)
- tempc[3] = 0.0f;
-
- premul_float_to_straight_uchar(rt, tempc);
-
cp1 += 4; cp2 += 4; rt += 4;
}
}
@@ -1005,7 +977,7 @@
static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *rect1, float *rect2, float *out)
{
int xo;
- float fac1, fac3;
+ float m, fac1, fac3;
float *rt1, *rt2, *rt;
xo = x;
@@ -1019,14 +991,12 @@
while (y--) {
x = xo;
while (x--) {
- rt[0] = max_ff(rt1[0] - fac1 * rt2[0], 0.0f);
- rt[1] = max_ff(rt1[1] - fac1 * rt2[1], 0.0f);
- rt[2] = max_ff(rt1[2] - fac1 * rt2[2], 0.0f);
- rt[3] = max_ff(rt1[3] - fac1 * rt2[3], 0.0f);
+ m = 1.0f - (rt1[3] * (1 - fac3));
+ rt[0] = max_ff(rt1[0] - m * rt2[0], 0.0f);
+ rt[1] = max_ff(rt1[1] - m * rt2[1], 0.0f);
+ rt[2] = max_ff(rt1[2] - m * rt2[2], 0.0f);
+ rt[3] = rt1[3];
- if (rt[3] < 1e-6f)
- rt[3] = 0.0f;
-
rt1 += 4; rt2 += 4; rt += 4;
}
@@ -1036,14 +1006,12 @@
x = xo;
while (x--) {
- rt[0] = max_ff(rt1[0] - fac3 * rt2[0], 0.0f);
- rt[1] = max_ff(rt1[1] - fac3 * rt2[1], 0.0f);
- rt[2] = max_ff(rt1[2] - fac3 * rt2[2], 0.0f);
- rt[3] = max_ff(rt1[3] - fac3 * rt2[3], 0.0f);
+ m = 1.0f - (rt1[3] * (1 - fac3));
+ rt[0] = max_ff(rt1[0] - m * rt2[0], 0.0f);
+ rt[1] = max_ff(rt1[1] - m * rt2[1], 0.0f);
+ rt[2] = max_ff(rt1[2] - m * rt2[2], 0.0f);
+ rt[3] = rt1[3];
- if (rt[3] < 1e-6f)
- rt[3] = 0.0f;
-
rt1 += 4; rt2 += 4; rt += 4;
}
}
@@ -1177,10 +1145,10 @@
x = xo;
while (x--) {
- rt[0] = rt1[0] + ((fac1 * rt1[0] * (rt2[0] - 256)) >> 16);
- rt[1] = rt1[1] + ((fac1 * rt1[1] * (rt2[1] - 256)) >> 16);
- rt[2] = rt1[2] + ((fac1 * rt1[2] * (rt2[2] - 256)) >> 16);
- rt[3] = rt1[3] + ((fac1 * rt1[3] * (rt2[3] - 256)) >> 16);
+ rt[0] = rt1[0] + ((fac1 * rt1[0] * (rt2[0] - 255)) >> 16);
+ rt[1] = rt1[1] + ((fac1 * rt1[1] * (rt2[1] - 255)) >> 16);
+ rt[2] = rt1[2] + ((fac1 * rt1[2] * (rt2[2] - 255)) >> 16);
+ rt[3] = rt1[3] + ((fac1 * rt1[3] * (rt2[3] - 255)) >> 16);
rt1 += 4; rt2 += 4; rt += 4;
}
@@ -1191,10 +1159,10 @@
x = xo;
while (x--) {
- rt[0] = rt1[0] + ((fac3 * rt1[0] * (rt2[0] - 256)) >> 16);
- rt[1] = rt1[1] + ((fac3 * rt1[1] * (rt2[1] - 256)) >> 16);
- rt[2] = rt1[2] + ((fac3 * rt1[2] * (rt2[2] - 256)) >> 16);
- rt[3] = rt1[3] + ((fac3 * rt1[3] * (rt2[3] - 256)) >> 16);
+ rt[0] = rt1[0] + ((fac3 * rt1[0] * (rt2[0] - 255)) >> 16);
+ rt[1] = rt1[1] + ((fac3 * rt1[1] * (rt2[1] - 255)) >> 16);
+ rt[2] = rt1[2] + ((fac3 * rt1[2] * (rt2[2] - 255)) >> 16);
+ rt[3] = rt1[3] + ((fac3 * rt1[3] * (rt2[3] - 255)) >> 16);
rt1 += 4; rt2 += 4; rt += 4;
}
More information about the Bf-blender-cvs
mailing list