Add blind-transition, improve blind-dissolve, and fix blind-{cone,spiral}-gradient

Signed-off-by: Mattias Andrée <maandree@kth.se>

4 files changed, 114 insertions, 20 deletions

diff --git a/src/blind-cone-gradient.c b/src/blind-cone-gradient.c
index 764307f..095c56e 100644
--- a/src/blind-cone-gradient.c
+++ b/src/blind-cone-gradient.c
@@ -96,7 +96,7 @@ PROCESS(struct stream *stream)
 				x = (TYPE)ix - x1;
 				if (!x && !y) {
 					v = 0.5;
-				} else {
+				} else { 
 					v = atan2(y, x);
 					v -= u;
 					v += 2 * (TYPE)M_PI;
@@ -112,7 +112,7 @@ PROCESS(struct stream *stream)
 					}
 				}
 				for (i = 0; i < stream->n_chan; i++)
-					buf[ptr][i] = x;
+					buf[ptr][i] = v;
 				if (++ptr == ELEMENTSOF(buf)) {
 					ewriteall(STDOUT_FILENO, buf, sizeof(buf), "<stdout>");
 					ptr = 0;
diff --git a/src/blind-dissolve.c b/src/blind-dissolve.c
index a73ae21..be92c2e 100644
--- a/src/blind-dissolve.c
+++ b/src/blind-dissolve.c
@@ -6,28 +6,23 @@ USAGE("[-r]")
 static size_t fm;
 static double fm_double;
 static float fm_float;
+static int reverse = 0;
 
-#define PROCESS(TYPE, NREV)\
+#define PROCESS(TYPE)\
 	do {\
 		size_t i;\
-		TYPE a;\
-		for (i = 0; i < n; i += stream->pixel_size) {\
-			a = ((TYPE *)(stream->buf + i))[3];\
-			a = a * (TYPE)(NREV f) / fm_##TYPE;\
-			((TYPE *)(stream->buf + i))[3] = a;\
-		}\
+		TYPE a = fm ? (TYPE)(reverse ? f : fm - f) / fm_##TYPE : (TYPE)0.5;\
+		for (i = 0; i < n; i += stream->pixel_size)\
+			((TYPE *)(stream->buf + i))[3] *= a;\
 	} while (0)
 
-static void process_xyza   (struct stream *stream, size_t n, size_t f) {PROCESS(double, fm -);}
-static void process_xyza_r (struct stream *stream, size_t n, size_t f) {PROCESS(double,);}
-static void process_xyzaf  (struct stream *stream, size_t n, size_t f) {PROCESS(float, fm -);}
-static void process_xyzaf_r(struct stream *stream, size_t n, size_t f) {PROCESS(float,);}
+static void process_lf(struct stream *stream, size_t n, size_t f) {PROCESS(double);}
+static void process_f (struct stream *stream, size_t n, size_t f) {PROCESS(float);}
 
 int
 main(int argc, char *argv[])
 {
 	struct stream stream;
-	int reverse = 0;
 	void (*process)(struct stream *stream, size_t n, size_t f);
 
 	ARGBEGIN {
@@ -43,12 +38,13 @@ main(int argc, char *argv[])
 
 	eopen_stream(&stream, NULL);
 
-	if (!strcmp(stream.pixfmt, "xyza"))
-		process = reverse ? process_xyza_r : process_xyza;
-	else if (!strcmp(stream.pixfmt, "xyza f"))
-		process = reverse ? process_xyzaf_r : process_xyzaf;
+	if (stream.encoding == DOUBLE)
+		process = process_lf;
 	else
-		eprintf("pixel format %s is not supported, try xyza\n", stream.pixfmt);
+		process = process_f;
+
+	if (!stream.frames)
+		eprintf("video's length is not recorded");
 
 	fprint_stream_head(stdout, &stream);
 	efflush(stdout, "<stdout>");
diff --git a/src/blind-spiral-gradient.c b/src/blind-spiral-gradient.c
index a52205d..6ea0601 100644
--- a/src/blind-spiral-gradient.c
+++ b/src/blind-spiral-gradient.c
@@ -162,7 +162,7 @@ PROCESS(struct stream *stream)
 				else
 					r = mod(r, 1 / (TYPE)spirals) * (TYPE)spirals + r - mod(r, (TYPE)1);
 				for (i = 0; i < stream->n_chan; i++)
-					buf[ptr][i] = x;
+					buf[ptr][i] = r;
 				if (++ptr == ELEMENTSOF(buf)) {
 					ewriteall(STDOUT_FILENO, buf, sizeof(buf), "<stdout>");
 					ptr = 0;
diff --git a/src/blind-transition.c b/src/blind-transition.c
new file mode 100644
index 0000000..8463575
--- /dev/null
+++ b/src/blind-transition.c
@@ -0,0 +1,98 @@
+/* See LICENSE file for copyright and license details. */
+#include "common.h"
+
+USAGE("[-ir] [-s softness-stream]")
+
+static size_t fm;
+static double fm_double;
+static float fm_float;
+static int reverse = 0;
+static int invert = 0;
+static const char *softness_file = NULL;
+static struct stream softness;
+
+#define PROCESS(TYPE)\
+	do {\
+		size_t i, j = 0;\
+		TYPE a, s, t = fm ? (TYPE)(reverse ? fm - f : f) / fm_##TYPE : 0.5;\
+		if (!softness_file) {\
+			for (i = 0; i < n; i += stream->pixel_size) {\
+				a = ((TYPE *)(stream->buf + i))[1];\
+				if (invert)\
+					a = (TYPE)1 - a;\
+				a = (TYPE)(a >= t);\
+				((TYPE *)(stream->buf + i))[0] = a * (TYPE)D65_XYZ_X;\
+				((TYPE *)(stream->buf + i))[1] = a;\
+				((TYPE *)(stream->buf + i))[2] = a * (TYPE)D65_XYZ_Z;\
+				((TYPE *)(stream->buf + i))[3] = 1;\
+			}\
+		} else {\
+			for (i = 0; i < n; i += stream->pixel_size, j += softness.pixel_size) {\
+				while (j + softness.pixel_size > softness.ptr) {\
+					memmove(softness.buf, softness.buf + j, softness.ptr -= j);\
+					j = 0;\
+					if (!eread_stream(&softness, SIZE_MAX))\
+						return;\
+				}\
+				s  = ((TYPE *)(softness.buf + j))[1];\
+				s *= ((TYPE *)(softness.buf + j))[3];\
+				a  = ((TYPE *)(stream->buf + i))[1];\
+				if (invert)\
+					a = (TYPE)1 - a;\
+				a = (a / (1 + 2 * s) + s - t) / s;\
+				a = a < 0 ? (TYPE)0 : a > 1 ? (TYPE)1 : a;\
+				((TYPE *)(stream->buf + i))[0] = a * (TYPE)D65_XYZ_X;\
+				((TYPE *)(stream->buf + i))[1] = a;\
+				((TYPE *)(stream->buf + i))[2] = a * (TYPE)D65_XYZ_Z;\
+				((TYPE *)(stream->buf + i))[3] = 1;\
+			}\
+		}\
+	} while (0)
+
+static void process_lf(struct stream *stream, size_t n, size_t f) {PROCESS(double);}
+static void process_f (struct stream *stream, size_t n, size_t f) {PROCESS(float);}
+
+int
+main(int argc, char *argv[])
+{
+	struct stream stream;
+	void (*process)(struct stream *stream, size_t n, size_t f);
+
+	ARGBEGIN {
+	case 'i':
+		invert = 1;
+		break;
+	case 'r':
+		reverse = 1;
+		break;
+	case 's':
+		softness_file = UARGF();
+		break;
+	default:
+		usage();
+	} ARGEND;
+
+	if (argc)
+		usage();
+
+	eopen_stream(&stream, NULL);
+	if (softness_file) {
+		eopen_stream(&softness, softness_file);
+		echeck_compat(&stream, &softness);
+	}
+
+	if (stream.encoding == DOUBLE)
+		process = process_lf;
+	else
+		process = process_f;
+
+	if (!stream.frames)
+		eprintf("video's length is not recorded");
+
+	fprint_stream_head(stdout, &stream);
+	efflush(stdout, "<stdout>");
+	fm_double = (double)(fm = stream.frames - 1);
+	fm_float = (float)fm_double;
+	process_each_frame_segmented(&stream, STDOUT_FILENO, "<stdout>", process);
+	return 0;
+}