From 4df594b3f48679f594e6f738981cb3baca8a42d9 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 7 May 2017 16:11:31 +0200 Subject: Add support for floats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/blind-dissolve.c | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) (limited to 'src/blind-dissolve.c') diff --git a/src/blind-dissolve.c b/src/blind-dissolve.c index 719cd28..1efe2a3 100644 --- a/src/blind-dissolve.c +++ b/src/blind-dissolve.c @@ -8,31 +8,24 @@ USAGE("[-r]") static size_t fm; -static double fmd; - -static void -process_xyza(struct stream *stream, size_t n, size_t f) -{ - size_t i; - double a; - for (i = 0; i < n; i += stream->pixel_size) { - a = ((double *)(stream->buf + i))[3]; - a = a * (double)(fm - f) / fmd; - ((double *)(stream->buf + i))[3] = a; - } -} - -static void -process_xyza_r(struct stream *stream, size_t n, size_t f) -{ - size_t i; - double a; - for (i = 0; i < n; i += stream->pixel_size) { - a = ((double *)(stream->buf + i))[3]; - a = a * (double)f / fmd; - ((double *)(stream->buf + i))[3] = a; - } -} +static double fm_double; +static float fm_float; + +#define PROCESS(TYPE, NREV)\ + 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;\ + }\ + } 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,);} int main(int argc, char *argv[]) @@ -56,12 +49,15 @@ main(int argc, char *argv[]) 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; else eprintf("pixel format %s is not supported, try xyza\n", stream.pixfmt); fprint_stream_head(stdout, &stream); efflush(stdout, ""); - fmd = fm = stream.frames - 1; + fm_double = fm = stream.frames - 1; + fm_float = (float)fm_double; process_each_frame_segmented(&stream, STDOUT_FILENO, "", process); return 0; } -- cgit v1.2.3-70-g09d2