Add VideoMXFContent (part of #803).

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 801e145af09745096582d88b01159a8a0fca9804..0c513056c56e45ddc1e301d001da346862de7401 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -21,16 +21,18 @@
 #include "film.h"
 #include "ffmpeg_decoder.h"
 #include "video_decoder.h"
+#include "audio_decoder.h"
 #include "audio_buffers.h"
 #include "audio_content.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
+#include "content_audio.h"
 #include "image_content.h"
-#include "sndfile_decoder.h"
-#include "sndfile_content.h"
 #include "subtitle_content.h"
 #include "text_subtitle_decoder.h"
 #include "text_subtitle_content.h"
+#include "video_mxf_decoder.h"
+#include "video_mxf_content.h"
 #include "dcp_content.h"
 #include "job.h"
 #include "image.h"
@@ -160,34 +162,6 @@ Player::setup_pieces ()
                        frc = FrameRateChange (ic->active_video_frame_rate(), _film->video_frame_rate());
                }
 
-               /* SndfileContent */
-               shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (i);
-               if (sc) {
-                       decoder.reset (new SndfileDecoder (sc, _fast, _film->log()));
-
-                       /* Work out a FrameRateChange for the best overlap video for this content */
-                       DCPTime best_overlap_t;
-                       shared_ptr<Content> best_overlap;
-                       BOOST_FOREACH (shared_ptr<Content> j, _playlist->content ()) {
-                               if (!j->video) {
-                                       continue;
-                               }
-
-                               DCPTime const overlap = min (j->end(), i->end()) - max (j->position(), i->position());
-                               if (overlap > best_overlap_t) {
-                                       best_overlap = j;
-                                       best_overlap_t = overlap;
-                               }
-                       }
-
-                       if (best_overlap) {
-                               frc = FrameRateChange (best_overlap->active_video_frame_rate(), _film->video_frame_rate ());
-                       } else {
-                               /* No video overlap; e.g. if the DCP is just audio */
-                               frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
-                       }
-               }
-
                /* It's questionable whether subtitle content should have a video frame rate; perhaps
                   it should be assumed that any subtitle content has been prepared at the same rate
                   as simultaneous video content (like we do with audio).
@@ -207,6 +181,15 @@ Player::setup_pieces ()
                        frc = FrameRateChange (dsc->active_video_frame_rate(), _film->video_frame_rate());
                }
 
+               /* VideoMXFContent */
+               shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (i);
+               if (vmc) {
+                       decoder.reset (new VideoMXFDecoder (vmc, _film->log()));
+                       frc = FrameRateChange (vmc->active_video_frame_rate(), _film->video_frame_rate());
+               }
+
+               DCPOMATIC_ASSERT (decoder);
+
                if (decoder->video && _ignore_video) {
                        decoder->video->set_ignore ();
                }