projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
639fd20
)
Fix skip-frame.
author
Carl Hetherington
<cth@carlh.net>
Thu, 23 Feb 2017 23:14:48 +0000
(23:14 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000
(23:04 +0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 7d8add416132fe52f4bc59c9faf4b39099502ccf..7d53b07bfe104ce90c113958023087c1cb72d27a 100644
(file)
--- 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()));