Fix two crashes with Debian-shipped FFmpeg.

[dcpomatic.git] / src / lib / ffmpeg_content.cc

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 8bcc0986d0eb7f89bbed9cc83adfcdfcaa537aa3..7a1585ca21ba1bad370c525661c487f5b5966583 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -70,9 +70,9 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::pa
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
        : Content (film, node)
 {
-       video = VideoContent::from_xml (this, film, node, version);
-       audio = AudioContent::from_xml (this, film, node);
-       subtitle = SubtitleContent::from_xml (this, film, node, version);
+       video = VideoContent::from_xml (this, node, version);
+       audio = AudioContent::from_xml (this, node);
+       subtitle = SubtitleContent::from_xml (this, node, version);
 
        list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
        for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
@@ -120,9 +120,9 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_ptr<Content> > c)
        : Content (film, c)
 {
-       video.reset (new VideoContent (this, film, c));
-       audio.reset (new AudioContent (this, film, c));
-       subtitle.reset (new SubtitleContent (this, film, c));
+       video.reset (new VideoContent (this, c));
+       audio.reset (new AudioContent (this, c));
+       subtitle.reset (new SubtitleContent (this, c));
 
        shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
        DCPOMATIC_ASSERT (ref);
@@ -159,6 +159,12 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 
        if (audio) {
                audio->as_xml (node);
+
+               BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+                       shared_ptr<FFmpegAudioStream> f = dynamic_pointer_cast<FFmpegAudioStream> (i);
+                       DCPOMATIC_ASSERT (f);
+                       f->as_xml (node->add_child("AudioStream"));
+               }
        }
 
        if (subtitle) {
@@ -175,12 +181,6 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
                (*i)->as_xml (t);
        }
 
-       BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
-               shared_ptr<FFmpegAudioStream> f = dynamic_pointer_cast<FFmpegAudioStream> (i);
-               DCPOMATIC_ASSERT (f);
-               f->as_xml (node->add_child("AudioStream"));
-       }
-
        for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
                node->add_child("Filter")->add_child_text ((*i)->id ());
        }
@@ -208,7 +208,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
        shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
 
        if (examiner->has_video ()) {
-               video.reset (new VideoContent (this, film ()));
+               video.reset (new VideoContent (this));
                video->take_from_examiner (examiner);
                set_default_colour_conversion ();
        }
@@ -226,7 +226,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
                }
 
                if (!examiner->audio_streams().empty ()) {
-                       audio.reset (new AudioContent (this, film ()));
+                       audio.reset (new AudioContent (this));
 
                        BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
                                audio->add_stream (i);
@@ -240,7 +240,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
                _subtitle_streams = examiner->subtitle_streams ();
                if (!_subtitle_streams.empty ()) {
-                       subtitle.reset (new SubtitleContent (this, film ()));
+                       subtitle.reset (new SubtitleContent (this));
                        _subtitle_stream = _subtitle_streams.front ();
                }
 
@@ -478,7 +478,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("SMPTE ST 428-1 (CIE 1931 XYZ)")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_PRI_NB == 11);
+       DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11);
        p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries]));
 
        char const * transfers[] = {
@@ -502,7 +502,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("SMPTE ST 428-1")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_TRC_NB == 18);
+       DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
        p.push_back (UserProperty (_("Video"), _("Colour transfer characteristic"), transfers[_color_trc]));
 
        char const * spaces[] = {