X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=image_input.cpp;h=2bf4a237bb86758f92cbdcfba808c514c7c19b82;hp=9f474c94b14ae2b8bf315e0d0a4b2308f153b8f3;hb=4e3c52ba57c4552a969e71ccdefd9941ce8d6290;hpb=7a074a020aad29723e028acab76b9edfdd6c5223

diff --git a/image_input.cpp b/image_input.cpp
index 9f474c9..2bf4a23 100644
--- a/image_input.cpp
+++ b/image_input.cpp
@@ -1,6 +1,7 @@
 #include "image_input.h"
 
 #include <errno.h>
+#include <movit/flat_input.h>
 #include <movit/image_format.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -30,55 +31,26 @@ extern "C" {
 #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
+	                   GL_UNSIGNED_BYTE, 1280, 720),  // Resolution will be overwritten.
 	  filename(filename),
-	  pathname(search_for_file(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());
 }
 
@@ -138,13 +110,7 @@ shared_ptr<const ImageInput::Image> 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;
@@ -206,7 +172,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);
@@ -230,7 +195,7 @@ 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;
 }
 
@@ -245,7 +210,10 @@ void ImageInput::update_thread_func(const std::string &filename, const std::stri
 	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;
@@ -274,9 +242,11 @@ void ImageInput::update_thread_func(const std::string &filename, const std::stri
 
 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();
 	}
@@ -285,4 +255,6 @@ void ImageInput::shutdown_updaters()
 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;