Fix so one can use images with other resolutions than 1280x720.

[nageru] / image_input.cpp

diff --git a/image_input.cpp b/image_input.cpp
index 70bffb0f863225c1673a42d3df0f14757ae7c6f2..a224af9d47e1d8fc5a0f16ac702f5ce66cbdd7d5 100644 (file)
--- a/image_input.cpp
+++ b/image_input.cpp
@@ -70,14 +70,17 @@ string search_for_file(const string &filename)
 
 ImageInput::ImageInput(const string &filename)
        : movit::FlatInput({movit::COLORSPACE_sRGB, movit::GAMMA_sRGB}, movit::FORMAT_RGBA_POSTMULTIPLIED_ALPHA,
-                          GL_UNSIGNED_BYTE, 1280, 720),  // FIXME
+                          GL_UNSIGNED_BYTE, 1280, 720),  // Resolution will be overwritten.
+         filename(filename),
          pathname(search_for_file(filename)),
-         current_image(load_image(pathname))
+         current_image(load_image(filename, pathname))
 {
        if (current_image == nullptr) {  // Could happen even though search_for_file() returned.
                fprintf(stderr, "Couldn't load image, exiting.\n");
                exit(1);
        }
+       set_width(current_image->width);
+       set_height(current_image->height);
        set_pixel_data(current_image->pixels.get());
 }
 
@@ -99,7 +102,7 @@ void ImageInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
        movit::FlatInput::set_gl_state(glsl_program_num, prefix, sampler_num);
 }
 
-shared_ptr<const ImageInput::Image> ImageInput::load_image(const string &pathname)
+shared_ptr<const ImageInput::Image> ImageInput::load_image(const string &filename, const string &pathname)
 {
        unique_lock<mutex> lock(all_images_lock);  // Held also during loading.
        if (all_images.count(pathname)) {
@@ -109,7 +112,7 @@ shared_ptr<const ImageInput::Image> ImageInput::load_image(const string &pathnam
        all_images[pathname] = load_image_raw(pathname);
        timespec first_modified = all_images[pathname]->last_modified;
        update_threads[pathname] =
-               thread(bind(update_thread_func, pathname, first_modified));
+               thread(bind(update_thread_func, filename, pathname, first_modified));
 
        return all_images[pathname];
 }
@@ -205,7 +208,6 @@ shared_ptr<const ImageInput::Image> ImageInput::load_image_raw(const string &pat
                return nullptr;
        }
 
-       // TODO: Scale down if needed!
        uint8_t *pic_data[4] = {nullptr};
        unique_ptr<uint8_t *, decltype(av_freep)*> pic_data_cleanup(
                &pic_data[0], av_freep);
@@ -229,14 +231,18 @@ shared_ptr<const ImageInput::Image> ImageInput::load_image_raw(const string &pat
        unique_ptr<uint8_t[]> image_data(new uint8_t[len]);
        av_image_copy_to_buffer(image_data.get(), len, pic_data, linesizes, AV_PIX_FMT_RGBA, frame->width, frame->height, 1);
 
-       shared_ptr<Image> image(new Image{move(image_data), last_modified});
+       shared_ptr<Image> image(new Image{unsigned(frame->width), unsigned(frame->height), move(image_data), last_modified});
        return image;
 }
 
 // Fire up a thread to update the image every second.
 // We could do inotify, but this is good enough for now.
-void ImageInput::update_thread_func(const std::string &pathname, const timespec &first_modified)
+void ImageInput::update_thread_func(const std::string &filename, const std::string &pathname, const timespec &first_modified)
 {
+       char thread_name[16];
+       snprintf(thread_name, sizeof(thread_name), "Update_%s", filename.c_str());
+       pthread_setname_np(pthread_self(), thread_name);
+
        timespec last_modified = first_modified;
        struct stat buf;
        for ( ;; ) {