Merge 1.70.0-hotfix branch into master.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index a5147f42ece1a450ec946681f659ab8435793eb5..5867ac9257aacc31f8c712039c093f531e636771 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,10 +18,7 @@
 */
 
 #include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
 #include "image.h"
-#include "ratio.h"
 
 #include "i18n.h"
 
@@ -30,94 +27,38 @@ using boost::shared_ptr;
 
 VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
        : Decoder (f)
-       , _next_video (0)
        , _video_content (c)
-       , _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate())
-       , _odd (false)
+       , _video_position (0)
 {
 
 }
 
-/** Called by subclasses when some video is ready.
- *  @param image frame to emit.
- *  @param same true if this frame is the same as the last one passed to this call.
- *  @param t Time of the frame within the source.
- */
 void
-VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
+VideoDecoder::video (shared_ptr<const ImageProxy> image, bool same, VideoContent::Frame frame)
 {
-       if (_frame_rate_conversion.skip && _odd) {
-               _odd = !_odd;
-               return;
+       switch (_video_content->video_frame_type ()) {
+       case VIDEO_FRAME_TYPE_2D:
+               Video (image, EYES_BOTH, PART_WHOLE, same, frame);
+               break;
+       case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+               Video (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, same, frame / 2);
+               break;
+       case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+               Video (image, EYES_LEFT, PART_LEFT_HALF, same, frame);
+               Video (image, EYES_RIGHT, PART_RIGHT_HALF, same, frame);
+               break;
+       case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+               Video (image, EYES_LEFT, PART_TOP_HALF, same, frame);
+               Video (image, EYES_RIGHT, PART_BOTTOM_HALF, same, frame);
+               break;
+       case VIDEO_FRAME_TYPE_3D_LEFT:
+               Video (image, EYES_LEFT, PART_WHOLE, same, frame);
+               break;
+       case VIDEO_FRAME_TYPE_3D_RIGHT:
+               Video (image, EYES_RIGHT, PART_WHOLE, same, frame);
+               break;
        }
-
-       image->crop (_video_content->crop(), true);
-
-       shared_ptr<const Film> film = _film.lock ();
-       assert (film);
-       
-       libdcp::Size const container_size = film->container()->size (film->full_frame ());
-       libdcp::Size const image_size = _video_content->ratio()->size (container_size);
-       
-       shared_ptr<Image> out = image->scale_and_convert_to_rgb (image_size, film->scaler(), true);
-
-       shared_ptr<Subtitle> sub;
-       if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-               sub = _timed_subtitle->subtitle ();
-       }
-
-       if (sub) {
-               dcpomatic::Rect const tx = subtitle_transformed_area (
-                       float (image_size.width) / video_size().width,
-                       float (image_size.height) / video_size().height,
-                       sub->area(), film->subtitle_offset(), film->subtitle_scale()
-                       );
-
-               shared_ptr<Image> im = sub->image()->scale (tx.size(), film->scaler(), true);
-               out->alpha_blend (im, tx.position());
-       }
-
-       if (image_size != container_size) {
-               assert (image_size.width <= container_size.width);
-               assert (image_size.height <= container_size.height);
-               shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, container_size, true));
-               im->make_black ();
-               im->copy (out, Position ((container_size.width - image_size.width) / 2, (container_size.height - image_size.height) / 2));
-               out = im;
-       }
-               
-       Video (out, same, t);
-
-       if (_frame_rate_conversion.repeat) {
-               Video (image, true, t + film->video_frames_to_time (1));
-               _next_video = t + film->video_frames_to_time (2);
-       } else {
-               _next_video = t + film->video_frames_to_time (1);
-       }
-
-       _odd = !_odd;
-}
-
-/** Called by subclasses when a subtitle is ready.
- *  s may be 0 to say that there is no current subtitle.
- *  @param s New current subtitle, or 0.
- */
-void
-VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
-{
-       _timed_subtitle = s;
        
-       if (_timed_subtitle) {
-               Position const p = _timed_subtitle->subtitle()->position ();
-               _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
-       }
+       _video_position = frame + 1;
 }
 
-bool
-VideoDecoder::video_done () const
-{
-       shared_ptr<const Film> film = _film.lock ();
-       assert (film);
-       
-       return (_video_content->length() - _next_video) < film->video_frames_to_time (1);
-}