#include <tbb/atomic.h>
#include <common/diagnostics/graph.h>
+#include <common/filesystem.h>
#include "producer/frame_producer.h"
#include "consumer/frame_consumer.h"
#include "frame/frame.h"
#include "frame/draw_frame.h"
#include "frame/frame_transform.h"
+#include "frame/audio_channel_layout.h"
#include "producer/media_info/media_info.h"
#include "producer/media_info/media_info_repository.h"
namespace caspar { namespace core {
-std::wstring get_relative_without_extension(
- const boost::filesystem::path& file,
- const boost::filesystem::path& relative_to)
-{
- auto result = file.stem();
-
- boost::filesystem::path current_path = file;
-
- while (true)
- {
- current_path = current_path.parent_path();
-
- if (boost::filesystem::equivalent(current_path, relative_to))
- break;
-
- if (current_path.empty())
- throw std::runtime_error("File not relative to folder");
-
- result = current_path.filename() / result;
- }
-
- return result.wstring();
-}
-
struct thumbnail_output
{
tbb::atomic<int> sleep_millis;
struct thumbnail_generator::impl
{
private:
- boost::filesystem::path media_path_;
- boost::filesystem::path thumbnails_path_;
- int width_;
- int height_;
- spl::shared_ptr<image_mixer> image_mixer_;
- spl::shared_ptr<diagnostics::graph> graph_;
- video_format_desc format_desc_;
- spl::unique_ptr<thumbnail_output> output_;
- mixer mixer_;
- thumbnail_creator thumbnail_creator_;
- spl::shared_ptr<media_info_repository> media_info_repo_;
- filesystem_monitor::ptr monitor_;
+ boost::filesystem::path media_path_;
+ boost::filesystem::path thumbnails_path_;
+ int width_;
+ int height_;
+ spl::shared_ptr<image_mixer> image_mixer_;
+ spl::shared_ptr<diagnostics::graph> graph_;
+ video_format_desc format_desc_;
+ spl::unique_ptr<thumbnail_output> output_;
+ mixer mixer_;
+ thumbnail_creator thumbnail_creator_;
+ spl::shared_ptr<media_info_repository> media_info_repo_;
+ spl::shared_ptr<const frame_producer_registry> producer_registry_;
+ bool mipmap_;
+ filesystem_monitor::ptr monitor_;
public:
impl(
filesystem_monitor_factory& monitor_factory,
std::unique_ptr<image_mixer> image_mixer,
int generate_delay_millis,
const thumbnail_creator& thumbnail_creator,
- spl::shared_ptr<media_info_repository> media_info_repo)
+ spl::shared_ptr<media_info_repository> media_info_repo,
+ spl::shared_ptr<const frame_producer_registry> producer_registry,
+ bool mipmap)
: media_path_(media_path)
, thumbnails_path_(thumbnails_path)
, width_(width)
, image_mixer_(std::move(image_mixer))
, format_desc_(render_video_mode)
, output_(spl::make_unique<thumbnail_output>(generate_delay_millis))
- , mixer_(graph_, image_mixer_)
+ , mixer_(0, graph_, image_mixer_)
, thumbnail_creator_(thumbnail_creator)
, media_info_repo_(std::move(media_info_repo))
+ , producer_registry_(std::move(producer_registry))
+ , mipmap_(mipmap)
, monitor_(monitor_factory.create(
media_path,
filesystem_event::ALL,
std::insert_iterator<std::set<std::wstring>>(
relative_without_extensions,
relative_without_extensions.end()),
- boost::bind(&get_relative_without_extension, _1, media_path_));
+ [&](const path& p) { return get_relative_without_extension(p, media_path_).wstring(); });
for (boost::filesystem::wrecursive_directory_iterator iter(thumbnails_path_); iter != boost::filesystem::wrecursive_directory_iterator(); ++iter)
{
continue;
auto relative_without_extension = get_relative_without_extension(path, thumbnails_path_);
- bool no_corresponding_media_file = relative_without_extensions.find(relative_without_extension)
+ bool no_corresponding_media_file = relative_without_extensions.find(relative_without_extension.wstring())
== relative_without_extensions.end();
if (no_corresponding_media_file)
- remove(thumbnails_path_ / (relative_without_extension + L".png"));
+ remove(thumbnails_path_ / (relative_without_extension.wstring() + L".png"));
}
}
break;
case filesystem_event::REMOVED:
auto relative_without_extension = get_relative_without_extension(file, media_path_);
- boost::filesystem::remove(thumbnails_path_ / (relative_without_extension + L".png"));
+ boost::filesystem::remove(thumbnails_path_ / (relative_without_extension.wstring() + L".png"));
media_info_repo_->remove(file.wstring());
break;
{
using namespace boost::filesystem;
- auto png_file = thumbnails_path_ / (get_relative_without_extension(file, media_path_) + L".png");
+ auto png_file = thumbnails_path_ / (get_relative_without_extension(file, media_path_).wstring() + L".png");
if (!exists(png_file))
return true;
void generate_thumbnail(const boost::filesystem::path& file)
{
+ auto media_file_with_extension = get_relative(file, media_path_);
auto media_file = get_relative_without_extension(file, media_path_);
- auto png_file = thumbnails_path_ / (media_file + L".png");
+ auto png_file = thumbnails_path_ / (media_file.wstring() + L".png");
std::promise<void> thumbnail_ready;
{
- auto producer = frame_producer::empty();
-
- try
- {
- producer = create_thumbnail_producer(image_mixer_, format_desc_, media_file);
- }
- catch (const boost::thread_interrupted&)
- {
- throw;
- }
- catch (...)
- {
- CASPAR_LOG(debug) << L"Thumbnail producer failed to initialize for " << media_file;
- return;
- }
-
- if (producer == frame_producer::empty())
- {
- CASPAR_LOG(trace) << L"No appropriate thumbnail producer found for " << media_file;
- return;
- }
-
boost::filesystem::create_directories(png_file.parent_path());
output_->on_send = [this, &png_file] (const_frame frame)
{
try
{
- raw_frame = producer->create_thumbnail_frame();
+ raw_frame = producer_registry_->create_thumbnail(frame_producer_dependencies(image_mixer_, {}, format_desc_, producer_registry_), media_file.wstring());
media_info_repo_->remove(file.wstring());
media_info_repo_->get(file.wstring());
}
}
catch (...)
{
- CASPAR_LOG(debug) << L"Thumbnail producer failed to create thumbnail for " << media_file;
+ CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(trace);
+ CASPAR_LOG(info) << L"Thumbnail producer failed to create thumbnail for " << media_file_with_extension << L". Turn on log level trace to see more information.";
return;
}
if (raw_frame == draw_frame::empty()
|| raw_frame == draw_frame::late())
{
- CASPAR_LOG(debug) << L"No thumbnail generated for " << media_file;
+ CASPAR_LOG(debug) << L"No thumbnail producer for " << media_file_with_extension;
return;
}
auto transformed_frame = draw_frame(raw_frame);
transformed_frame.transform().image_transform.fill_scale[0] = static_cast<double>(width_) / format_desc_.width;
transformed_frame.transform().image_transform.fill_scale[1] = static_cast<double>(height_) / format_desc_.height;
+ transformed_frame.transform().image_transform.use_mipmap = mipmap_;
frames.insert(std::make_pair(0, transformed_frame));
std::shared_ptr<void> ticket(nullptr, [&thumbnail_ready](void*) { thumbnail_ready.set_value(); });
- auto mixed_frame = mixer_(frames, format_desc_);
+ auto mixed_frame = mixer_(std::move(frames), format_desc_, audio_channel_layout(2, L"stereo", L""));
output_->send(std::move(mixed_frame), ticket);
ticket.reset();
try
{
boost::filesystem::last_write_time(png_file, boost::filesystem::last_write_time(file));
- CASPAR_LOG(debug) << L"Generated thumbnail for " << media_file;
+ CASPAR_LOG(info) << L"Generated thumbnail for " << media_file_with_extension;
}
catch (...)
{
}
}
else
- CASPAR_LOG(debug) << L"No thumbnail generated for " << media_file;
+ CASPAR_LOG(debug) << L"No thumbnail generated for " << media_file_with_extension;
}
};
std::unique_ptr<image_mixer> image_mixer,
int generate_delay_millis,
const thumbnail_creator& thumbnail_creator,
- spl::shared_ptr<media_info_repository> media_info_repo)
+ spl::shared_ptr<media_info_repository> media_info_repo,
+ spl::shared_ptr<const frame_producer_registry> producer_registry,
+ bool mipmap)
: impl_(new impl(
monitor_factory,
media_path,
std::move(image_mixer),
generate_delay_millis,
thumbnail_creator,
- media_info_repo))
+ media_info_repo,
+ producer_registry,
+ mipmap))
{
}
projects / casparcg / blobdiff