2.0. Initialize TBB worker threads right away to avoid spikes when playing the first...

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

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index d19a0fac2bab2567039849373c160d7863dfe672..3b0fad69f3353a8063b112b0a9a7592ad5d3ef90 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -24,6 +24,7 @@
 #include <core/video_format.h>\r
 \r
 #include <core/producer/frame/basic_frame.h>\r
+#include <core/producer/frame/frame_factory.h>\r
 #include <core/mixer/write_frame.h>\r
 \r
 #include <common/env.h>\r
@@ -48,7 +49,7 @@ struct image_producer : public core::frame_producer
        {\r
                auto bitmap = load_image(filename_);\r
                FreeImage_FlipVertical(bitmap.get());\r
-               auto frame = frame_factory->create_frame(this, FreeImage_GetWidth(bitmap.get()), FreeImage_GetHeight(bitmap.get()));\r
+               auto frame = frame_factory->create_frame(this, FreeImage_GetWidth(bitmap.get()), FreeImage_GetHeight(bitmap.get()), core::pixel_format::bgra);\r
                std::copy_n(FreeImage_GetBits(bitmap.get()), frame->image_data().size(), frame->image_data().begin());\r
                frame->commit();\r
                frame_ = std::move(frame);\r
@@ -56,8 +57,13 @@ struct image_producer : public core::frame_producer
        \r
        // frame_producer\r
 \r
-       virtual safe_ptr<core::basic_frame> receive(){return frame_;}\r
+       virtual safe_ptr<core::basic_frame> receive(int){return frame_;}\r
                \r
+       virtual safe_ptr<core::basic_frame> last_frame() const\r
+       {\r
+               return frame_;\r
+       }\r
+\r
        virtual std::wstring print() const\r
        {\r
                return L"image_producer[" + filename_ + L"]";\r