[image_producer] refuse too large images nicely instead of letting OpenGL tell us...

[casparcg] / modules / image / producer / image_producer.cpp

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index c3b0cc04ea320cf221a7a69c5003321d4fdcbabb..112922ac5f68fe450de2feec264398800f94066f 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -82,13 +82,16 @@ struct image_producer : public core::frame_producer_base
        core::draw_frame                                                        frame_                          = core::draw_frame::empty();
        core::constraints                                                       constraints_;
        
-       image_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const std::wstring& description) 
+       image_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const std::wstring& description, bool thumbnail_mode) 
                : description_(description)
                , frame_factory_(frame_factory)
        {
                load(load_image(description_));
 
-               CASPAR_LOG(info) << print() << L" Initialized";
+               if (thumbnail_mode)
+                       CASPAR_LOG(debug) << print() << L" Initialized";
+               else
+                       CASPAR_LOG(info) << print() << L" Initialized";
        }
 
        image_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const void* png_data, size_t size) 
@@ -103,6 +106,11 @@ struct image_producer : public core::frame_producer_base
        void load(const std::shared_ptr<FIBITMAP>& bitmap)
        {
                FreeImage_FlipVertical(bitmap.get());
+               auto longest_side = static_cast<int>(std::max(FreeImage_GetWidth(bitmap.get()), FreeImage_GetHeight(bitmap.get())));
+
+               if (longest_side > frame_factory_->get_max_frame_size())
+                       CASPAR_THROW_EXCEPTION(user_error() << msg_info("Image too large for texture"));
+
                core::pixel_format_desc desc;
                desc.format = core::pixel_format::bgra;
                desc.planes.push_back(core::pixel_format_desc::plane(FreeImage_GetWidth(bitmap.get()), FreeImage_GetHeight(bitmap.get()), 4));
@@ -123,11 +131,6 @@ struct image_producer : public core::frame_producer_base
                return frame_;
        }
 
-       core::draw_frame create_thumbnail_frame() override
-       {
-               return frame_;
-       }
-
        core::constraints& pixel_constraints() override
        {
                return constraints_;
@@ -182,22 +185,23 @@ void describe_producer(core::help_sink& sink, const core::help_repository& repo)
        sink.example(L">> PLAY 1-10 [PNG_BASE64] data...", L"Plays a PNG image transferred as a base64 encoded string.");
 }
 
+static const auto g_extensions = {
+       L".png",
+       L".tga",
+       L".bmp",
+       L".jpg",
+       L".jpeg",
+       L".gif",
+       L".tiff",
+       L".tif",
+       L".jp2",
+       L".jpx",
+       L".j2k",
+       L".j2c"
+};
+
 spl::shared_ptr<core::frame_producer> create_producer(const core::frame_producer_dependencies& dependencies, const std::vector<std::wstring>& params)
 {
-       static const auto extensions = {
-               L".png",
-               L".tga",
-               L".bmp",
-               L".jpg",
-               L".jpeg",
-               L".gif",
-               L".tiff",
-               L".tif",
-               L".jp2",
-               L".jpx",
-               L".j2k",
-               L".j2c"
-       };
 
        if (boost::iequals(params.at(0), L"[IMG_SEQUENCE]"))
        {
@@ -218,7 +222,7 @@ spl::shared_ptr<core::frame_producer> create_producer(const core::frame_producer
 
                        auto extension = it->path().extension().wstring();
 
-                       if (std::find_if(extensions.begin(), extensions.end(), ieq(extension)) == extensions.end())
+                       if (std::find_if(g_extensions.begin(), g_extensions.end(), ieq(extension)) == g_extensions.end())
                                continue;
 
                        files.insert(it->path().wstring());
@@ -259,23 +263,40 @@ spl::shared_ptr<core::frame_producer> create_producer(const core::frame_producer
 
        std::wstring filename = env::media_folder() + params.at(0);
 
-       auto ext = std::find_if(extensions.begin(), extensions.end(), [&](const std::wstring& ex) -> bool
+       auto ext = std::find_if(g_extensions.begin(), g_extensions.end(), [&](const std::wstring& ex) -> bool
        {
-               auto file = caspar::find_case_insensitive(boost::filesystem::path(filename).replace_extension(ex).wstring());
+               auto file = caspar::find_case_insensitive(boost::filesystem::path(filename).wstring() + ex);
 
                return static_cast<bool>(file);
        });
 
-       if(ext == extensions.end())
+       if(ext == g_extensions.end())
                return core::frame_producer::empty();
 
-       return spl::make_shared<image_producer>(dependencies.frame_factory, *caspar::find_case_insensitive(filename + *ext));
+       return spl::make_shared<image_producer>(dependencies.frame_factory, *caspar::find_case_insensitive(filename + *ext), false);
 }
 
 
-spl::shared_ptr<core::frame_producer> create_thumbnail_producer(const core::frame_producer_dependencies& dependencies, const std::vector<std::wstring>& params)
+core::draw_frame create_thumbnail(const core::frame_producer_dependencies& dependencies, const std::wstring& media_file)
 {
-       return caspar::image::create_producer(dependencies, params);
+       std::wstring filename = env::media_folder() + media_file;
+
+       auto ext = std::find_if(g_extensions.begin(), g_extensions.end(), [&](const std::wstring& ex) -> bool
+       {
+               auto file = caspar::find_case_insensitive(boost::filesystem::path(filename).wstring() + ex);
+
+               return static_cast<bool>(file);
+       });
+
+       if (ext == g_extensions.end())
+               return core::draw_frame::empty();
+
+       spl::shared_ptr<core::frame_producer> producer = spl::make_shared<image_producer>(
+                       dependencies.frame_factory,
+                       *caspar::find_case_insensitive(filename + *ext),
+                       true);
+       
+       return producer->receive();
 }
 
 }}