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

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

1 files changed, 13 insertions, 17 deletions

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>");