#include "frame_rate_change.h"
#include "log.h"
#include "safe_stringstream.h"
+#include "raw_convert.h"
#include <libcxml/cxml.h>
#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
#include <iomanip>
#include "i18n.h"
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
-using dcp::raw_convert;
VideoContent::VideoContent (shared_ptr<const Film> f)
: Content (f)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
+ , _fade_in (0)
+ , _fade_out (0)
{
- set_default_colour_conversion (false);
+ set_default_colour_conversion ();
}
-VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
+VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, Frame len)
: Content (f, s)
, _video_length (len)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
+ , _fade_in (0)
+ , _fade_out (0)
{
- set_default_colour_conversion (false);
+ set_default_colour_conversion ();
}
VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
+ , _fade_in (0)
+ , _fade_out (0)
{
- set_default_colour_conversion (false);
+ set_default_colour_conversion ();
}
VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
_video_size.width = node->number_child<int> ("VideoWidth");
_video_size.height = node->number_child<int> ("VideoHeight");
_video_frame_rate = node->number_child<float> ("VideoFrameRate");
-
- if (version < 32) {
- /* DCP-o-matic 1.0 branch */
- _video_length = ContentTime::from_frames (node->number_child<int64_t> ("VideoLength"), _video_frame_rate);
- } else {
- _video_length = ContentTime (node->number_child<ContentTime::Type> ("VideoLength"));
- }
-
+ _video_length = node->number_child<Frame> ("VideoLength");
_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
_sample_aspect_ratio = node->optional_number_child<float> ("SampleAspectRatio");
_crop.left = node->number_child<int> ("LeftCrop");
_colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
}
if (version >= 32) {
- _fade_in = ContentTime (node->number_child<int64_t> ("FadeIn"));
- _fade_out = ContentTime (node->number_child<int64_t> ("FadeOut"));
+ _fade_in = node->number_child<Frame> ("FadeIn");
+ _fade_out = node->number_child<Frame> ("FadeOut");
+ } else {
+ _fade_in = _fade_out = 0;
}
}
VideoContent::as_xml (xmlpp::Node* node) const
{
boost::mutex::scoped_lock lm (_mutex);
- node->add_child("VideoLength")->add_child_text (raw_convert<string> (_video_length.get ()));
+ node->add_child("VideoLength")->add_child_text (raw_convert<string> (_video_length));
node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_video_size.width));
node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_video_size.height));
node->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate));
if (_colour_conversion) {
_colour_conversion.get().as_xml (node->add_child("ColourConversion"));
}
- node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in.get ()));
- node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out.get ()));
+ node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
+ node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
}
void
-VideoContent::set_default_colour_conversion (bool signal)
+VideoContent::set_default_colour_conversion ()
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ());
- }
-
- if (signal) {
- signal_changed (VideoContentProperty::COLOUR_CONVERSION);
- }
+ /* If there's no better offer we'll use Rec. 709 */
+ boost::mutex::scoped_lock lm (_mutex);
+ _colour_conversion = PresetColourConversion::from_id ("rec709").conversion;
}
void
/* These examiner calls could call other content methods which take a lock on the mutex */
dcp::Size const vs = d->video_size ();
optional<float> const vfr = d->video_frame_rate ();
- ContentTime vl = d->video_length ();
+ Frame vl = d->video_length ();
optional<float> const ar = d->sample_aspect_ratio ();
{
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
- LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate));
+ LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length);
+
+ set_default_colour_conversion ();
signal_changed (VideoContentProperty::VIDEO_SIZE);
signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
VideoContent::technical_summary () const
{
string s = String::compose (
- N_("video: length %1, size %2x%3, rate %4"),
- video_length_after_3d_combine().seconds(),
+ N_("video: length %1 frames, size %2x%3, rate %4"),
+ video_length_after_3d_combine(),
video_size().width,
video_size().height,
video_frame_rate()
}
void
-VideoContent::set_fade_in (ContentTime t)
+VideoContent::set_fade_in (Frame t)
{
{
boost::mutex::scoped_lock lm (_mutex);
}
void
-VideoContent::set_fade_out (ContentTime t)
+VideoContent::set_fade_out (Frame t)
{
{
boost::mutex::scoped_lock lm (_mutex);
}
optional<float>
-VideoContent::fade (VideoFrame f) const
+VideoContent::fade (Frame f) const
{
DCPOMATIC_ASSERT (f >= 0);
- if (f < fade_in().frames (video_frame_rate ())) {
- return float (f) / _fade_in.frames (video_frame_rate ());
+ if (f < fade_in()) {
+ return float (f) / fade_in();
}
- VideoFrame fade_out_start = ContentTime (video_length() - fade_out()).frames (video_frame_rate ());
+ Frame fade_out_start = video_length() - fade_out();
if (f >= fade_out_start) {
- return 1 - float (f - fade_out_start) / fade_out().frames (video_frame_rate ());
+ return 1 - float (f - fade_out_start) / fade_out();
}
return optional<float> ();
DCPOMATIC_ASSERT (film);
dcp::Size const container_size = film->frame_size ();
- dcp::Size const scaled = scale().size (dynamic_pointer_cast<const VideoContent> (shared_from_this ()), container_size, container_size, 1);
+ dcp::Size const scaled = scale().size (dynamic_pointer_cast<const VideoContent> (shared_from_this ()), container_size, container_size);
if (scaled != video_size_after_crop ()) {
d << String::compose (
if (scaled != container_size) {
d << String::compose (
- _("Padded with black to %1x%2"),
+ _("Padded with black to fit container %1 (%2x%3)"),
+ film->container()->nickname (),
container_size.width, container_size.height
);
return d.str ();
}
-