X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=demo.cpp;h=1c38fc30b7ecf70e9f4351920d55b2344e1515fc;hp=2243f2dd702b90419ef491963636c6508c76b669;hb=eff011224abc5dc81f801f3ea44572287a55bcac;hpb=34f5f331bd3b643949ccbb0c3488af2823634d59 diff --git a/demo.cpp b/demo.cpp index 2243f2d..1c38fc3 100644 --- a/demo.cpp +++ b/demo.cpp @@ -1,34 +1,41 @@ -#define GL_GLEXT_PROTOTYPES 1 #define NO_SDL_GLEXT 1 #define WIDTH 1280 #define HEIGHT 720 -#include -#include -#include -#include -#include +#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "init.h" +#include "diffusion_effect.h" #include "effect.h" #include "effect_chain.h" -#include "util.h" -#include "opengl.h" -#include "widgets.h" - #include "flat_input.h" +#include "image_format.h" +#include "init.h" #include "lift_gamma_gain_effect.h" #include "saturation_effect.h" -#include "diffusion_effect.h" +#include "util.h" +#include "widgets.h" + +using namespace movit; unsigned char result[WIDTH * HEIGHT * 4]; @@ -93,13 +100,13 @@ void mouse(int x, int y) unsigned char *load_image(const char *filename, unsigned *w, unsigned *h) { SDL_Surface *img = IMG_Load(filename); - if (img == NULL) { + if (img == nullptr) { fprintf(stderr, "Load of '%s' failed\n", filename); exit(1); } SDL_PixelFormat rgba_fmt; - rgba_fmt.palette = NULL; + rgba_fmt.palette = nullptr; rgba_fmt.BitsPerPixel = 32; rgba_fmt.BytesPerPixel = 8; rgba_fmt.Rloss = rgba_fmt.Gloss = rgba_fmt.Bloss = rgba_fmt.Aloss = 0; @@ -114,9 +121,6 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h) rgba_fmt.Gshift = 8; rgba_fmt.Bshift = 0; rgba_fmt.Ashift = 24; - - rgba_fmt.colorkey = 0; - rgba_fmt.alpha = 255; SDL_Surface *converted = SDL_ConvertSurface(img, &rgba_fmt, SDL_SWSURFACE); @@ -128,38 +132,70 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h) 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, nullptr, nullptr, nullptr); + 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, nullptr); + 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); - SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL); - SDL_WM_SetCaption("OpenGL window", NULL); - init_movit(); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); + // SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); + SDL_Window *window = SDL_CreateWindow("OpenGL window", + SDL_WINDOWPOS_UNDEFINED, + SDL_WINDOWPOS_UNDEFINED, + WIDTH, HEIGHT, + SDL_WINDOW_OPENGL); + SDL_GLContext context = SDL_GL_CreateContext(window); + assert(context != nullptr); + + CHECK(init_movit(".", MOVIT_DEBUG_ON)); printf("GPU texture subpixel precision: about %.1f bits\n", log2(1.0f / movit_texel_subpixel_precision)); + printf("Wrongly rounded x+0.48 or x+0.52 values: %d/510\n", + movit_num_wrongly_rounded); + if (movit_num_wrongly_rounded > 0) { + printf("Rounding off in the shader to compensate.\n"); + } unsigned img_w, img_h; - unsigned char *src_img = load_image("blg_wheels_woman_1.jpg", &img_w, &img_h); + unsigned char *src_img = load_image(argc > 1 ? argv[1] : "blg_wheels_woman_1.jpg", &img_w, &img_h); EffectChain chain(WIDTH, HEIGHT); glViewport(0, 0, WIDTH, HEIGHT); @@ -168,7 +204,7 @@ int main(int argc, char **argv) inout_format.color_space = COLORSPACE_sRGB; inout_format.gamma_curve = GAMMA_sRGB; - FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA, GL_UNSIGNED_BYTE, img_w, img_h); + FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, img_w, img_h); chain.add_input(input); Effect *lift_gamma_gain_effect = chain.add_effect(new LiftGammaGainEffect()); Effect *saturation_effect = chain.add_effect(new SaturationEffect()); @@ -177,7 +213,8 @@ int main(int argc, char **argv) //Effect *sandbox_effect = chain.add_effect(new SandboxEffect()); //sandbox_effect->set_float("parm", 42.0f); //chain.add_effect(new MirrorEffect()); - chain.add_output(inout_format); + chain.add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + chain.set_dither_bits(8); chain.finalize(); // generate a PBO to hold the data we read back with glReadPixels() @@ -185,9 +222,10 @@ int main(int argc, char **argv) GLuint pbo; glGenBuffers(1, &pbo); glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo); - glBufferData(GL_PIXEL_PACK_BUFFER_ARB, WIDTH * HEIGHT * 4, NULL, GL_STREAM_READ); + glBufferData(GL_PIXEL_PACK_BUFFER_ARB, WIDTH * HEIGHT * 4, nullptr, GL_STREAM_READ); - make_hsv_wheel_texture(); + init_hsv_resources(); + check_error(); int frame = 0; bool screenshot = false; @@ -196,7 +234,7 @@ int main(int argc, char **argv) clock_gettime(CLOCK_MONOTONIC, &start); #else struct timeval start, now; - gettimeofday(&start, NULL); + gettimeofday(&start, nullptr); #endif while (!quit) { @@ -222,8 +260,8 @@ int main(int argc, char **argv) //vignette_effect->set_float("inner_radius", inner_radius); //vignette_effect->set_vec2("center", (float[]){ 0.7f, 0.5f }); - diffusion_effect->set_float("radius", blur_radius); - 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); chain.render_to_screen(); @@ -235,7 +273,6 @@ int main(int argc, char **argv) glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 0); check_error(); - glLoadIdentity(); draw_hsv_wheel(0.0f, lift_rad, lift_theta, lift_v); draw_hsv_wheel(0.2f, gamma_rad, gamma_theta, gamma_v); draw_hsv_wheel(0.4f, gain_rad, gain_theta, gain_v); @@ -247,7 +284,7 @@ int main(int argc, char **argv) draw_saturation_bar(0.75f, blur_radius / 100.0f); draw_saturation_bar(0.80f, blurred_mix_amount); - SDL_GL_SwapBuffers(); + SDL_GL_SwapWindow(window); check_error(); glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo); @@ -256,8 +293,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; } @@ -272,14 +309,24 @@ int main(int argc, char **argv) double elapsed = now.tv_sec - start.tv_sec + 1e-9 * (now.tv_nsec - start.tv_nsec); #else - gettimeofday(&now, NULL); + gettimeofday(&now, nullptr); double elapsed = now.tv_sec - start.tv_sec + 1e-6 * (now.tv_usec - start.tv_usec); #endif printf("%d frames in %.3f seconds = %.1f fps (%.1f ms/frame)\n", frame, elapsed, frame / elapsed, 1e3 * elapsed / frame); + + // Reset every 100 frames, so that local variations in frame times + // (especially for the first few frames, when the shaders are + // compiled etc.) don't make it hard to measure for the entire + // remaining duration of the program. + if (frame == 100) { + frame = 0; + start = now; + } #endif } + cleanup_hsv_resources(); return 0; }