/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "video_content.h"
+#include "content.h"
#include "video_examiner.h"
#include "compose.hpp"
#include "ratio.h"
#include "i18n.h"
-#define LOG_GENERAL(...) film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-int const VideoContentProperty::VIDEO_SIZE = 0;
-int const VideoContentProperty::VIDEO_FRAME_RATE = 1;
-int const VideoContentProperty::VIDEO_FRAME_TYPE = 2;
-int const VideoContentProperty::VIDEO_CROP = 3;
-int const VideoContentProperty::VIDEO_SCALE = 4;
-int const VideoContentProperty::COLOUR_CONVERSION = 5;
-int const VideoContentProperty::VIDEO_FADE_IN = 6;
-int const VideoContentProperty::VIDEO_FADE_OUT = 7;
+int const VideoContentProperty::SIZE = 0;
+int const VideoContentProperty::FRAME_TYPE = 1;
+int const VideoContentProperty::CROP = 2;
+int const VideoContentProperty::SCALE = 3;
+int const VideoContentProperty::COLOUR_CONVERSION = 4;
+int const VideoContentProperty::FADE_IN = 5;
+int const VideoContentProperty::FADE_OUT = 6;
using std::string;
using std::setprecision;
using boost::optional;
using boost::dynamic_pointer_cast;
-VideoContent::VideoContent (shared_ptr<const Film> film)
- : Content (film)
- , _video_length (0)
- , _video_frame_type (VIDEO_FRAME_TYPE_2D)
+VideoContent::VideoContent (Content* parent)
+ : ContentPart (parent)
+ , _length (0)
+ , _frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
, _yuv (true)
, _fade_in (0)
, _fade_out (0)
{
- set_default_colour_conversion ();
+
}
-VideoContent::VideoContent (shared_ptr<const Film> film, boost::filesystem::path p)
- : Content (film, p)
- , _video_length (0)
- , _video_frame_type (VIDEO_FRAME_TYPE_2D)
- , _scale (VideoContentScale (Ratio::from_id ("178")))
- , _yuv (true)
- , _fade_in (0)
- , _fade_out (0)
+shared_ptr<VideoContent>
+VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
{
- set_default_colour_conversion ();
+ if (!node->optional_number_child<int> ("VideoWidth")) {
+ return shared_ptr<VideoContent> ();
+ }
+
+ return shared_ptr<VideoContent> (new VideoContent (parent, node, version));
}
-VideoContent::VideoContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
- : Content (film, node)
+VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version)
+ : ContentPart (parent)
{
- _video_size.width = node->number_child<int> ("VideoWidth");
- _video_size.height = node->number_child<int> ("VideoHeight");
- _video_frame_rate = node->optional_number_child<double> ("VideoFrameRate");
- _video_length = node->number_child<Frame> ("VideoLength");
- _video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
+ _size.width = node->number_child<int> ("VideoWidth");
+ _size.height = node->number_child<int> ("VideoHeight");
+
+ /* Backwards compatibility */
+ optional<double> r = node->optional_number_child<double>("VideoFrameRate");
+ if (r) {
+ _parent->set_video_frame_rate (r.get ());
+ }
+
+ _length = node->number_child<Frame> ("VideoLength");
+ _frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
_sample_aspect_ratio = node->optional_number_child<double> ("SampleAspectRatio");
_crop.left = node->number_child<int> ("LeftCrop");
_crop.right = node->number_child<int> ("RightCrop");
}
}
-VideoContent::VideoContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
- : Content (film, c)
- , _video_length (0)
+VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
+ : ContentPart (parent)
+ , _length (0)
, _yuv (false)
{
- shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
+ shared_ptr<VideoContent> ref = c[0]->video;
DCPOMATIC_ASSERT (ref);
- for (size_t i = 0; i < c.size(); ++i) {
- shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
+ for (size_t i = 1; i < c.size(); ++i) {
- if (vc->video_size() != ref->video_size()) {
+ if (c[i]->video->size() != ref->size()) {
throw JoinError (_("Content to be joined must have the same picture size."));
}
- if (vc->video_frame_rate() != ref->video_frame_rate()) {
- throw JoinError (_("Content to be joined must have the same video frame rate."));
- }
-
- if (vc->video_frame_type() != ref->video_frame_type()) {
+ if (c[i]->video->frame_type() != ref->frame_type()) {
throw JoinError (_("Content to be joined must have the same video frame type."));
}
- if (vc->crop() != ref->crop()) {
+ if (c[i]->video->crop() != ref->crop()) {
throw JoinError (_("Content to be joined must have the same crop."));
}
- if (vc->scale() != ref->scale()) {
+ if (c[i]->video->scale() != ref->scale()) {
throw JoinError (_("Content to be joined must have the same scale setting."));
}
- if (vc->colour_conversion() != ref->colour_conversion()) {
+ if (c[i]->video->colour_conversion() != ref->colour_conversion()) {
throw JoinError (_("Content to be joined must have the same colour conversion."));
}
- if (vc->fade_in() != ref->fade_in() || vc->fade_out() != ref->fade_out()) {
+ if (c[i]->video->fade_in() != ref->fade_in() || c[i]->video->fade_out() != ref->fade_out()) {
throw JoinError (_("Content to be joined must have the same fades."));
}
- _video_length += vc->video_length ();
+ _length += c[i]->video->length ();
- if (vc->yuv ()) {
+ if (c[i]->video->yuv ()) {
_yuv = true;
}
}
- _video_size = ref->video_size ();
- _video_frame_rate = ref->video_frame_rate ();
- _video_frame_type = ref->video_frame_type ();
+ _size = ref->size ();
+ _frame_type = ref->frame_type ();
_crop = ref->crop ();
_scale = ref->scale ();
_colour_conversion = ref->colour_conversion ();
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));
- 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));
- if (_video_frame_rate) {
- node->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate.get()));
- }
- node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_frame_type)));
+ node->add_child("VideoLength")->add_child_text (raw_convert<string> (_length));
+ node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_size.width));
+ node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_size.height));
+ node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_frame_type)));
if (_sample_aspect_ratio) {
node->add_child("SampleAspectRatio")->add_child_text (raw_convert<string> (_sample_aspect_ratio.get ()));
}
}
void
-VideoContent::set_default_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
-VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
+VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
{
/* These examiner calls could call other content methods which take a lock on the mutex */
dcp::Size const vs = d->video_size ();
- optional<double> const vfr = d->video_frame_rate ();
Frame vl = d->video_length ();
optional<double> const ar = d->sample_aspect_ratio ();
bool const yuv = d->yuv ();
{
boost::mutex::scoped_lock lm (_mutex);
- _video_size = vs;
- _video_frame_rate = vfr;
- _video_length = vl;
+ _size = vs;
+ _length = vl;
_sample_aspect_ratio = ar;
_yuv = yuv;
/* Guess correct scale from size and sample aspect ratio */
_scale = VideoContentScale (
- Ratio::nearest_from_ratio (double (_video_size.width) * ar.get_value_or (1) / _video_size.height)
+ Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
);
}
- 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);
- signal_changed (VideoContentProperty::VIDEO_SCALE);
- signal_changed (ContentProperty::LENGTH);
-}
-
-void
-VideoContent::set_left_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
-
- if (_crop.left == c) {
- return;
- }
-
- _crop.left = c;
- }
-
- signal_changed (VideoContentProperty::VIDEO_CROP);
-}
-
-void
-VideoContent::set_right_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_crop.right == c) {
- return;
- }
-
- _crop.right = c;
- }
-
- signal_changed (VideoContentProperty::VIDEO_CROP);
-}
-
-void
-VideoContent::set_top_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_crop.top == c) {
- return;
- }
-
- _crop.top = c;
- }
-
- signal_changed (VideoContentProperty::VIDEO_CROP);
-}
-
-void
-VideoContent::set_bottom_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_crop.bottom == c) {
- return;
- }
-
- _crop.bottom = c;
- }
-
- signal_changed (VideoContentProperty::VIDEO_CROP);
-}
-
-void
-VideoContent::set_scale (VideoContentScale s)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_scale == s) {
- return;
- }
+ LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
- _scale = s;
+ if (d->video_frame_rate()) {
+ _parent->set_video_frame_rate (d->video_frame_rate().get());
}
- signal_changed (VideoContentProperty::VIDEO_SCALE);
+ _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 */
VideoContent::identifier () const
{
SafeStringStream s;
- s << Content::identifier()
- << "_" << crop().left
+ s << crop().left
<< "_" << crop().right
<< "_" << crop().top
<< "_" << crop().bottom
return s.str ();
}
-void
-VideoContent::set_video_frame_type (VideoFrameType t)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _video_frame_type = t;
- }
-
- signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
-}
-
string
VideoContent::technical_summary () const
{
string s = String::compose (
- N_("video: length %1 frames, size %2x%3, rate %4"),
- video_length_after_3d_combine(),
- video_size().width,
- video_size().height,
- video_frame_rate()
+ N_("video: length %1 frames, size %2x%3"),
+ length_after_3d_combine(),
+ size().width,
+ size().height
);
if (sample_aspect_ratio ()) {
}
dcp::Size
-VideoContent::video_size_after_3d_split () const
+VideoContent::size_after_3d_split () const
{
- dcp::Size const s = video_size ();
- switch (video_frame_type ()) {
+ dcp::Size const s = size ();
+ switch (frame_type ()) {
case VIDEO_FRAME_TYPE_2D:
case VIDEO_FRAME_TYPE_3D_ALTERNATE:
case VIDEO_FRAME_TYPE_3D_LEFT:
DCPOMATIC_ASSERT (false);
}
-void
-VideoContent::unset_colour_conversion ()
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _colour_conversion = boost::optional<ColourConversion> ();
- }
-
- signal_changed (VideoContentProperty::COLOUR_CONVERSION);
-}
-
-void
-VideoContent::set_colour_conversion (ColourConversion c)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _colour_conversion = c;
- }
-
- signal_changed (VideoContentProperty::COLOUR_CONVERSION);
-}
-
-void
-VideoContent::set_fade_in (Frame t)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _fade_in = t;
- }
-
- signal_changed (VideoContentProperty::VIDEO_FADE_IN);
-}
-
-void
-VideoContent::set_fade_out (Frame t)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _fade_out = t;
- }
-
- signal_changed (VideoContentProperty::VIDEO_FADE_OUT);
-}
-
/** @return Video size after 3D split and crop */
dcp::Size
-VideoContent::video_size_after_crop () const
+VideoContent::size_after_crop () const
{
- return crop().apply (video_size_after_3d_split ());
+ return crop().apply (size_after_3d_split ());
}
void
VideoContent::scale_and_crop_to_fit_width ()
{
- set_scale (VideoContentScale (film()->container ()));
+ shared_ptr<const Film> film = _parent->film ();
+ set_scale (VideoContentScale (film->container ()));
- int const crop = max (0, int (video_size().height - double (film()->frame_size().height) * video_size().width / film()->frame_size().width));
+ int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width));
set_left_crop (0);
set_right_crop (0);
set_top_crop (crop / 2);
void
VideoContent::scale_and_crop_to_fit_height ()
{
- set_scale (VideoContentScale (film()->container ()));
+ shared_ptr<const Film> film = _parent->film ();
+ set_scale (VideoContentScale (film->container ()));
- int const crop = max (0, int (video_size().width - double (film()->frame_size().width) * video_size().height / film()->frame_size().height));
+ int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height));
set_left_crop (crop / 2);
set_right_crop (crop / 2);
set_top_crop (0);
set_bottom_crop (0);
}
-void
-VideoContent::set_video_frame_rate (double r)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_video_frame_rate == r) {
- return;
- }
-
- _video_frame_rate = r;
- }
-
- signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
-}
-
/** @param f Frame index within the whole (untrimmed) content */
optional<double>
VideoContent::fade (Frame f) const
{
DCPOMATIC_ASSERT (f >= 0);
- Frame const ts = trim_start().frames_round(video_frame_rate());
+ shared_ptr<const Film> film = _parent->film ();
+
+ double const vfr = _parent->active_video_frame_rate ();
+
+ Frame const ts = _parent->trim_start().frames_round(vfr);
if ((f - ts) < fade_in()) {
return double (f - ts) / fade_in();
}
- Frame fade_out_start = video_length() - trim_end().frames_round(video_frame_rate()) - fade_out();
+ Frame fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out();
if (f >= fade_out_start) {
return 1 - double (f - fade_out_start) / fade_out();
}
/* stringstream is OK here as this string is just for presentation to the user */
SafeStringStream d;
- if (video_size().width && video_size().height) {
+ if (size().width && size().height) {
d << String::compose (
_("Content video is %1x%2"),
- video_size_after_3d_split().width,
- video_size_after_3d_split().height
+ size_after_3d_split().width,
+ size_after_3d_split().height
);
- double ratio = video_size_after_3d_split().ratio ();
+ double ratio = size_after_3d_split().ratio ();
if (sample_aspect_ratio ()) {
d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
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)) {
- dcp::Size cropped = video_size_after_crop ();
+ 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"),
cropped.width, cropped.height
d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n";
}
- 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);
+ 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 != video_size_after_crop ()) {
+ if (scaled != size_after_crop ()) {
d << String::compose (
_("Scaled to %1x%2"),
scaled.width, scaled.height
if (scaled != container_size) {
d << String::compose (
_("Padded with black to fit container %1 (%2x%3)"),
- film()->container()->nickname (),
+ film->container()->nickname (),
container_size.width, container_size.height
);
d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n";
}
- d << _("Content frame rate");
- d << " " << fixed << setprecision(4) << video_frame_rate() << "\n";
-
- FrameRateChange frc (video_frame_rate(), film()->video_frame_rate ());
- d << frc.description () << "\n";
-
return d.str ();
}
void
VideoContent::add_properties (list<UserProperty>& p) const
{
- p.push_back (UserProperty (_("Video"), _("Length"), raw_convert<string> (video_length ()), _("video frames")));
- p.push_back (UserProperty (_("Video"), _("Size"), raw_convert<string> (video_size().width) + "x" + raw_convert<string> (video_size().height)));
- p.push_back (UserProperty (_("Video"), _("Frame rate"), raw_convert<string> (video_frame_rate(), 5), _("frames per second")));
+ p.push_back (UserProperty (_("Video"), _("Length"), raw_convert<string> (length ()), _("video frames")));
+ p.push_back (UserProperty (_("Video"), _("Size"), raw_convert<string> (size().width) + "x" + raw_convert<string> (size().height)));
}
-double
-VideoContent::video_frame_rate () const
+void
+VideoContent::set_length (Frame len)
{
- boost::mutex::scoped_lock lm (_mutex);
- return _video_frame_rate.get_value_or (film()->video_frame_rate ());
+ maybe_set (_length, len, ContentProperty::LENGTH);
+}
+
+void
+VideoContent::set_left_crop (int c)
+{
+ maybe_set (_crop.left, c, VideoContentProperty::CROP);
+}
+
+void
+VideoContent::set_right_crop (int c)
+{
+ maybe_set (_crop.right, c, VideoContentProperty::CROP);
+}
+
+void
+VideoContent::set_top_crop (int c)
+{
+ maybe_set (_crop.top, c, VideoContentProperty::CROP);
+}
+
+void
+VideoContent::set_bottom_crop (int c)
+{
+ maybe_set (_crop.bottom, c, VideoContentProperty::CROP);
+}
+
+void
+VideoContent::set_scale (VideoContentScale s)
+{
+ maybe_set (_scale, s, VideoContentProperty::SCALE);
+}
+
+void
+VideoContent::set_frame_type (VideoFrameType t)
+{
+ maybe_set (_frame_type, t, VideoContentProperty::FRAME_TYPE);
+}
+
+void
+VideoContent::unset_colour_conversion ()
+{
+ maybe_set (_colour_conversion, boost::optional<ColourConversion> (), VideoContentProperty::COLOUR_CONVERSION);
+}
+
+void
+VideoContent::set_colour_conversion (ColourConversion c)
+{
+ maybe_set (_colour_conversion, c, VideoContentProperty::COLOUR_CONVERSION);
+}
+
+void
+VideoContent::set_fade_in (Frame t)
+{
+ maybe_set (_fade_in, t, VideoContentProperty::FADE_IN);
+}
+
+void
+VideoContent::set_fade_out (Frame t)
+{
+ maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
}
projects / dcpomatic.git / blobdiff