#include "exceptions.h"
#include "frame_rate_change.h"
#include "log.h"
-#include "raw_convert.h"
+#include "dcpomatic_log.h"
+#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
#include <libxml++/libxml++.h>
#include <iomanip>
#include <iostream>
#include "i18n.h"
-#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
int const VideoContentProperty::SIZE = 0;
int const VideoContentProperty::FRAME_TYPE = 1;
int const VideoContentProperty::CROP = 2;
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
VideoContent::VideoContent (Content* parent)
: ContentPart (parent)
_scale = VideoContentScale (node->node_child ("Scale"));
}
-
if (node->optional_node_child ("ColourConversion")) {
_colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
}
optional<double> const ar = d->sample_aspect_ratio ();
bool const yuv = d->yuv ();
+ ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+ ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+ ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+
{
boost::mutex::scoped_lock lm (_mutex);
_size = vs;
_sample_aspect_ratio = ar;
_yuv = yuv;
- /* Guess correct scale from size and sample aspect ratio */
- _scale = VideoContentScale (
- Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
- );
+ if (Config::instance()->default_scale_to ()) {
+ _scale = VideoContentScale (Config::instance()->default_scale_to ());
+ } else {
+ /* Guess correct scale from size and sample aspect ratio */
+ _scale = VideoContentScale (
+ Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
+ );
+ }
}
LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
if (d->video_frame_rate()) {
_parent->set_video_frame_rate (d->video_frame_rate().get());
}
-
- _parent->signal_changed (VideoContentProperty::SIZE);
- _parent->signal_changed (VideoContentProperty::SCALE);
- _parent->signal_changed (ContentProperty::LENGTH);
}
/** @return string which includes everything about how this content looks */
}
void
-VideoContent::scale_and_crop_to_fit_width ()
+VideoContent::scale_and_crop_to_fit_width (shared_ptr<const Film> film)
{
- shared_ptr<const Film> film = _parent->film ();
- set_scale (VideoContentScale (film->container ()));
+ set_scale (VideoContentScale(film->container()));
int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width));
set_left_crop (0);
}
void
-VideoContent::scale_and_crop_to_fit_height ()
+VideoContent::scale_and_crop_to_fit_height (shared_ptr<const Film> film)
{
- shared_ptr<const Film> film = _parent->film ();
- set_scale (VideoContentScale (film->container ()));
+ set_scale (VideoContentScale(film->container()));
int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height));
set_left_crop (crop / 2);
/** @param f Frame index within the whole (untrimmed) content */
optional<double>
-VideoContent::fade (Frame f) const
+VideoContent::fade (shared_ptr<const Film> film, Frame f) const
{
DCPOMATIC_ASSERT (f >= 0);
- shared_ptr<const Film> film = _parent->film ();
-
- double const vfr = _parent->active_video_frame_rate ();
+ double const vfr = _parent->active_video_frame_rate(film);
Frame const ts = _parent->trim_start().frames_round(vfr);
if ((f - ts) < fade_in()) {
}
string
-VideoContent::processing_description () const
+VideoContent::processing_description (shared_ptr<const Film> film) const
{
string d;
char buffer[256];
if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) {
dcp::Size cropped = size_after_crop ();
d += String::compose (
- _("Cropped to %1x%2"),
+ _("\nCropped to %1x%2"),
cropped.width, cropped.height
);
- snprintf (buffer, sizeof(buffer), " (%.2f:1)\n", cropped.ratio());
+ snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio());
d += buffer;
}
- shared_ptr<const Film> film = _parent->film ();
dcp::Size const container_size = film->frame_size ();
dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
if (scaled != size_after_crop ()) {
d += String::compose (
- _("Scaled to %1x%2"),
+ _("\nScaled to %1x%2"),
scaled.width, scaled.height
);
- snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), scaled.ratio());
+ snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled.ratio());
d += buffer;
}
if (scaled != container_size) {
d += String::compose (
- _("Padded with black to fit container %1 (%2x%3)"),
- film->container()->nickname (),
+ _("\nPadded with black to fit container %1 (%2x%3)"),
+ film->container()->container_nickname (),
container_size.width, container_size.height
);
- snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), container_size.ratio());
+ snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), container_size.ratio());
d += buffer;
}
if (_parent->video_frame_rate()) {
double const vfr = _parent->video_frame_rate().get ();
- snprintf (buffer, sizeof(buffer), _("Content frame rate %.4f\n"), vfr);
+ snprintf (buffer, sizeof(buffer), _("\nContent frame rate %.4f\n"), vfr);
d += buffer;
FrameRateChange frc (vfr, film->video_frame_rate ());
- d += frc.description () + "\n";
+ d += frc.description ();
}
return d;
void
VideoContent::add_properties (list<UserProperty>& p) const
{
- p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), raw_convert<string> (length ()), _("video frames")));
- p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), raw_convert<string> (size().width) + "x" + raw_convert<string> (size().height)));
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), length (), _("video frames")));
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), String::compose ("%1x%2", size().width, size().height)));
}
void
{
maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
}
+
+void
+VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
+{
+ if (c->_colour_conversion) {
+ set_colour_conversion (c->_colour_conversion.get());
+ } else {
+ unset_colour_conversion ();
+ }
+ set_frame_type (c->_frame_type);
+ set_left_crop (c->_crop.left);
+ set_right_crop (c->_crop.right);
+ set_top_crop (c->_crop.top);
+ set_bottom_crop (c->_crop.bottom);
+ set_scale (c->_scale);
+ set_fade_in (c->_fade_in);
+ set_fade_out (c->_fade_out);
+}
+
+void
+VideoContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
+{
+ pos = pos.round (film->video_frame_rate());
+}
+
+void
+VideoContent::modify_trim_start (ContentTime& trim) const
+{
+ if (_parent->video_frame_rate()) {
+ trim = trim.round (_parent->video_frame_rate().get());
+ }
+}