#include "image_input.h"
#include <errno.h>
+#include <movit/flat_input.h>
#include <movit/image_format.h>
#include <stdint.h>
#include <stdio.h>
#include <vector>
#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<string> 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());
}
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)) {
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];
}
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;
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);
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 ( ;; ) {
- sleep(1);
+ {
+ unique_lock<mutex> lock(threads_should_quit_mu);
+ threads_should_quit_modified.wait_for(lock, chrono::seconds(1), []() { return threads_should_quit; });
+ }
if (threads_should_quit) {
return;
void ImageInput::shutdown_updaters()
{
- // TODO: Kick these out of the sleep before one second?
- threads_should_quit = true;
-
+ {
+ unique_lock<mutex> lock(threads_should_quit_mu);
+ threads_should_quit = true;
+ threads_should_quit_modified.notify_all();
+ }
for (auto &it : update_threads) {
it.second.join();
}
mutex ImageInput::all_images_lock;
map<string, shared_ptr<const ImageInput::Image>> ImageInput::all_images;
map<string, thread> 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;
projects / nageru / blobdiff