Merge master.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index bd609d1683ddd0fca0ee82ca9da8bd7eeaed725b..43b1049ccaf5f89920147f040cf5e96635f66675 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -39,19 +39,26 @@ VideoDecoder::VideoDecoder (shared_ptr<const VideoContent> c)
 
 }
 
-optional<ContentVideo>
+list<ContentVideo>
 VideoDecoder::decoded_video (VideoFrame frame)
 {
+       list<ContentVideo> output;
+       
        for (list<ContentVideo>::const_iterator i = _decoded_video.begin(); i != _decoded_video.end(); ++i) {
                if (i->frame == frame) {
-                       return *i;
+                       output.push_back (*i);
                }
        }
 
-       return optional<ContentVideo> ();
+       return output;
 }
 
-optional<ContentVideo>
+/** Get all frames which exist in the content at a given frame index.
+ *  @param frame Frame index.
+ *  @param accurate true to try hard to return frames at the precise time that was requested, otherwise frames nearby may be returned.
+ *  @return Frames; there may be none (if there is no video there), 1 for 2D or 2 for 3D.
+ */
+list<ContentVideo>
 VideoDecoder::get_video (VideoFrame frame, bool accurate)
 {
        if (_decoded_video.empty() || (frame < _decoded_video.front().frame || frame > (_decoded_video.back().frame + 1))) {
@@ -59,7 +66,7 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate)
                seek (ContentTime::from_frames (frame, _video_content->video_frame_rate()), accurate);
        }
 
-       optional<ContentVideo> dec;
+       list<ContentVideo> dec;
 
        /* Now enough pass() calls should either:
         *  (a) give us what we want, or
@@ -70,7 +77,7 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate)
                 * This could all be one statement but it's split up for clarity.
                 */
                while (true) {
-                       if (decoded_video (frame)) {
+                       if (!decoded_video(frame).empty ()) {
                                /* We got what we want */
                                break;
                        }
@@ -94,7 +101,7 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate)
                /* Any frame will do: use the first one that comes out of pass() */
                while (_decoded_video.empty() && !pass ()) {}
                if (!_decoded_video.empty ()) {
-                       dec = _decoded_video.front ();
+                       dec.push_back (_decoded_video.front ());
                }
        }
 
@@ -109,7 +116,7 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate)
 
 /** Called by subclasses when they have a video frame ready */
 void
-VideoDecoder::video (shared_ptr<const Image> image, VideoFrame frame)
+VideoDecoder::video (shared_ptr<const ImageProxy> image, VideoFrame frame)
 {
        /* We should not receive the same thing twice */
        assert (_decoded_video.empty() || frame != _decoded_video.back().frame);
@@ -125,6 +132,7 @@ VideoDecoder::video (shared_ptr<const Image> image, VideoFrame frame)
                        ContentVideo (
                                _decoded_video.back().image,
                                _decoded_video.back().eyes,
+                               _decoded_video.back().part,
                                _decoded_video.back().frame + 1
                                )
                        );
@@ -132,30 +140,24 @@ VideoDecoder::video (shared_ptr<const Image> image, VideoFrame frame)
        
        switch (_video_content->video_frame_type ()) {
        case VIDEO_FRAME_TYPE_2D:
-               _decoded_video.push_back (ContentVideo (image, EYES_BOTH, frame));
+               _decoded_video.push_back (ContentVideo (image, EYES_BOTH, PART_WHOLE, frame));
                break;
        case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-               _decoded_video.push_back (ContentVideo (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, frame));
+               _decoded_video.push_back (ContentVideo (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, frame));
                break;
        case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
-       {
-               int const half = image->size().width / 2;
-               _decoded_video.push_back (ContentVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, frame));
-               _decoded_video.push_back (ContentVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, frame));
+               _decoded_video.push_back (ContentVideo (image, EYES_LEFT, PART_LEFT_HALF, frame));
+               _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, PART_RIGHT_HALF, frame));
                break;
-       }
        case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-       {
-               int const half = image->size().height / 2;
-               _decoded_video.push_back (ContentVideo (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, frame));
-               _decoded_video.push_back (ContentVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, frame));
+               _decoded_video.push_back (ContentVideo (image, EYES_LEFT, PART_TOP_HALF, frame));
+               _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, PART_BOTTOM_HALF, frame));
                break;
-       }
        case VIDEO_FRAME_TYPE_3D_LEFT:
-               _decoded_video.push_back (ContentVideo (image, EYES_LEFT, frame));
+               _decoded_video.push_back (ContentVideo (image, EYES_LEFT, PART_WHOLE, frame));
                break;
        case VIDEO_FRAME_TYPE_3D_RIGHT:
-               _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, frame));
+               _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, PART_WHOLE, frame));
                break;
        default:
                assert (false);