X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=image_input.cpp;h=2bf4a237bb86758f92cbdcfba808c514c7c19b82;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=70bffb0f863225c1673a42d3df0f14757ae7c6f2;hpb=cf7b9ee186d4ef8e5da0531b75854c97b821be44;p=nageru diff --git a/image_input.cpp b/image_input.cpp index 70bffb0..2bf4a23 100644 --- a/image_input.cpp +++ b/image_input.cpp @@ -1,6 +1,7 @@ #include "image_input.h" #include +#include #include #include #include @@ -30,54 +31,26 @@ extern "C" { #include #include "ffmpeg_raii.h" +#include "ffmpeg_util.h" #include "flags.h" -#include "flat_input.h" struct SwsContext; using namespace std; -namespace { - -string search_for_file(const string &filename) -{ - // Look for the file in all theme_dirs until we find one; - // that will be the permanent resolution of this file, whether - // it is actually valid or not. - // We store errors from all the attempts, and show them - // once we know we can't find any of them. - vector errors; - for (const string &dir : global_flags.theme_dirs) { - string pathname = dir + "/" + filename; - if (access(pathname.c_str(), O_RDONLY) == 0) { - return pathname; - } else { - char buf[512]; - snprintf(buf, sizeof(buf), "%s: %s", pathname.c_str(), strerror(errno)); - errors.push_back(buf); - } - } - - for (const string &error : errors) { - fprintf(stderr, "%s\n", error.c_str()); - } - fprintf(stderr, "Couldn't find %s in any directory in --theme-dirs, exiting.\n", - filename.c_str()); - exit(1); -} - -} // namespace - ImageInput::ImageInput(const string &filename) : movit::FlatInput({movit::COLORSPACE_sRGB, movit::GAMMA_sRGB}, movit::FORMAT_RGBA_POSTMULTIPLIED_ALPHA, - GL_UNSIGNED_BYTE, 1280, 720), // FIXME - pathname(search_for_file(filename)), - current_image(load_image(pathname)) + GL_UNSIGNED_BYTE, 1280, 720), // Resolution will be overwritten. + filename(filename), + pathname(search_for_file_or_die(filename)), + 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 +72,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 ImageInput::load_image(const string &pathname) +shared_ptr ImageInput::load_image(const string &filename, const string &pathname) { unique_lock lock(all_images_lock); // Held also during loading. if (all_images.count(pathname)) { @@ -109,7 +82,7 @@ shared_ptr 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]; } @@ -137,13 +110,7 @@ shared_ptr ImageInput::load_image_raw(const string &pat return nullptr; } - int stream_index = -1; - for (unsigned i = 0; i < format_ctx->nb_streams; ++i) { - if (format_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - stream_index = i; - break; - } - } + int stream_index = find_stream_index(format_ctx.get(), AVMEDIA_TYPE_VIDEO); if (stream_index == -1) { fprintf(stderr, "%s: No video stream found\n", pathname.c_str()); return nullptr; @@ -205,7 +172,6 @@ shared_ptr ImageInput::load_image_raw(const string &pat return nullptr; } - // TODO: Scale down if needed! uint8_t *pic_data[4] = {nullptr}; unique_ptr pic_data_cleanup( &pic_data[0], av_freep); @@ -229,18 +195,25 @@ shared_ptr ImageInput::load_image_raw(const string &pat unique_ptr 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(new Image{move(image_data), last_modified}); + shared_ptr 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 ( ;; ) { - sleep(1); + { + unique_lock lock(threads_should_quit_mu); + threads_should_quit_modified.wait_for(lock, chrono::seconds(1), []() { return threads_should_quit; }); + } if (threads_should_quit) { return; @@ -269,9 +242,11 @@ void ImageInput::update_thread_func(const std::string &pathname, const timespec void ImageInput::shutdown_updaters() { - // TODO: Kick these out of the sleep before one second? - threads_should_quit = true; - + { + unique_lock lock(threads_should_quit_mu); + threads_should_quit = true; + threads_should_quit_modified.notify_all(); + } for (auto &it : update_threads) { it.second.join(); } @@ -280,4 +255,6 @@ void ImageInput::shutdown_updaters() mutex ImageInput::all_images_lock; map> ImageInput::all_images; map ImageInput::update_threads; -volatile bool ImageInput::threads_should_quit = false; +mutex ImageInput::threads_should_quit_mu; +bool ImageInput::threads_should_quit = false; +condition_variable ImageInput::threads_should_quit_modified;