summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-02-23 23:14:48 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commit94e7de14b109eb9bc2aad3be62634ff19099a4cf (patch)
treec6e8db450890e0fc631b549d5069c65b307ce206 /src/lib
parent639fd201ac8c94b76ee686b07bcc8ec3f1e83da7 (diff)
Fix skip-frame.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/player.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7d8add416..7d53b07bf 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -597,6 +597,11 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
return;
}
+ FrameRateChange frc(piece->content->active_video_frame_rate(), _film->video_frame_rate());
+ if (frc.skip && (video.frame % 2) == 1) {
+ return;
+ }
+
/* Time and period of the frame we will emit */
DCPTime const time = content_video_to_dcp (piece, video.frame);
DCPTimePeriod const period (time, time + DCPTime::from_frames (1, _film->video_frame_rate()));