summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/audio_examiner.h4
-rw-r--r--src/lib/copy_dcp_details_to_film.cc4
-rw-r--r--src/lib/dcp_content.cc2
-rw-r--r--src/lib/dcp_examiner.cc2
-rw-r--r--src/lib/dcp_examiner.h6
-rw-r--r--src/lib/ffmpeg_content.cc2
-rw-r--r--src/lib/ffmpeg_decoder.cc7
-rw-r--r--src/lib/ffmpeg_examiner.cc2
-rw-r--r--src/lib/ffmpeg_examiner.h2
-rw-r--r--src/lib/film.cc23
-rw-r--r--src/lib/hints.cc4
-rw-r--r--src/lib/image_decoder.cc4
-rw-r--r--src/lib/image_examiner.cc4
-rw-r--r--src/lib/image_examiner.h2
-rw-r--r--src/lib/player.cc5
-rw-r--r--src/lib/player_video.cc7
-rw-r--r--src/lib/unzipper.cc4
-rw-r--r--src/lib/video_content.cc91
-rw-r--r--src/lib/video_content.h10
-rw-r--r--src/lib/video_examiner.h4
-rw-r--r--src/lib/video_mxf_examiner.cc2
-rw-r--r--src/lib/video_mxf_examiner.h2
-rw-r--r--src/tools/dcpomatic_cli.cc4
-rw-r--r--src/tools/dcpomatic_player.cc8
-rw-r--r--src/wx/content_menu.cc9
-rw-r--r--src/wx/player_information.cc22
-rw-r--r--src/wx/video_panel.cc5
27 files changed, 149 insertions, 92 deletions
diff --git a/src/lib/audio_examiner.h b/src/lib/audio_examiner.h
index f18387041..8f5646d0f 100644
--- a/src/lib/audio_examiner.h
+++ b/src/lib/audio_examiner.h
@@ -21,6 +21,10 @@
#ifndef DCPOMATIC_AUDIO_EXAMINER_H
#define DCPOMATIC_AUDIO_EXAMINER_H
+
+#include "types.h"
+
+
/** @file src/lib/audio_examiner.h
* @brief AudioExaminer class.
*/
diff --git a/src/lib/copy_dcp_details_to_film.cc b/src/lib/copy_dcp_details_to_film.cc
index 669fc8ac9..f6ca08638 100644
--- a/src/lib/copy_dcp_details_to_film.cc
+++ b/src/lib/copy_dcp_details_to_film.cc
@@ -51,7 +51,9 @@ copy_dcp_settings_to_film(shared_ptr<const DCPContent> dcp, shared_ptr<Film> fil
film->set_three_d (dcp->three_d());
if (dcp->video) {
- film->set_container (Ratio::nearest_from_ratio(dcp->video->size().ratio()));
+ if (auto size = dcp->video->size()) {
+ film->set_container(Ratio::nearest_from_ratio(size->ratio()));
+ }
film->set_resolution (dcp->resolution());
DCPOMATIC_ASSERT (dcp->video_frame_rate());
film->set_video_frame_rate (*dcp->video_frame_rate());
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 574b077a4..378ba1882 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -838,7 +838,7 @@ DCPContent::kdm_timing_window_valid () const
Resolution
DCPContent::resolution () const
{
- if (video->size().width > 2048 || video->size().height > 1080) {
+ if (video->size() && (video->size()->width > 2048 || video->size()->height > 1080)) {
return Resolution::FOUR_K;
}
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 72eb82860..88c9a5b70 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -145,8 +145,6 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
if (!reel->main_picture()->asset_ref().resolved()) {
LOG_GENERAL("Main picture %1 of reel %2 is missing", reel->main_picture()->id(), reel->id());
_needs_assets = true;
- /* Use a dummy value here; it will be replaced when the VF is re-examined. */
- _video_size = dcp::Size(1998, 1080);
} else {
LOG_GENERAL("Main picture %1 of reel %2 found", reel->main_picture()->id(), reel->id());
diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 444fb7567..04fa31ea4 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -48,10 +48,8 @@ public:
return _video_frame_rate;
}
- dcp::Size video_size () const override {
- DCPOMATIC_ASSERT (_has_video);
- DCPOMATIC_ASSERT (_video_size);
- return *_video_size;
+ boost::optional<dcp::Size> video_size() const override {
+ return _video_size;
}
Frame video_length () const override {
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 20fe7776b..c788e7cb1 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -521,7 +521,7 @@ FFmpegContent::set_default_colour_conversion ()
video->set_colour_conversion (PresetColourConversion::from_id ("rec2020").conversion);
break;
default:
- if (s.width < 1080) {
+ if (s && s->width < 1080) {
video->set_colour_conversion (PresetColourConversion::from_id ("rec601").conversion);
} else {
video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 46e9e08a8..09db1ff1c 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -827,11 +827,14 @@ FFmpegDecoder::process_ass_subtitle (string ass, ContentTime from)
}
sub::RawSubtitle base;
+ auto video_size = _ffmpeg_content->video->size();
+ DCPOMATIC_ASSERT(video_size);
+
auto raw = sub::SSAReader::parse_line (
base,
text,
- _ffmpeg_content->video->size().width,
- _ffmpeg_content->video->size().height,
+ video_size->width,
+ video_size->height,
sub::Colour(1, 1, 1)
);
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 824b496d8..583ea1297 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -297,7 +297,7 @@ FFmpegExaminer::video_frame_rate () const
}
-dcp::Size
+optional<dcp::Size>
FFmpegExaminer::video_size () const
{
return dcp::Size (video_codec_context()->width, video_codec_context()->height);
diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 4747929b5..45313ec18 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -38,7 +38,7 @@ public:
bool has_video () const override;
boost::optional<double> video_frame_rate () const override;
- dcp::Size video_size () const override;
+ boost::optional<dcp::Size> video_size() const override;
Frame video_length () const override;
boost::optional<double> sample_aspect_ratio () const override;
bool yuv () const override;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index c56cd36df..d747efb0e 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -948,10 +948,12 @@ Film::isdcf_name (bool if_created_now) const
if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::ContentKind::TRAILER) {
auto first_video = std::find_if(content_list.begin(), content_list.end(), [](shared_ptr<Content> c) { return static_cast<bool>(c->video); });
if (first_video != content_list.end()) {
- auto first_ratio = lrintf((*first_video)->video->scaled_size(frame_size()).ratio() * 100);
- auto container_ratio = lrintf(container()->ratio() * 100);
- if (first_ratio != container_ratio) {
- isdcf_name += "-" + dcp::raw_convert<string>(first_ratio);
+ if (auto scaled_size = (*first_video)->video->scaled_size(frame_size())) {
+ auto first_ratio = lrintf(scaled_size->ratio() * 100);
+ auto container_ratio = lrintf(container()->ratio() * 100);
+ if (first_ratio != container_ratio) {
+ isdcf_name += "-" + dcp::raw_convert<string>(first_ratio);
+ }
}
}
}
@@ -1440,13 +1442,13 @@ Film::maybe_set_container_and_resolution ()
}
}
- if (video) {
+ if (video && video->size()) {
/* This is the only piece of video content in this Film. Use it to make a guess for
* DCP container size and resolution, unless the user has already explicitly set these
* things.
*/
if (!_user_explicit_container) {
- if (video->size().ratio() > 2.3) {
+ if (video->size()->ratio() > 2.3) {
set_container (Ratio::from_id("239"), false);
} else {
set_container (Ratio::from_id("185"), false);
@@ -1454,7 +1456,7 @@ Film::maybe_set_container_and_resolution ()
}
if (!_user_explicit_resolution) {
- if (video->size_after_crop().width > 2048 || video->size_after_crop().height > 1080) {
+ if (video->size_after_crop()->width > 2048 || video->size_after_crop()->height > 1080) {
set_resolution (Resolution::FOUR_K, false);
} else {
set_resolution (Resolution::TWO_K, false);
@@ -1652,9 +1654,10 @@ Film::active_area () const
for (auto i: content()) {
if (i->video) {
- dcp::Size s = i->video->scaled_size (frame);
- active.width = max(active.width, s.width);
- active.height = max(active.height, s.height);
+ if (auto s = i->video->scaled_size(frame)) {
+ active.width = max(active.width, s->width);
+ active.height = max(active.height, s->height);
+ }
}
}
diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 7537317d4..bbd5ae5d5 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -128,8 +128,8 @@ Hints::check_incorrect_container ()
int narrower_than_scope = 0;
int scope = 0;
for (auto i: film()->content()) {
- if (i->video) {
- auto const r = Ratio::nearest_from_ratio(i->video->scaled_size(film()->frame_size()).ratio());
+ if (i->video && i->video->size()) {
+ auto const r = Ratio::nearest_from_ratio(i->video->scaled_size(film()->frame_size())->ratio());
if (r && r->id() == "239") {
++scope;
} else if (r && r->id() != "239" && r->id() != "235" && r->id() != "190") {
diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d743c8395..527a98c7d 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -73,7 +73,9 @@ ImageDecoder::pass ()
/* We can't extract image size from a JPEG2000 codestream without decoding it,
so pass in the image content's size here.
*/
- _image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
+ auto size = _image_content->video->size();
+ DCPOMATIC_ASSERT(size);
+ _image = make_shared<J2KImageProxy>(path, *size, pf);
} else {
_image = make_shared<FFmpegImageProxy>(path);
}
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index ac2c95a08..15a0b043d 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -77,10 +77,10 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
}
-dcp::Size
+optional<dcp::Size>
ImageExaminer::video_size () const
{
- return _video_size.get ();
+ return _video_size;
}
diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index 53fab327e..54fca7ed1 100644
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -31,7 +31,7 @@ public:
return true;
}
boost::optional<double> video_frame_rate () const override;
- dcp::Size video_size () const override;
+ boost::optional<dcp::Size> video_size() const override;
Frame video_length () const override {
return _video_length;
}
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 03935a46b..dba02cfba 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1081,6 +1081,9 @@ Player::video (weak_ptr<Piece> weak_piece, ContentVideo video)
auto const content_video = piece->content->video;
+ auto scaled_size = content_video->scaled_size(film->frame_size());
+ DCPOMATIC_ASSERT(scaled_size);
+
for (auto eyes: eyes_to_emit) {
use_video(
std::make_shared<PlayerVideo>(
@@ -1088,7 +1091,7 @@ Player::video (weak_ptr<Piece> weak_piece, ContentVideo video)
content_video->actual_crop(),
content_video->fade(film, video.time),
scale_for_display(
- content_video->scaled_size(film->frame_size()),
+ *scaled_size,
_video_container_size,
film->frame_size(),
content_video->pixel_quanta()
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index b020ca1cd..b39f83908 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -363,8 +363,13 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video
_crop = content->video->actual_crop();
_fade = content->video->fade(film, _video_time.get());
+ auto const size = content->video->scaled_size(film->frame_size());
+ if (!size) {
+ return false;
+ }
+
_inter_size = scale_for_display(
- content->video->scaled_size(film->frame_size()),
+ *size,
player_video_container_size,
film->frame_size(),
content->video->pixel_quanta()
diff --git a/src/lib/unzipper.cc b/src/lib/unzipper.cc
index 2add8f2a9..f0170e7e0 100644
--- a/src/lib/unzipper.cc
+++ b/src/lib/unzipper.cc
@@ -39,7 +39,11 @@ using std::string;
Unzipper::Unzipper(boost::filesystem::path file)
{
int error;
+#ifdef DCPOMATIC_HAVE_ZIP_RDONLY
_zip = zip_open(dcp::filesystem::fix_long_path(file).string().c_str(), ZIP_RDONLY, &error);
+#else
+ _zip = zip_open(dcp::filesystem::fix_long_path(file).string().c_str(), 0, &error);
+#endif
if (!_zip) {
throw FileError("could not open ZIP file", file);
}
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 369fe18ba..c6046cb37 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -102,8 +102,7 @@ VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version, V
VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint)
: ContentPart (parent)
{
- _size.width = node->number_child<int> ("VideoWidth");
- _size.height = node->number_child<int> ("VideoHeight");
+ _size = dcp::Size(node->number_child<int>("VideoWidth"), node->number_child<int>("VideoHeight"));
_use = node->optional_bool_child("Use").get_value_or(true);
_length = node->number_child<Frame> ("VideoLength");
@@ -154,10 +153,12 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
if (scale) {
if (*scale) {
/* This is what we used to call "no stretch" */
- _legacy_ratio = _size.ratio();
+ DCPOMATIC_ASSERT(_size);
+ _legacy_ratio = _size->ratio();
} else {
/* This is what we used to call "no scale" */
- _custom_size = _size;
+ DCPOMATIC_ASSERT(_size);
+ _custom_size = *_size;
}
}
@@ -277,8 +278,10 @@ VideoContent::as_xml (xmlpp::Node* node) const
boost::mutex::scoped_lock lm (_mutex);
node->add_child("Use")->add_child_text (_use ? "1" : "0");
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));
+ if (_size) {
+ 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 (video_frame_type_to_string (_frame_type));
if (_sample_aspect_ratio) {
node->add_child("SampleAspectRatio")->add_child_text (raw_convert<string> (_sample_aspect_ratio.get ()));
@@ -369,11 +372,12 @@ VideoContent::identifier () const
string
VideoContent::technical_summary () const
{
+ string const size_string = size() ? String::compose("%1x%2", size()->width, size()->height) : _("unknown");
+
string s = String::compose (
- N_("video: length %1 frames, size %2x%3"),
+ N_("video: length %1 frames, size %2"),
length_after_3d_combine(),
- size().width,
- size().height
+ size_string
);
if (sample_aspect_ratio ()) {
@@ -383,31 +387,40 @@ VideoContent::technical_summary () const
return s;
}
-dcp::Size
+optional<dcp::Size>
VideoContent::size_after_3d_split () const
{
auto const s = size ();
+ if (!s) {
+ return {};
+ }
+
switch (frame_type ()) {
case VideoFrameType::TWO_D:
case VideoFrameType::THREE_D:
case VideoFrameType::THREE_D_ALTERNATE:
case VideoFrameType::THREE_D_LEFT:
case VideoFrameType::THREE_D_RIGHT:
- return s;
+ return *s;
case VideoFrameType::THREE_D_LEFT_RIGHT:
- return dcp::Size (s.width / 2, s.height);
+ return dcp::Size(s->width / 2, s->height);
case VideoFrameType::THREE_D_TOP_BOTTOM:
- return dcp::Size (s.width, s.height / 2);
+ return dcp::Size(s->width, s->height / 2);
}
DCPOMATIC_ASSERT (false);
}
/** @return Video size after 3D split and crop */
-dcp::Size
+optional<dcp::Size>
VideoContent::size_after_crop () const
{
- return actual_crop().apply(size_after_3d_split());
+ auto const after_3d = size_after_3d_split();
+ if (!after_3d) {
+ return {};
+ }
+
+ return actual_crop().apply(*after_3d);
}
@@ -442,15 +455,15 @@ VideoContent::processing_description (shared_ptr<const Film> film)
string d;
char buffer[256];
- if (size().width && size().height) {
+ if (size() && size()->width && size()->height) {
d += String::compose (
_("Content video is %1x%2"),
- size_after_3d_split().width,
- size_after_3d_split().height
+ size_after_3d_split()->width,
+ size_after_3d_split()->height
);
- double ratio = size_after_3d_split().ratio ();
+ auto ratio = size_after_3d_split()->ratio();
if (sample_aspect_ratio ()) {
snprintf (buffer, sizeof(buffer), _(", pixel aspect ratio %.2f:1"), sample_aspect_ratio().get());
@@ -466,29 +479,31 @@ VideoContent::processing_description (shared_ptr<const Film> film)
if ((crop.left || crop.right || crop.top || crop.bottom) && size() != dcp::Size(0, 0)) {
auto const cropped = size_after_crop ();
- d += String::compose (
- _("\nCropped to %1x%2"),
- cropped.width, cropped.height
- );
+ if (cropped) {
+ d += String::compose (
+ _("\nCropped to %1x%2"),
+ cropped->width, cropped->height
+ );
- snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio());
- d += buffer;
+ snprintf(buffer, sizeof(buffer), " (%.2f:1)", cropped->ratio());
+ d += buffer;
+ }
}
auto const container_size = film->frame_size ();
auto const scaled = scaled_size (container_size);
- if (scaled != size_after_crop ()) {
+ if (scaled && *scaled != size_after_crop()) {
d += String::compose (
_("\nScaled to %1x%2"),
- scaled.width, scaled.height
+ scaled->width, scaled->height
);
- snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled.ratio());
+ snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled->ratio());
d += buffer;
}
- if (scaled != container_size) {
+ if (scaled && *scaled != container_size) {
d += String::compose (
_("\nPadded with black to fit container %1 (%2x%3)"),
film->container()->container_nickname (),
@@ -516,7 +531,9 @@ void
VideoContent::add_properties (list<UserProperty>& p) const
{
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)));
+ if (auto s = size()) {
+ p.push_back(UserProperty(UserProperty::VIDEO, _("Size"), String::compose("%1x%2", s->width, s->height)));
+ }
}
void
@@ -645,7 +662,7 @@ VideoContent::modify_trim_start (ContentTime& trim) const
/** @param film_container The size of the container for the DCP that we are working on */
-dcp::Size
+optional<dcp::Size>
VideoContent::scaled_size (dcp::Size film_container)
{
if (_custom_ratio) {
@@ -660,18 +677,22 @@ VideoContent::scaled_size (dcp::Size film_container)
}
auto size = size_after_crop ();
- size.width = std::lrint(size.width * _sample_aspect_ratio.get_value_or(1));
+ if (!size) {
+ return {};
+ }
+
+ size->width = std::lrint(size->width * _sample_aspect_ratio.get_value_or(1));
/* This is what we will return unless there is any legacy stuff to take into account */
- auto auto_size = fit_ratio_within (size.ratio(), film_container);
+ auto auto_size = fit_ratio_within(size->ratio(), film_container);
if (_legacy_ratio) {
if (fit_ratio_within(*_legacy_ratio, film_container) != auto_size) {
_custom_ratio = *_legacy_ratio;
- _legacy_ratio = optional<float>();
+ _legacy_ratio = {};
return fit_ratio_within(*_custom_ratio, film_container);
}
- _legacy_ratio = boost::optional<float>();
+ _legacy_ratio = {};
}
return _pixel_quanta.round (auto_size);
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 25e43b0eb..d31c25f13 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -85,7 +85,7 @@ public:
return _length;
}
- dcp::Size size () const {
+ boost::optional<dcp::Size> size () const {
boost::mutex::scoped_lock lm (_mutex);
return _size;
}
@@ -204,9 +204,9 @@ public:
/* XXX: names for these? */
- dcp::Size size_after_3d_split () const;
- dcp::Size size_after_crop () const;
- dcp::Size scaled_size (dcp::Size container_size);
+ boost::optional<dcp::Size> size_after_3d_split() const;
+ boost::optional<dcp::Size> size_after_crop() const;
+ boost::optional<dcp::Size> scaled_size(dcp::Size container_size);
boost::optional<double> fade(std::shared_ptr<const Film> film, dcpomatic::ContentTime time) const;
@@ -237,7 +237,7 @@ private:
bool _use;
Frame _length;
boost::optional<ColourConversion> _colour_conversion;
- dcp::Size _size;
+ boost::optional<dcp::Size> _size;
VideoFrameType _frame_type;
Crop _crop;
/** ratio to scale cropped image to (or none to guess); i.e. if set, scale to _custom_ratio:1 */
diff --git a/src/lib/video_examiner.h b/src/lib/video_examiner.h
index 44a1186bb..b670dafc5 100644
--- a/src/lib/video_examiner.h
+++ b/src/lib/video_examiner.h
@@ -41,8 +41,8 @@ public:
/** @return video frame rate (if known); must not be called if has_video() == false */
virtual boost::optional<double> video_frame_rate () const = 0;
- /** @return video size; must not be called if has_video() == false */
- virtual dcp::Size video_size () const = 0;
+ /** @return video size (if known) */
+ virtual boost::optional<dcp::Size> video_size() const = 0;
/** @return video length in frames; must not be called if has_video() == false */
virtual Frame video_length () const = 0;
/** @return video sample aspect ratio (if known); must not be called if has_video() == false */
diff --git a/src/lib/video_mxf_examiner.cc b/src/lib/video_mxf_examiner.cc
index 8c7029ea8..7a05f3369 100644
--- a/src/lib/video_mxf_examiner.cc
+++ b/src/lib/video_mxf_examiner.cc
@@ -48,7 +48,7 @@ VideoMXFExaminer::video_frame_rate () const
return _asset->frame_rate().as_float ();
}
-dcp::Size
+optional<dcp::Size>
VideoMXFExaminer::video_size () const
{
return _asset->size ();
diff --git a/src/lib/video_mxf_examiner.h b/src/lib/video_mxf_examiner.h
index f5c9bf1fd..e4cd98f07 100644
--- a/src/lib/video_mxf_examiner.h
+++ b/src/lib/video_mxf_examiner.h
@@ -35,7 +35,7 @@ public:
return true;
}
boost::optional<double> video_frame_rate () const override;
- dcp::Size video_size () const override;
+ boost::optional<dcp::Size> video_size() const override;
Frame video_length () const override;
boost::optional<double> sample_aspect_ratio () const override;
bool yuv () const override;
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 9cb3c832a..c2e7ee76c 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -106,8 +106,8 @@ print_dump (shared_ptr<Film> film)
<< " start trim " << c->trim_start().seconds ()
<< " end trim " << c->trim_end().seconds () << "\n";
- if (c->video) {
- cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
+ if (c->video && c->video->size()) {
+ cout << "\t" << c->video->size()->width << "x" << c->video->size()->height << "\n"
<< "\t" << c->active_video_frame_rate(film) << "fps\n"
<< "\tcrop left " << c->video->requested_left_crop()
<< " right " << c->video->requested_right_crop()
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 9c7522bc5..e65839521 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -477,8 +477,8 @@ public:
j->set_use (true);
}
- if (i->video) {
- auto const r = Ratio::nearest_from_ratio(i->video->size().ratio());
+ if (i->video && i->video->size()) {
+ auto const r = Ratio::nearest_from_ratio(i->video->size()->ratio());
if (r->id() == "239") {
/* Any scope content means we use scope */
_film->set_container(r);
@@ -687,8 +687,8 @@ private:
for (auto i: dcp->text) {
i->set_use (true);
}
- if (dcp->video) {
- auto const r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
+ if (dcp->video && dcp->video->size()) {
+ auto const r = Ratio::nearest_from_ratio(dcp->video->size()->ratio());
if (r) {
_film->set_container(r);
}
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 700683bd2..4af5a71b7 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -548,12 +548,13 @@ ContentMenu::auto_crop ()
DCPOMATIC_ASSERT (film);
auto const content = _content.front();
auto const current_crop = content->video->actual_crop();
+ auto const video_size_guess = content->video->size().get_value_or(dcp::Size(1998, 1080));
_viewer.set_crop_guess(
dcpomatic::Rect<float>(
- static_cast<float>(std::max(0, crop.left - current_crop.left)) / content->video->size().width,
- static_cast<float>(std::max(0, crop.top - current_crop.top)) / content->video->size().height,
- 1.0f - (static_cast<float>(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / content->video->size().width),
- 1.0f - (static_cast<float>(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / content->video->size().height)
+ static_cast<float>(std::max(0, crop.left - current_crop.left)) / video_size_guess.width,
+ static_cast<float>(std::max(0, crop.top - current_crop.top)) / video_size_guess.height,
+ 1.0f - (static_cast<float>(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / video_size_guess.width),
+ 1.0f - (static_cast<float>(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / video_size_guess.height)
));
};
diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index 806611140..057d26740 100644
--- a/src/wx/player_information.cc
+++ b/src/wx/player_information.cc
@@ -161,7 +161,13 @@ PlayerInformation::triggered_update ()
DCPOMATIC_ASSERT (dcp->video);
- checked_set (_dcp[r++], wxString::Format(_("Size: %dx%d"), dcp->video->size().width, dcp->video->size().height));
+ auto const size = dcp->video->size();
+
+ if (size) {
+ checked_set(_dcp[r++], wxString::Format(_("Size: %dx%d"), size->width, size->height));
+ } else {
+ checked_set(_dcp[r++], _("Size: unknown"));
+ }
if (dcp->video_frame_rate()) {
checked_set (_dcp[r++], wxString::Format(_("Frame rate: %d"), (int) lrint(*dcp->video_frame_rate())));
}
@@ -186,14 +192,18 @@ PlayerInformation::triggered_update ()
checked_set (_dcp[r++], std_to_wx(len));
- auto decode = dcp->video->size();
+ auto decode = size;
auto reduction = _viewer.dcp_decode_reduction();
- if (reduction) {
- decode.width /= pow(2, *reduction);
- decode.height /= pow(2, *reduction);
+ if (reduction && decode) {
+ decode->width /= pow(2, *reduction);
+ decode->height /= pow(2, *reduction);
}
- checked_set (_decode_resolution, wxString::Format(_("Decode resolution: %dx%d"), decode.width, decode.height));
+ if (decode) {
+ checked_set(_decode_resolution, wxString::Format(_("Decode resolution: %dx%d"), decode->width, decode->height));
+ } else {
+ checked_set(_decode_resolution, _("Decode resolution: unknown"));
+ }
DCPOMATIC_ASSERT(r <= dcp_lines);
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index f78da05d9..0280f16a0 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -679,7 +679,10 @@ bool
VideoPanel::scale_custom_edit_clicked ()
{
auto vc = _parent->selected_video().front()->video;
- CustomScaleDialog dialog(this, vc->size(), _parent->film()->frame_size(), vc->custom_ratio(), vc->custom_size());
+ auto size = vc->size();
+ DCPOMATIC_ASSERT(size);
+
+ CustomScaleDialog dialog(this, *size, _parent->film()->frame_size(), vc->custom_ratio(), vc->custom_size());
if (dialog.ShowModal() != wxID_OK) {
return false;
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-05 23:12:11 +0000