/*
- Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "cross.h"
#include "compose.hpp"
#include "exceptions.h"
-#include <boost/weak_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include "video_content.h"
+
using std::cout;
using std::pair;
using std::make_pair;
using std::string;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
using boost::bind;
using boost::optional;
using boost::function;
using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
/** Minimum video readahead in frames */
#define MINIMUM_VIDEO_READAHEAD 10
* @param fast Same as above for the `fast' flag.
*/
Butler::Butler (
+ weak_ptr<const Film> film,
shared_ptr<Player> player,
AudioMapping audio_mapping,
int audio_channels,
function<AVPixelFormat (AVPixelFormat)> pixel_format,
+ VideoRange video_range,
bool aligned,
bool fast
)
- : _player (player)
+ : _film (film)
+ , _player (player)
, _prepare_work (new boost::asio::io_service::work (_prepare_service))
, _pending_seek_accurate (false)
, _suspended (0)
, _audio_channels (audio_channels)
, _disable_audio (false)
, _pixel_format (pixel_format)
+ , _video_range (video_range)
, _aligned (aligned)
, _fast (fast)
{
/* The butler must hear about things first, otherwise it might not sort out suspensions in time for
get_video() to be called in response to this signal.
*/
- _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1), boost::signals2::at_front);
+ _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _2), boost::signals2::at_front);
_thread = boost::thread (bind(&Butler::thread, this));
#ifdef DCPOMATIC_LINUX
pthread_setname_np (_thread.native_handle(), "butler");
/* If the weak_ptr cannot be locked the video obviously no longer requires any work */
if (video) {
LOG_TIMING("start-prepare in %1", thread_id());
- video->prepare (_pixel_format, _aligned, _fast);
+ video->prepare (_pixel_format, _video_range, _aligned, _fast);
LOG_TIMING("finish-prepare in %1", thread_id());
}
}
}
void
-Butler::player_change (ChangeType type)
+Butler::player_change (ChangeType type, int property)
{
+ if (property == VideoContentProperty::CROP) {
+ if (type == CHANGE_TYPE_DONE) {
+ shared_ptr<const Film> film = _film.lock();
+ if (film) {
+ _video.reset_metadata (film, _player->video_container_size());
+ }
+ }
+ return;
+ }
+
boost::mutex::scoped_lock lm (_mutex);
if (type == CHANGE_TYPE_PENDING) {