projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...
[dcpomatic.git]
/
src
/
lib
/
video_content.cc
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index 3470e62bfdc9891c5f00d283eddda0a6bf24c833..c50d466a1f703f083a51a01d72440d0e0642d315 100644
(file)
--- a/
src/lib/video_content.cc
+++ b/
src/lib/video_content.cc
@@
-17,10
+17,6
@@
*/
*/
-#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 "video_content.h"
#include "video_examiner.h"
#include "compose.hpp"
@@
-33,6
+29,10
@@
#include "frame_rate_change.h"
#include "log.h"
#include "safe_stringstream.h"
#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"
#include "i18n.h"
@@
-66,7
+66,7
@@
VideoContent::VideoContent (shared_ptr<const Film> f)
, _video_length (0)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _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);
}
{
set_default_colour_conversion (false);
}
@@
-76,7
+76,7
@@
VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len
, _video_length (len)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _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);
}
{
set_default_colour_conversion (false);
}
@@
-86,7
+86,7
@@
VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
, _video_length (0)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _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);
}
{
set_default_colour_conversion (false);
}
@@
-106,6
+106,7
@@
VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
}
_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
}
_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");
_crop.left = node->number_child<int> ("LeftCrop");
_crop.right = node->number_child<int> ("RightCrop");
_crop.top = node->number_child<int> ("TopCrop");
@@
-135,7
+136,7
@@
VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content>
, _video_length (0)
{
shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
, _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]);
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
@@
-190,6
+191,9
@@
VideoContent::as_xml (xmlpp::Node* node) const
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)));
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) {
_crop.as_xml (node);
_scale.as_xml (node->add_child("Scale"));
if (_colour_conversion) {
@@
-217,22
+221,31
@@
VideoContent::take_from_video_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 ();
{
/* 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 ();
ContentTime vl = d->video_length ();
+ optional<float> const ar = d->sample_aspect_ratio ();
{
boost::mutex::scoped_lock lm (_mutex);
_video_size = vs;
{
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;
_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 ();
}
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);
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);
}
signal_changed (ContentProperty::LENGTH);
}
@@
-252,6
+265,10
@@
VideoContent::information () const
video_size().height,
setprecision (3), video_size().ratio ()
);
video_size().height,
setprecision (3), video_size().ratio ()
);
+
+ if (sample_aspect_ratio ()) {
+ s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ());
+ }
return s.str ();
}
return s.str ();
}
@@
-365,13
+382,19
@@
VideoContent::set_video_frame_type (VideoFrameType t)
string
VideoContent::technical_summary () const
{
string
VideoContent::technical_summary () const
{
-
return
String::compose (
+
string s =
String::compose (
"video: length %1, size %2x%3, rate %4",
video_length_after_3d_combine().seconds(),
video_size().width,
video_size().height,
video_frame_rate()
);
"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 (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
+ }
+
+ return s;
}
dcp::Size
}
dcp::Size
@@
-390,7
+413,7
@@
VideoContent::video_size_after_3d_split () const
return dcp::Size (s.width, s.height / 2);
}
return dcp::Size (s.width, s.height / 2);
}
-
assert
(false);
+
DCPOMATIC_ASSERT
(false);
}
void
}
void
@@
-451,7
+474,7
@@
ContentTime
VideoContent::dcp_time_to_content_time (DCPTime t) const
{
shared_ptr<const Film> film = _film.lock ();
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()));
}
return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}
@@
-459,7
+482,7
@@
void
VideoContent::scale_and_crop_to_fit_width ()
{
shared_ptr<const Film> film = _film.lock ();
VideoContent::scale_and_crop_to_fit_width ()
{
shared_ptr<const Film> film = _film.lock ();
-
assert
(film);
+
DCPOMATIC_ASSERT
(film);
set_scale (VideoContentScale (film->container ()));
set_scale (VideoContentScale (film->container ()));
@@
-472,7
+495,7
@@
void
VideoContent::scale_and_crop_to_fit_height ()
{
shared_ptr<const Film> film = _film.lock ();
VideoContent::scale_and_crop_to_fit_height ()
{
shared_ptr<const Film> film = _film.lock ();
-
assert
(film);
+
DCPOMATIC_ASSERT
(film);
set_scale (VideoContentScale (film->container ()));
set_scale (VideoContentScale (film->container ()));
@@
-499,7
+522,7
@@
VideoContent::set_video_frame_rate (float r)
optional<float>
VideoContent::fade (VideoFrame f) const
{
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 ());
if (f < fade_in().frames (video_frame_rate ())) {
return float (f) / _fade_in.frames (video_frame_rate ());
@@
-540,7
+563,7
@@
VideoContent::processing_description () const
}
shared_ptr<const Film> film = _film.lock ();
}
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);
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);