<ClInclude Include="os\windows\system_info.h" />\r
<ClInclude Include="stdafx.h" />\r
<ClInclude Include="utility\assert.h" />\r
+ <ClInclude Include="utility\base64.h" />\r
<ClInclude Include="utility\move_on_copy.h" />\r
<ClInclude Include="utility\param.h" />\r
<ClInclude Include="utility\string.h" />\r
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>\r
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">Create</PrecompiledHeader>\r
</ClCompile>\r
+ <ClCompile Include="utility\base64.cpp">\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+ </ClCompile>\r
<ClCompile Include="utility\string.cpp">\r
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
<ClCompile Include="filesystem\polling_filesystem_monitor.cpp">\r
<Filter>source\filesystem</Filter>\r
</ClCompile>\r
+ <ClCompile Include="utility\base64.cpp">\r
+ <Filter>source\utility</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="exception\exceptions.h">\r
<ClInclude Include="filesystem\polling_filesystem_monitor.h">\r
<Filter>source\filesystem</Filter>\r
</ClInclude>\r
+ <ClInclude Include="utility\base64.h">\r
+ <Filter>source\utility</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
</Project>
\ No newline at end of file
--- /dev/null
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Helge Norberg, helge.norberg@svt.se
+*/
+
+#include "../stdafx.h"
+
+#include "base64.h"
+
+#include <vector>
+#include <algorithm>
+
+#include <boost/archive/iterators/insert_linebreaks.hpp>
+#include <boost/archive/iterators/base64_from_binary.hpp>
+#include <boost/archive/iterators/binary_from_base64.hpp>
+#include <boost/archive/iterators/transform_width.hpp>
+#include <boost/archive/iterators/remove_whitespace.hpp>
+#include <boost/range/join.hpp>
+#include <boost/range/adaptor/sliced.hpp>
+
+#include "../exception/exceptions.h"
+
+namespace caspar {
+
+std::string to_base64(const char* data, size_t length)
+{
+ using namespace boost::archive::iterators;
+
+ // From http://www.webbiscuit.co.uk/2012/04/02/base64-encoder-and-boost/
+
+ typedef
+ insert_linebreaks< // insert line breaks every 76 characters
+ base64_from_binary< // convert binary values to base64 characters
+ transform_width< // retrieve 6 bit integers from a sequence of 8 bit bytes
+ const unsigned char *,
+ 6,
+ 8
+ >
+ >,
+ 76
+ >
+ base64_iterator; // compose all the above operations in to a new iterator
+ std::vector<char> bytes;
+ bytes.resize(length);
+ std::memcpy(bytes.data(), data, length);
+
+ int padding = 0;
+
+ while (bytes.size() % 3 != 0)
+ {
+ ++padding;
+ bytes.push_back(0x00);
+ }
+
+ std::string result(base64_iterator(bytes.data()), base64_iterator(bytes.data() + length - padding));
+ result.insert(result.end(), padding, '=');
+
+ return std::move(result);
+}
+
+std::vector<unsigned char> from_base64(const std::string& data)
+{
+ int padding = 0;
+ std::string zero_padding;
+
+ // binary_from_base64 does not support padding characters so we have to append base64 0 -> 'A' and then remove it after decoding
+ if (data.length() >= 2)
+ {
+ if (data[data.length() - 1] == '=')
+ {
+ ++padding;
+ zero_padding += 'A';
+ }
+
+ if (data[data.length() - 2] == '=')
+ {
+ ++padding;
+ zero_padding += 'A';
+ }
+ }
+
+ if (padding > 0)
+ {
+ auto concatenated = boost::join(
+ data | boost::adaptors::sliced(0, data.length() - padding),
+ boost::make_iterator_range(zero_padding.cbegin(), zero_padding.cend()));
+
+ // From https://svn.boost.org/trac/boost/ticket/5624
+ typedef boost::archive::iterators::transform_width<
+ boost::archive::iterators::binary_from_base64<
+ boost::archive::iterators::remove_whitespace<decltype(concatenated.begin())>
+ >,
+ 8,
+ 6
+ > base64_iterator;
+
+ std::vector<unsigned char> result(base64_iterator(concatenated.begin()), base64_iterator(concatenated.end()));
+
+ result.resize(result.size() - padding);
+
+ return std::move(result);
+ }
+ else
+ {
+ // From https://svn.boost.org/trac/boost/ticket/5624
+ typedef boost::archive::iterators::transform_width<
+ boost::archive::iterators::binary_from_base64<
+ boost::archive::iterators::remove_whitespace<std::string::const_iterator>
+ >,
+ 8,
+ 6
+ > base64_iterator;
+ std::vector<unsigned char> result(base64_iterator(data.begin()), base64_iterator(data.end()));
+
+ return std::move(result);
+ }
+}
+
+}
--- /dev/null
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Helge Norberg, helge.norberg@svt.se
+*/
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace caspar {
+
+std::string to_base64(const char* data, size_t length);
+std::vector<unsigned char> from_base64(const std::string& data);
+
+}
return str;\r
}\r
\r
-safe_ptr<frame_producer> create_color_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<frame_producer> create_color_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{\r
if(params.size() < 0)\r
return core::frame_producer::empty();\r
class write_frame;\r
struct frame_factory;\r
\r
-safe_ptr<frame_producer> create_color_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<frame_producer> create_color_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
safe_ptr<core::write_frame> create_color_frame(void* tag, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& color);\r
\r
}}\r
g_thumbnail_factories.push_back(factory);\r
}\r
\r
-safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params, const std::vector<const producer_factory_t>& factories, bool throw_on_fail = false)\r
+safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& upper_case_params, const std::vector<std::wstring>& original_case_params, const std::vector<const producer_factory_t>& factories, bool throw_on_fail = false)\r
{\r
- if(params.empty())\r
+ if(upper_case_params.empty())\r
BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));\r
\r
auto producer = frame_producer::empty();\r
{\r
try\r
{\r
- producer = factory(my_frame_factory, params);\r
+ producer = factory(my_frame_factory, upper_case_params, original_case_params);\r
}\r
catch(...)\r
{\r
});\r
\r
if(producer == frame_producer::empty())\r
- producer = create_color_producer(my_frame_factory, params);\r
+ producer = create_color_producer(my_frame_factory, upper_case_params, original_case_params);\r
\r
if(producer == frame_producer::empty())\r
- producer = create_playlist_producer(my_frame_factory, params);\r
+ producer = create_playlist_producer(my_frame_factory, upper_case_params, original_case_params);\r
\r
return producer;\r
}\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& upper_case_params, const std::vector<std::wstring>& original_case_params)\r
{ \r
- auto producer = do_create_producer(my_frame_factory, params, g_factories);\r
+ auto producer = do_create_producer(my_frame_factory, upper_case_params, original_case_params, g_factories);\r
auto key_producer = frame_producer::empty();\r
\r
try // to find a key file.\r
{\r
- auto params_copy = params;\r
- if(params_copy.size() > 0)\r
+ auto upper_params_copy = upper_case_params;\r
+ auto original_params_copy = original_case_params;\r
+\r
+ if(upper_case_params.size() > 0)\r
{\r
- params_copy[0] += L"_A";\r
- key_producer = do_create_producer(my_frame_factory, params_copy, g_factories); \r
+ upper_params_copy[0] += L"_A";\r
+ original_params_copy[0] += L"_A";\r
+ key_producer = do_create_producer(my_frame_factory, upper_params_copy, original_params_copy, g_factories); \r
if(key_producer == frame_producer::empty())\r
{\r
- params_copy[0] += L"LPHA";\r
- key_producer = do_create_producer(my_frame_factory, params_copy, g_factories); \r
+ upper_params_copy[0] += L"LPHA";\r
+ original_params_copy[0] += L"LPHA";\r
+ key_producer = do_create_producer(my_frame_factory, upper_params_copy, original_params_copy, g_factories); \r
}\r
}\r
}\r
if(producer == frame_producer::empty())\r
{\r
std::wstring str;\r
- BOOST_FOREACH(auto& param, params)\r
+ BOOST_FOREACH(auto& param, original_case_params)\r
str += param + L" ";\r
BOOST_THROW_EXCEPTION(file_not_found() << msg_info("No match found for supplied commands. Check syntax.") << arg_value_info(narrow(str)));\r
}\r
std::vector<std::wstring> params;\r
params.push_back(media_file);\r
\r
- auto producer = do_create_producer(my_frame_factory, params, g_thumbnail_factories, true);\r
+ auto producer = do_create_producer(my_frame_factory, params, params, g_thumbnail_factories, true);\r
auto key_producer = frame_producer::empty();\r
\r
try // to find a key file.\r
if (params_copy.size() > 0)\r
{\r
params_copy[0] += L"_A";\r
- key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
+ key_producer = do_create_producer(my_frame_factory, params_copy, params_copy, g_thumbnail_factories, true);\r
if (key_producer == frame_producer::empty())\r
{\r
params_copy[0] += L"LPHA";\r
- key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
+ key_producer = do_create_producer(my_frame_factory, params_copy, params_copy, g_thumbnail_factories, true);\r
}\r
}\r
}\r
std::vector<std::wstring> tokens;\r
typedef std::istream_iterator<std::wstring, wchar_t, std::char_traits<wchar_t> > iterator;\r
std::copy(iterator(iss), iterator(), std::back_inserter(tokens));\r
- return create_producer(factory, tokens);\r
+ return create_producer(factory, tokens, tokens);\r
}\r
\r
}}
\ No newline at end of file
\r
safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int hints);\r
\r
-typedef std::function<safe_ptr<core::frame_producer>(const safe_ptr<frame_factory>&, const std::vector<std::wstring>&)> producer_factory_t;\r
+typedef std::function<safe_ptr<core::frame_producer>(const safe_ptr<frame_factory>&, const std::vector<std::wstring>& upper_case_params, const std::vector<std::wstring>& original_case_params)> producer_factory_t;\r
void register_producer_factory(const producer_factory_t& factory); // Not thread-safe.\r
void register_thumbnail_producer_factory(const producer_factory_t& factory); // Not thread-safe.\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::vector<std::wstring>& upper_case_params, const std::vector<std::wstring>& original_case_params);\r
safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::wstring& params);\r
safe_ptr<core::frame_producer> create_producer_destroy_proxy(safe_ptr<core::frame_producer> producer);\r
safe_ptr<core::frame_producer> create_producer_print_proxy(safe_ptr<core::frame_producer> producer);\r
}\r
};\r
\r
-safe_ptr<frame_producer> create_playlist_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<frame_producer> create_playlist_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{\r
if(boost::range::find(params, L"[PLAYLIST]") == params.end())\r
return core::frame_producer::empty();\r
\r
namespace caspar { namespace core {\r
\r
-safe_ptr<frame_producer> create_playlist_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<frame_producer> create_playlist_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
\r
}}
\ No newline at end of file
}\r
};\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{\r
if(params.empty() || !boost::iequals(params[0], "decklink"))\r
return core::frame_producer::empty();\r
\r
namespace caspar { namespace decklink {\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
\r
}}\r
}\r
};\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{ \r
static const std::vector<std::wstring> invalid_exts = boost::assign::list_of(L".png")(L".tga")(L".bmp")(L".jpg")(L".jpeg")(L".gif")(L".tiff")(L".tif")(L".jp2")(L".jpx")(L".j2k")(L".j2c")(L".swf")(L".ct");\r
auto filename = probe_stem(env::media_folder() + L"\\" + params.at(0), invalid_exts);\r
return create_producer_destroy_proxy(make_safe<ffmpeg_producer>(frame_factory, filename, filter_str, loop, start, length, false));\r
}\r
\r
-safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_thumbnail_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{ \r
static const std::vector<std::wstring> invalid_exts = boost::assign::list_of\r
(L".png")(L".tga")(L".bmp")(L".jpg")(L".jpeg")(L".gif")(L".tiff")(L".tif")(L".jp2")(L".jpx")(L".j2k")(L".j2c")(L".swf")(L".ct")\r
\r
namespace ffmpeg {\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
+safe_ptr<core::frame_producer> create_thumbnail_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
\r
}}
\ No newline at end of file
return producer;\r
}\r
\r
-safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params) \r
+safe_ptr<core::frame_producer> create_ct_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params) \r
{\r
return create_cg_producer_and_autoplay_file(frame_factory, params, env::media_folder() + L"\\" + params[0] + L".ct");\r
}\r
\r
-safe_ptr<core::frame_producer> create_cg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params) \r
+safe_ptr<core::frame_producer> create_cg_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params) \r
{\r
if(params.empty() || params.at(0) != L"[CG]")\r
return core::frame_producer::empty();\r
};\r
safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel>& video_channel, int layer_index = cg_producer::DEFAULT_LAYER);\r
\r
-safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_producer> create_cg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_ct_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
+safe_ptr<core::frame_producer> create_cg_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
\r
}}
\ No newline at end of file
make_safe<flash_producer>(frame_factory, filename, template_host.width, template_host.height)));\r
}\r
\r
-safe_ptr<core::frame_producer> create_swf_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params) \r
+safe_ptr<core::frame_producer> create_swf_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params) \r
{\r
auto filename = env::media_folder() + L"\\" + params.at(0) + L".swf";\r
\r
namespace caspar { namespace flash {\r
\r
safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_producer> create_swf_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_swf_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
\r
std::wstring find_template(const std::wstring& templateName);\r
\r
\r
#include <common/env.h>\r
#include <common/log/log.h>\r
+#include <common/utility/base64.h>\r
+#include <common/utility/string.h>\r
\r
#include <boost/assign.hpp>\r
#include <boost/filesystem.hpp>\r
\r
struct image_producer : public core::frame_producer\r
{ \r
- const std::wstring filename_;\r
+ const std::wstring description_;\r
+ const safe_ptr<core::frame_factory> frame_factory_;\r
safe_ptr<core::basic_frame> frame_;\r
\r
explicit image_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename) \r
- : filename_(filename)\r
+ : description_(filename)\r
+ , frame_factory_(frame_factory)\r
, frame_(core::basic_frame::empty()) \r
{\r
- auto bitmap = load_image(filename_);\r
+ load(load_image(filename));\r
+ }\r
+\r
+ explicit image_producer(const safe_ptr<core::frame_factory>& frame_factory, const void* png_data, size_t size)\r
+ : description_(L"png from memory")\r
+ , frame_factory_(frame_factory)\r
+ , frame_(core::basic_frame::empty())\r
+ {\r
+ load(load_png_from_memory(png_data, size));\r
+ }\r
+\r
+ void load(const std::shared_ptr<FIBITMAP>& bitmap)\r
+ {\r
FreeImage_FlipVertical(bitmap.get());\r
- \r
+\r
core::pixel_format_desc desc;\r
desc.pix_fmt = core::pixel_format::bgra;\r
desc.planes.push_back(core::pixel_format_desc::plane(FreeImage_GetWidth(bitmap.get()), FreeImage_GetHeight(bitmap.get()), 4));\r
- auto frame = frame_factory->create_frame(this, desc);\r
+ auto frame = frame_factory_->create_frame(this, desc);\r
\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
}\r
- \r
+\r
// frame_producer\r
\r
virtual safe_ptr<core::basic_frame> receive(int) override\r
\r
virtual std::wstring print() const override\r
{\r
- return L"image_producer[" + filename_ + L"]";\r
+ return L"image_producer[" + description_ + L"]";\r
}\r
\r
virtual boost::property_tree::wptree info() const override\r
{\r
boost::property_tree::wptree info;\r
info.add(L"type", L"image-producer");\r
- info.add(L"filename", filename_);\r
+ info.add(L"location", description_);\r
return info;\r
}\r
};\r
\r
-safe_ptr<core::frame_producer> create_raw_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_raw_producer(const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{\r
+ if (params[0] == L"[PNG_BASE64]")\r
+ {\r
+ if (params.size() < 2)\r
+ return core::frame_producer::empty();\r
+\r
+ auto png_data = from_base64(narrow(original_case_params[1]));\r
+\r
+ return make_safe<image_producer>(frame_factory, png_data.data(), png_data.size());\r
+ }\r
+\r
static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");\r
std::wstring filename = env::media_folder() + L"\\" + params[0];\r
\r
return make_safe<image_producer>(frame_factory, filename + L"." + *ext);\r
}\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{\r
- auto raw_producer = create_raw_producer(frame_factory, params);\r
+ auto raw_producer = create_raw_producer(frame_factory, params, original_case_params);\r
\r
if (raw_producer == core::frame_producer::empty())\r
return raw_producer;\r
return create_producer_print_proxy(raw_producer);\r
}\r
\r
-safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_thumbnail_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{\r
- return create_raw_producer(frame_factory, params);\r
+ return create_raw_producer(frame_factory, params, original_case_params);\r
}\r
\r
}}
\ No newline at end of file
\r
namespace caspar { namespace image {\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
+safe_ptr<core::frame_producer> create_thumbnail_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
\r
}}
\ No newline at end of file
}\r
};\r
\r
-safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_scroll_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params)\r
{\r
static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");\r
std::wstring filename = env::media_folder() + L"\\" + params[0];\r
\r
namespace caspar { namespace image {\r
\r
-safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_scroll_producer(\r
+ const safe_ptr<core::frame_factory>& frame_factory,\r
+ const std::vector<std::wstring>& params,\r
+ const std::vector<std::wstring>& original_case_params);\r
\r
}}
\ No newline at end of file
#include <common/os/windows/system_info.h>\r
#include <common/utility/string.h>\r
#include <common/utility/utf8conv.h>\r
+#include <common/utility/base64.h>\r
\r
#include <core/producer/frame_producer.h>\r
#include <core/video_format.h>\r
if (!filestream)\r
return L"";\r
\r
- // From http://www.webbiscuit.co.uk/2012/04/02/base64-encoder-and-boost/\r
- \r
- typedef\r
- insert_linebreaks< // insert line breaks every 76 characters\r
- base64_from_binary< // convert binary values to base64 characters\r
- transform_width< // retrieve 6 bit integers from a sequence of 8 bit bytes\r
- const unsigned char *,\r
- 6,\r
- 8\r
- >\r
- >,\r
- 76\r
- >\r
- base64_iterator; // compose all the above operations in to a new iterator\r
auto length = boost::filesystem::file_size(file);\r
std::vector<char> bytes;\r
bytes.resize(length);\r
filestream.read(bytes.data(), length);\r
\r
- int padding = 0;\r
-\r
- while (bytes.size() % 3 != 0)\r
- {\r
- ++padding;\r
- bytes.push_back(0x00);\r
- }\r
-\r
- std::string result(base64_iterator(bytes.data()), base64_iterator(bytes.data() + length - padding));\r
- result.insert(result.end(), padding, '=');\r
-\r
- return widen(result);\r
+ return widen(to_base64(bytes.data(), length));\r
}\r
\r
std::wstring read_utf8_file(const boost::filesystem::wpath& file)\r
try\r
{\r
_parameters[0] = _parameters[0];\r
- auto pFP = create_producer(GetChannel()->mixer(), _parameters); \r
+ auto pFP = create_producer(GetChannel()->mixer(), _parameters, _parameters2); \r
GetChannel()->stage()->load(GetLayerIndex(), pFP, true);\r
\r
SetReplyString(TEXT("202 LOAD OK\r\n"));\r
try\r
{\r
_parameters[0] = _parameters[0];\r
- auto pFP = create_producer(GetChannel()->mixer(), _parameters);\r
+ auto pFP = create_producer(GetChannel()->mixer(), _parameters, _parameters2);\r
if(pFP == frame_producer::empty())\r
BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));\r
\r
catch(file_not_found&)\r
{ \r
std::wstring params2;\r
- for(auto it = _parameters.begin(); it != _parameters.end(); ++it)\r
+ for(auto it = _parameters2.begin(); it != _parameters2.end(); ++it)\r
params2 += L" " + *it;\r
CASPAR_LOG(error) << L"File not found. No match found for parameters. Check syntax:" << params2;\r
SetReplyString(TEXT("404 LOADBG ERROR\r\n"));\r
lbg.SetChannelIndex(GetChannelIndex());\r
lbg.SetLayerIntex(GetLayerIndex());\r
lbg.SetClientInfo(GetClientInfo());\r
- for(auto it = _parameters.begin(); it != _parameters.end(); ++it)\r
+ for(auto it = _parameters2.begin(); it != _parameters2.end(); ++it)\r
lbg.AddParameter(*it);\r
if(!lbg.Execute())\r
throw std::exception();\r
return EXCEPTION_EXECUTE_HANDLER;\r
}\r
\r
-void make_upper_case(std::wstring& str)\r
+std::wstring make_upper_case(const std::wstring& str)\r
{\r
- boost::to_upper(str);\r
+ return boost::to_upper_copy(str);\r
}\r
\r
int main(int argc, wchar_t* argv[])\r
std::getline(std::wcin, wcmd); // TODO: It's blocking...\r
\r
//boost::to_upper(wcmd); // TODO COMPILER crashes on this line, Strange!\r
- make_upper_case(wcmd);\r
+ auto upper_cmd = make_upper_case(wcmd);\r
\r
- if(wcmd == L"EXIT" || wcmd == L"Q" || wcmd == L"QUIT" || wcmd == L"BYE")\r
+ if(upper_cmd == L"EXIT" || upper_cmd == L"Q" || upper_cmd == L"QUIT" || upper_cmd == L"BYE")\r
{\r
shutdown_server_now.set_value(true); // True to wait for keypress\r
break;\r
L"PLAY 2-2 " + file + L" LOOP\r\n" \r
L"PLAY 2-3 " + file + L" LOOP\r\n";\r
}\r
- else if(wcmd.substr(0, 1) == L"X")\r
+ else if(upper_cmd.substr(0, 1) == L"X")\r
{\r
int num = 0;\r
std::wstring file;\r
projects / casparcg / commitdiff