Fix windows build

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 2b9b13689434854de1fd9e9c385a4a27bb65ac22..88f88c1296a16c35c833c36172cc438fdaa61804 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -19,11 +19,11 @@
 
 #include "video_decoder.h"
 #include "image.h"
-#include "image_proxy.h"
-#include "raw_image_proxy.h"
 #include "raw_image_proxy.h"
 #include "film.h"
 #include "log.h"
+#include "compose.hpp"
+#include <iostream>
 
 #include "i18n.h"
 
@@ -75,7 +75,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
           one after the end of _decoded_video we need to seek.
        */
 
-       _video_content->film()->log()->log (String::compose ("VD has request for %1", frame), Log::TYPE_DEBUG_DECODE);
+       _video_content->film()->log()->log (String::compose ("VD has request for %1", frame), LogEntry::TYPE_DEBUG_DECODE);
 
        if (_decoded_video.empty() || frame < _decoded_video.front().frame || frame > (_decoded_video.back().frame + 1)) {
                seek (ContentTime::from_frames (frame, _video_content->video_frame_rate()), accurate);
@@ -130,9 +130,12 @@ VideoDecoder::get_video (Frame frame, bool accurate)
        return dec;
 }
 
-/** Fill _decoded_video from `from' up to, but not including, `to' */
+/** Fill _decoded_video from `from' up to, but not including, `to' with
+ *  a frame for one particular Eyes value (which could be EYES_BOTH,
+ *  EYES_LEFT or EYES_RIGHT)
+ */
 void
-VideoDecoder::fill_2d (Frame from, Frame to)
+VideoDecoder::fill_one_eye (Frame from, Frame to, Eyes eye)
 {
        if (to == 0) {
                /* Already OK */
@@ -140,7 +143,7 @@ VideoDecoder::fill_2d (Frame from, Frame to)
        }
 
        /* Fill with black... */
-       boost::shared_ptr<const ImageProxy> filler_image (new RawImageProxy (_black_image));
+       shared_ptr<const ImageProxy> filler_image (new RawImageProxy (_black_image));
        Part filler_part = PART_WHOLE;
 
        /* ...unless there's some video we can fill with */
@@ -154,14 +157,16 @@ VideoDecoder::fill_2d (Frame from, Frame to)
                test_gaps++;
 #endif
                _decoded_video.push_back (
-                       ContentVideo (filler_image, EYES_BOTH, filler_part, i)
+                       ContentVideo (filler_image, eye, filler_part, i)
                        );
        }
 }
 
-/** Fill _decoded_video from `from' up to, but not including, `to' */
+/** Fill _decoded_video from `from' up to, but not including, `to'
+ *  adding both left and right eye frames.
+ */
 void
-VideoDecoder::fill_3d (Frame from, Frame to, Eyes eye)
+VideoDecoder::fill_both_eyes (Frame from, Frame to, Eyes eye)
 {
        if (to == 0 && eye == EYES_LEFT) {
                /* Already OK */
@@ -169,8 +174,8 @@ VideoDecoder::fill_3d (Frame from, Frame to, Eyes eye)
        }
 
        /* Fill with black... */
-       boost::shared_ptr<const ImageProxy> filler_left_image (new RawImageProxy (_black_image));
-       boost::shared_ptr<const ImageProxy> filler_right_image (new RawImageProxy (_black_image));
+       shared_ptr<const ImageProxy> filler_left_image (new RawImageProxy (_black_image));
+       shared_ptr<const ImageProxy> filler_right_image (new RawImageProxy (_black_image));
        Part filler_left_part = PART_WHOLE;
        Part filler_right_part = PART_WHOLE;
 
@@ -235,7 +240,7 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame frame)
                return;
        }
 
-       _video_content->film()->log()->log (String::compose ("VD receives %1", frame), Log::TYPE_DEBUG_DECODE);
+       _video_content->film()->log()->log (String::compose ("VD receives %1", frame), LogEntry::TYPE_DEBUG_DECODE);
 
        /* We may receive the same frame index twice for 3D, and we need to know
           when that happens.
@@ -274,8 +279,8 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame frame)
           and the things we are about to push.
        */
 
-       boost::optional<Frame> from;
-       boost::optional<Frame> to;
+       optional<Frame> from;
+       optional<Frame> to;
 
        if (_decoded_video.empty() && _last_seek_time && _last_seek_accurate) {
                from = _last_seek_time->frames_round (_video_content->video_frame_rate ());
@@ -294,10 +299,20 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame frame)
        }
 
        if (from) {
-               if (_video_content->video_frame_type() == VIDEO_FRAME_TYPE_2D) {
-                       fill_2d (from.get(), to.get ());
-               } else {
-                       fill_3d (from.get(), to.get(), to_push.front().eyes);
+               switch (_video_content->video_frame_type ()) {
+               case VIDEO_FRAME_TYPE_2D:
+                       fill_one_eye (from.get(), to.get (), EYES_BOTH);
+                       break;
+               case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+               case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+               case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+                       fill_both_eyes (from.get(), to.get(), to_push.front().eyes);
+                       break;
+               case VIDEO_FRAME_TYPE_3D_LEFT:
+                       fill_one_eye (from.get(), to.get (), EYES_LEFT);
+                       break;
+               case VIDEO_FRAME_TYPE_3D_RIGHT:
+                       fill_one_eye (from.get(), to.get (), EYES_RIGHT);
                }
        }