X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=3a88911118e4054bf2c2d2eecae6b59a50fa055a;hb=de68adffc0311511568484e9ab713bee8826ec2d;hp=23a69f9586c08a96a39f6e6aa792640f1792de0d;hpb=cafa76a2b52449ce3c9eecfd0ea53b7318814951;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 23a69f958..3a8891111 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -18,81 +18,35 @@
 */
 
 #include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
 #include "image.h"
-#include "log.h"
-#include "options.h"
-#include "job.h"
 
+#include "i18n.h"
+
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j)
-	: Decoder (f, o, j)
-	, _video_frame (0)
-{
-
-}
-
-/** Called by subclasses to tell the world that some video data is ready.
- *  We find a subtitle then emit it for listeners.
- *  @param frame to decode; caller manages memory.
- */
-void
-VideoDecoder::emit_video (shared_ptr<Image> image)
-{
-	shared_ptr<Subtitle> sub;
-	if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) {
-		sub = _timed_subtitle->subtitle ();
-	}
-
-	signal_video (image, sub);
-}
-
-void
-VideoDecoder::repeat_last_video ()
-{
-	if (!_last_image) {
-		_last_image.reset (new CompactImage (pixel_format(), native_size()));
-		_last_image->make_black ();
-	}
-
-	signal_video (_last_image, _last_subtitle);
-}
-
-void
-VideoDecoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
+	: Decoder (f)
+	, _video_content (c)
 {
-	TIMING ("Decoder emits %1", _video_frame);
-	Video (image, sub);
-	++_video_frame;
 
-	_last_image = image;
-	_last_subtitle = sub;
 }
 
+/** Called by subclasses when they have a video frame ready */
 void
-VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, ContentTime time)
 {
-	_timed_subtitle = s;
-	
-	if (_timed_subtitle && _opt->apply_crop) {
-		Position const p = _timed_subtitle->subtitle()->position ();
-		_timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
+	switch (_video_content->video_frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image, EYES_BOTH, same, time)));
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+	{
+		int const half = image->size().width / 2;
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, time)));
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, time)));
+		break;
 	}
-}
-
-void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-	_subtitle_stream = s;
-}
-
-void
-VideoDecoder::set_progress () const
-{
-	if (_job && _film->dcp_length()) {
-		_job->set_progress (float (_video_frame) / _film->length().get());
 	}
 }