Add some tests; fix failure to make DCP when there is a bit of audio right at the...

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 8f711e367292fcedf0151e8978eb0ea8e6c09f2e..2bd8d6f5170e0c0e824af35b1d236e674538efe6 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -59,40 +59,45 @@ VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
                return;
        }
 
-       /* Work out what we are going to push into _decoded next */
-       switch (_content->video->frame_type ()) {
-       case VIDEO_FRAME_TYPE_2D:
-               Data (ContentVideo (image, VideoFrame (frame, EYES_BOTH), PART_WHOLE));
-               break;
-       case VIDEO_FRAME_TYPE_3D:
-       {
-               /* We receive the same frame index twice for 3D; hence we know which
-                  frame this one is.
-               */
-               bool const same = (_last_emitted && _last_emitted.get() == frame);
-               Data (ContentVideo (image, VideoFrame (frame, same ? EYES_RIGHT : EYES_LEFT), PART_WHOLE));
-               _last_emitted = frame;
-               break;
-       }
-       case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-               Data (ContentVideo (image, VideoFrame (frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT), PART_WHOLE));
-               break;
-       case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
-               Data (ContentVideo (image, VideoFrame (frame, EYES_LEFT), PART_LEFT_HALF));
-               Data (ContentVideo (image, VideoFrame (frame, EYES_RIGHT), PART_RIGHT_HALF));
-               break;
-       case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-               Data (ContentVideo (image, VideoFrame (frame, EYES_LEFT), PART_TOP_HALF));
-               Data (ContentVideo (image, VideoFrame (frame, EYES_RIGHT), PART_BOTTOM_HALF));
-               break;
-       case VIDEO_FRAME_TYPE_3D_LEFT:
-               Data (ContentVideo (image, VideoFrame (frame, EYES_LEFT), PART_WHOLE));
-               break;
-       case VIDEO_FRAME_TYPE_3D_RIGHT:
-               Data (ContentVideo (image, VideoFrame (frame, EYES_RIGHT), PART_WHOLE));
-               break;
-       default:
-               DCPOMATIC_ASSERT (false);
+       FrameRateChange const frc = _content->film()->active_frame_rate_change (_content->position());
+       for (int i = 0; i < frc.repeat; ++i) {
+               switch (_content->video->frame_type ()) {
+               case VIDEO_FRAME_TYPE_2D:
+                       Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE));
+                       break;
+               case VIDEO_FRAME_TYPE_3D:
+               {
+                       /* We receive the same frame index twice for 3D; hence we know which
+                          frame this one is.
+                       */
+                       bool const same = (_last_emitted && _last_emitted.get() == frame);
+                       Data (ContentVideo (image, frame, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
+                       _last_emitted = frame;
+                       break;
+               }
+               case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+                       Data (ContentVideo (image, frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
+                       frame /= 2;
+                       break;
+               case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+                       Data (ContentVideo (image, frame, EYES_LEFT, PART_LEFT_HALF));
+                       Data (ContentVideo (image, frame, EYES_RIGHT, PART_RIGHT_HALF));
+                       break;
+               case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+                       Data (ContentVideo (image, frame, EYES_LEFT, PART_TOP_HALF));
+                       Data (ContentVideo (image, frame, EYES_RIGHT, PART_BOTTOM_HALF));
+                       break;
+               case VIDEO_FRAME_TYPE_3D_LEFT:
+                       Data (ContentVideo (image, frame, EYES_LEFT, PART_WHOLE));
+                       break;
+               case VIDEO_FRAME_TYPE_3D_RIGHT:
+                       Data (ContentVideo (image, frame, EYES_RIGHT, PART_WHOLE));
+                       break;
+               default:
+                       DCPOMATIC_ASSERT (false);
+               }
+
+               ++frame;
        }
 
        _position = ContentTime::from_frames (frame, _content->active_video_frame_rate ());