/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <iomanip>
-#include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
#include "video_content.h"
#include "video_examiner.h"
#include "compose.hpp"
#include "frame_rate_change.h"
#include "log.h"
#include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <iomanip>
#include "i18n.h"
, _video_length (0)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
- , _scale (Config::instance()->default_scale ())
+ , _scale (VideoContentScale (Ratio::from_id ("178")))
{
set_default_colour_conversion (false);
}
, _video_length (len)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
- , _scale (Config::instance()->default_scale ())
+ , _scale (VideoContentScale (Ratio::from_id ("178")))
{
set_default_colour_conversion (false);
}
, _video_length (0)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
- , _scale (Config::instance()->default_scale ())
+ , _scale (VideoContentScale (Ratio::from_id ("178")))
{
set_default_colour_conversion (false);
}
}
_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");
_crop.right = node->number_child<int> ("RightCrop");
_crop.top = node->number_child<int> ("TopCrop");
if (node->optional_node_child ("ColourConversion")) {
- _colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
+ _colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
}
if (version >= 32) {
_fade_in = ContentTime (node->number_child<int64_t> ("FadeIn"));
, _video_length (0)
{
shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
- assert (ref);
+ DCPOMATIC_ASSERT (ref);
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
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));
node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_frame_type)));
+ if (_sample_aspect_ratio) {
+ node->add_child("SampleAspectRatio")->add_child_text (raw_convert<string> (_sample_aspect_ratio.get ()));
+ }
_crop.as_xml (node);
_scale.as_xml (node->add_child("Scale"));
if (_colour_conversion) {
{
{
boost::mutex::scoped_lock lm (_mutex);
- _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+ _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ());
}
if (signal) {
{
/* These examiner calls could call other content methods which take a lock on the mutex */
dcp::Size const vs = d->video_size ();
- float const vfr = d->video_frame_rate ();
+ optional<float> const vfr = d->video_frame_rate ();
ContentTime vl = d->video_length ();
+ optional<float> const ar = d->sample_aspect_ratio ();
{
boost::mutex::scoped_lock lm (_mutex);
_video_size = vs;
- _video_frame_rate = vfr;
+ /* Default video frame rate to 24fps if the examiner doesn't know */
+ _video_frame_rate = vfr.get_value_or (24);
_video_length = vl;
+ _sample_aspect_ratio = ar;
+
+ /* Guess correct scale from size and sample aspect ratio */
+ _scale = VideoContentScale (
+ Ratio::nearest_from_ratio (float (_video_size.width) * ar.get_value_or (1) / _video_size.height)
+ );
}
shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ DCPOMATIC_ASSERT (film);
LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate));
signal_changed (VideoContentProperty::VIDEO_SIZE);
signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+ signal_changed (VideoContentProperty::VIDEO_SCALE);
signal_changed (ContentProperty::LENGTH);
}
-
-string
-VideoContent::information () const
-{
- if (video_size().width == 0 || video_size().height == 0) {
- return "";
- }
-
- SafeStringStream s;
-
- s << String::compose (
- _("%1x%2 pixels (%3:1)"),
- video_size().width,
- video_size().height,
- setprecision (3), video_size().ratio ()
- );
-
- return s.str ();
-}
-
void
VideoContent::set_left_crop (int c)
{
string
VideoContent::technical_summary () const
{
- return String::compose (
- "video: length %1, size %2x%3, rate %4",
+ string s = String::compose (
+ N_("video: length %1, size %2x%3, rate %4"),
video_length_after_3d_combine().seconds(),
video_size().width,
video_size().height,
video_frame_rate()
);
+
+ if (sample_aspect_ratio ()) {
+ s += String::compose (N_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
+ }
+
+ return s;
}
dcp::Size
return dcp::Size (s.width, s.height / 2);
}
- assert (false);
+ DCPOMATIC_ASSERT (false);
}
void
VideoContent::dcp_time_to_content_time (DCPTime t) const
{
shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ DCPOMATIC_ASSERT (film);
return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}
VideoContent::scale_and_crop_to_fit_width ()
{
shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ DCPOMATIC_ASSERT (film);
set_scale (VideoContentScale (film->container ()));
VideoContent::scale_and_crop_to_fit_height ()
{
shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ DCPOMATIC_ASSERT (film);
set_scale (VideoContentScale (film->container ()));
optional<float>
VideoContent::fade (VideoFrame f) const
{
- assert (f >= 0);
+ DCPOMATIC_ASSERT (f >= 0);
if (f < fade_in().frames (video_frame_rate ())) {
return float (f) / _fade_in.frames (video_frame_rate ());
video_size_after_3d_split().height
);
- d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n";
+
+ float ratio = video_size_after_3d_split().ratio ();
+
+ if (sample_aspect_ratio ()) {
+ d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
+ ratio *= sample_aspect_ratio().get ();
+ }
+
+ d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n";
}
if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) {
}
shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ 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);
return d.str ();
}
+