Check return value from SDL_Init().
[movit] / demo.cpp
index 1e32e08..6e5f18c 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -19,6 +19,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_opengl.h>
 #include <SDL/SDL_image.h>
+#include <png.h>
 
 #include "init.h"
 #include "effect.h"
@@ -30,9 +31,6 @@
 #include "lift_gamma_gain_effect.h"
 #include "saturation_effect.h"
 #include "diffusion_effect.h"
-#include "overlay_effect.h"
-#include "resample_effect.h"
-#include "resize_effect.h"
 
 unsigned char result[WIDTH * HEIGHT * 4];
 
@@ -129,38 +127,46 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
 
        SDL_FreeSurface(img);
 
-       unsigned char *x = (unsigned char *)converted->pixels;
-       for (int i = 0; i < img->w * img->h; ++i) {
-               if (x[i * 4 + 3] == 0) {
-                       x[i * 4 + 0] = 255;
-                       x[i * 4 + 1] = 255;
-                       x[i * 4 + 2] = 255;
-               }
-       }
-
        return (unsigned char *)converted->pixels;
 }
 
-void write_ppm(const char *filename, unsigned char *screenbuf)
+void write_png(const char *filename, unsigned char *screenbuf)
 {
-       FILE *fp = fopen(filename, "w");
-       fprintf(fp, "P6\n%d %d\n255\n", WIDTH, HEIGHT);
+       FILE *fp = fopen(filename, "wb");
+       png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+       png_infop info_ptr = png_create_info_struct(png_ptr);
+       
+       if (setjmp(png_jmpbuf(png_ptr))) {
+               fclose(fp);
+               fprintf(stderr, "Write to %s failed; exiting.\n", filename);
+               exit(1);
+       }
+
+       png_set_IHDR(png_ptr, info_ptr, WIDTH, HEIGHT, 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
+       png_bytep *row_pointers = new png_bytep[HEIGHT];
        for (unsigned y = 0; y < HEIGHT; ++y) {
-               unsigned char *srcptr = screenbuf + ((HEIGHT - y - 1) * WIDTH) * 4;
-               for (unsigned x = 0; x < WIDTH; ++x) {
-                       fputc(srcptr[x * 4 + 2], fp);
-                       fputc(srcptr[x * 4 + 1], fp);
-                       fputc(srcptr[x * 4 + 0], fp);
-               }
+               row_pointers[y] = screenbuf + ((HEIGHT - y - 1) * WIDTH) * 4;
        }
+
+       png_init_io(png_ptr, fp);
+       png_set_rows(png_ptr, info_ptr, row_pointers);
+       png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR, NULL);
+       png_destroy_write_struct(&png_ptr, &info_ptr);
        fclose(fp);
+
+       delete[] row_pointers;
 }
 
 int main(int argc, char **argv)
 {
        bool quit = false;
 
-       SDL_Init(SDL_INIT_EVERYTHING);
+       if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
+               fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
+               exit(1);
+       }
+       SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
        SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@ -179,47 +185,13 @@ int main(int argc, char **argv)
 
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_sRGB;
-       inout_format.gamma_curve = GAMMA_LINEAR;
+       inout_format.gamma_curve = GAMMA_sRGB;
 
        FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, img_w, img_h);
        chain.add_input(input);
-
-       unsigned char *src_overlay1 = load_image("overlay1.png", &img_w, &img_h);
-#if 0
-       float *src_bleh = new float[img_w * img_h * 4];
-       for (int i = 0; i < img_w * img_h; ++i) {
-               float r = src_overlay1[i * 4 + 0] / 255.0f;
-               float g = src_overlay1[i * 4 + 1] / 255.0f;
-               float b = src_overlay1[i * 4 + 2] / 255.0f;
-               float a = src_overlay1[i * 4 + 3] / 255.0f;
-       //      src_bleh[i * 4 + 0] = r * a;
-       //      src_bleh[i * 4 + 1] = g * a;
-       //      src_bleh[i * 4 + 2] = b * a;
-               src_bleh[i * 4 + 0] = r;
-               src_bleh[i * 4 + 1] = g;
-               src_bleh[i * 4 + 2] = b;
-               src_bleh[i * 4 + 3] = a;
-       }
-       FlatInput *overlay1 = new FlatInput(inout_format, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, GL_FLOAT, img_w, img_h);
-#endif
-       FlatInput *overlay1 = new FlatInput(inout_format, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, img_w, img_h);
-       chain.add_input(overlay1);
-
-       unsigned char *src_overlay2 = load_image("overlay2.png", &img_w, &img_h);
-       FlatInput *overlay2 = new FlatInput(inout_format, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, img_w, img_h);
-       chain.add_input(overlay2);
-
-       Effect *mix1 = chain.add_effect(new OverlayEffect(), overlay2, overlay1);
-       //Effect *mix1_resized = chain.add_effect(new ResampleEffect(), mix1);
-       Effect *mix1_resized = chain.add_effect(new ResizeEffect(), mix1);
-       CHECK(mix1_resized->set_int("width", 1280));
-       CHECK(mix1_resized->set_int("height", 720));
-       Effect *mix2 = chain.add_effect(new OverlayEffect(), input, mix1_resized);
-//     Effect *mix2 = chain.add_effect(new OverlayEffect(), input, overlay1);
-
-       //Effect *lift_gamma_gain_effect = chain.add_effect(new LiftGammaGainEffect());
-       //Effect *saturation_effect = chain.add_effect(new SaturationEffect());
-       //Effect *diffusion_effect = chain.add_effect(new DiffusionEffect());
+       Effect *lift_gamma_gain_effect = chain.add_effect(new LiftGammaGainEffect());
+       Effect *saturation_effect = chain.add_effect(new SaturationEffect());
+       Effect *diffusion_effect = chain.add_effect(new DiffusionEffect());
        //Effect *vignette_effect = chain.add_effect(new VignetteEffect());
        //Effect *sandbox_effect = chain.add_effect(new SandboxEffect());
        //sandbox_effect->set_float("parm", 42.0f);
@@ -265,18 +237,15 @@ int main(int argc, char **argv)
 
                ++frame;
 
-               //update_hsv(lift_gamma_gain_effect, saturation_effect);
+               update_hsv(lift_gamma_gain_effect, saturation_effect);
                //vignette_effect->set_float("radius", radius);
                //vignette_effect->set_float("inner_radius", inner_radius);
                //vignette_effect->set_vec2("center", (float[]){ 0.7f, 0.5f });
 
-               //CHECK(diffusion_effect->set_float("radius", blur_radius));
-               //CHECK(diffusion_effect->set_float("blurred_mix_amount", blurred_mix_amount));
+               CHECK(diffusion_effect->set_float("radius", blur_radius));
+               CHECK(diffusion_effect->set_float("blurred_mix_amount", blurred_mix_amount));
 
                input->set_pixel_data(src_img);
-               overlay1->set_pixel_data(src_overlay1);
-               //overlay1->set_pixel_data(src_bleh);
-               overlay2->set_pixel_data(src_overlay2);
                chain.render_to_screen();
                
                glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);
@@ -307,8 +276,8 @@ int main(int argc, char **argv)
                check_error();
                if (screenshot) {
                        char filename[256];
-                       sprintf(filename, "frame%05d.ppm", frame);
-                       write_ppm(filename, screenbuf);
+                       sprintf(filename, "frame%05d.png", frame);
+                       write_png(filename, screenbuf);
                        printf("Screenshot: %s\n", filename);
                        screenshot = false;
                }