X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=image_input.cpp;h=2bf4a237bb86758f92cbdcfba808c514c7c19b82;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=5c9d7966cd7404b395ddab4ecaf40523c9215549;hpb=18347d8325cadd11ce732c7cdcb9b55c727e4938;p=nageru

diff --git a/image_input.cpp b/image_input.cpp
index 5c9d796..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,49 +31,18 @@ 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),  // 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.
@@ -140,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;