X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=30313d39dd23bb57445cf43ff8a45f7b9c2d8b00;hb=0b6f2d7b04819711228ed5fbc5d299b58cef997e;hp=6d5b9f309d9a944a77a46461677a066a382cf32d;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 6d5b9f309..30313d39d 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -20,20 +20,8 @@
 
 #include "player.h"
 #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 "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"
@@ -45,13 +33,20 @@
 #include "content_video.h"
 #include "player_video.h"
 #include "frame_rate_change.h"
-#include "dcp_content.h"
-#include "dcp_decoder.h"
-#include "dcp_subtitle_content.h"
-#include "dcp_subtitle_decoder.h"
 #include "audio_processor.h"
 #include "playlist.h"
 #include "referenced_reel_asset.h"
+#include "decoder_factory.h"
+#include "decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_content.h"
+#include "subtitle_decoder.h"
+#include "ffmpeg_content.h"
+#include "audio_content.h"
+#include "content_subtitle.h"
+#include "dcp_decoder.h"
+#include "image_decoder.h"
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
@@ -120,7 +115,6 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
 void
 Player::setup_pieces ()
 {
-	list<shared_ptr<Piece> > old_pieces = _pieces;
 	_pieces.clear ();
 
 	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
@@ -129,65 +123,8 @@ Player::setup_pieces ()
 			continue;
 		}
 
-		shared_ptr<Decoder> decoder;
-		optional<FrameRateChange> frc;
-
-		/* FFmpeg */
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i);
-		if (fc) {
-			decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast));
-			frc = FrameRateChange (fc->active_video_frame_rate(), _film->video_frame_rate());
-		}
-
-		shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
-		if (dc) {
-			decoder.reset (new DCPDecoder (dc, _film->log(), _fast));
-			frc = FrameRateChange (dc->active_video_frame_rate(), _film->video_frame_rate());
-		}
-
-		/* ImageContent */
-		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
-		if (ic) {
-			/* See if we can re-use an old ImageDecoder */
-			for (list<shared_ptr<Piece> >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) {
-				shared_ptr<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> ((*j)->decoder);
-				if (imd && imd->content() == ic) {
-					decoder = imd;
-				}
-			}
-
-			if (!decoder) {
-				decoder.reset (new ImageDecoder (ic, _film->log()));
-			}
-
-			frc = FrameRateChange (ic->active_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).
-		*/
-
-		/* TextSubtitleContent */
-		shared_ptr<const TextSubtitleContent> rc = dynamic_pointer_cast<const TextSubtitleContent> (i);
-		if (rc) {
-			decoder.reset (new TextSubtitleDecoder (rc));
-			frc = FrameRateChange (rc->active_video_frame_rate(), _film->video_frame_rate());
-		}
-
-		/* DCPSubtitleContent */
-		shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
-		if (dsc) {
-			decoder.reset (new DCPSubtitleDecoder (dsc));
-			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());
-		}
+		shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
+		FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
 
 		if (!decoder) {
 			/* Not something that we can decode; e.g. Atmos content */
@@ -202,7 +139,7 @@ Player::setup_pieces ()
 			decoder->audio->set_ignore ();
 		}
 
-		_pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc.get ())));
+		_pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc)));
 	}
 
 	_have_valid_pieces = true;
@@ -437,12 +374,12 @@ Player::get_video (DCPTime time, bool accurate)
 							shared_ptr<PlayerVideo> (
 								new PlayerVideo (
 									i->image,
-									content_video_to_dcp (piece, i->frame),
+									time,
 									piece->content->video->crop (),
-									piece->content->video->fade (i->frame),
+									piece->content->video->fade (i->frame.index()),
 									image_size,
 									_video_container_size,
-									i->eyes,
+									i->frame.eyes(),
 									i->part,
 									piece->content->video->colour_conversion ()
 									)